4154 files changed, 23108 insertions, 65317 deletions

diff --git a/basebmp/inc/basebmp/accessor.hxx b/basebmp/inc/basebmp/accessor.hxx
index fa8d356cc438..b98f05e78f6c 100644
--- a/basebmp/inc/basebmp/accessor.hxx
+++ b/basebmp/inc/basebmp/accessor.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: accessor.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/basebmp/inc/basebmp/accessoradapters.hxx b/basebmp/inc/basebmp/accessoradapters.hxx
index e4e149e0fe0b..40b4faed4bae 100644
--- a/basebmp/inc/basebmp/accessoradapters.hxx
+++ b/basebmp/inc/basebmp/accessoradapters.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: accessoradapters.hxx,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/basebmp/inc/basebmp/accessorfunctors.hxx b/basebmp/inc/basebmp/accessorfunctors.hxx
index f8c098f563bf..fdb9b75aa64f 100644
--- a/basebmp/inc/basebmp/accessorfunctors.hxx
+++ b/basebmp/inc/basebmp/accessorfunctors.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: accessorfunctors.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/basebmp/inc/basebmp/accessortraits.hxx b/basebmp/inc/basebmp/accessortraits.hxx
index ae2e9d517963..0cb0d1f8d37d 100644
--- a/basebmp/inc/basebmp/accessortraits.hxx
+++ b/basebmp/inc/basebmp/accessortraits.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: accessortraits.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/basebmp/inc/basebmp/bitmapdevice.hxx b/basebmp/inc/basebmp/bitmapdevice.hxx
index 1f2c63eae46f..b1c513444fe6 100644
--- a/basebmp/inc/basebmp/bitmapdevice.hxx
+++ b/basebmp/inc/basebmp/bitmapdevice.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: bitmapdevice.hxx,v $
- * $Revision: 1.10.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basebmp/inc/basebmp/clippedlinerenderer.hxx b/basebmp/inc/basebmp/clippedlinerenderer.hxx
index c227d4942e4d..03b2bc860cbd 100644
--- a/basebmp/inc/basebmp/clippedlinerenderer.hxx
+++ b/basebmp/inc/basebmp/clippedlinerenderer.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: clippedlinerenderer.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/basebmp/inc/basebmp/color.hxx b/basebmp/inc/basebmp/color.hxx
index b1275180101d..e9aab93a715c 100644
--- a/basebmp/inc/basebmp/color.hxx
+++ b/basebmp/inc/basebmp/color.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: color.hxx,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/basebmp/inc/basebmp/colorblendaccessoradapter.hxx b/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
index 299db2212ce4..03263c2c6062 100644
--- a/basebmp/inc/basebmp/colorblendaccessoradapter.hxx
+++ b/basebmp/inc/basebmp/colorblendaccessoradapter.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: colorblendaccessoradapter.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/basebmp/inc/basebmp/colormisc.hxx b/basebmp/inc/basebmp/colormisc.hxx
index f382483f9a2e..0974ebaa44a4 100644
--- a/basebmp/inc/basebmp/colormisc.hxx
+++ b/basebmp/inc/basebmp/colormisc.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: colormisc.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/basebmp/inc/basebmp/colortraits.hxx b/basebmp/inc/basebmp/colortraits.hxx
index abfaedae23a6..9c30b8f082c0 100644
--- a/basebmp/inc/basebmp/colortraits.hxx
+++ b/basebmp/inc/basebmp/colortraits.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: colortraits.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/basebmp/inc/basebmp/compositeiterator.hxx b/basebmp/inc/basebmp/compositeiterator.hxx
index 36c254a91580..70f2acebb043 100755
--- a/basebmp/inc/basebmp/compositeiterator.hxx
+++ b/basebmp/inc/basebmp/compositeiterator.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: compositeiterator.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/basebmp/inc/basebmp/debug.hxx b/basebmp/inc/basebmp/debug.hxx
index c354953bf488..a01d69326307 100644
--- a/basebmp/inc/basebmp/debug.hxx
+++ b/basebmp/inc/basebmp/debug.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: debug.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/basebmp/inc/basebmp/drawmodes.hxx b/basebmp/inc/basebmp/drawmodes.hxx
index 6803b3208dbb..6cdf34fd808a 100644
--- a/basebmp/inc/basebmp/drawmodes.hxx
+++ b/basebmp/inc/basebmp/drawmodes.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: drawmodes.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/basebmp/inc/basebmp/endian.hxx b/basebmp/inc/basebmp/endian.hxx
index 554f18511ef8..fb76ad1b306e 100644
--- a/basebmp/inc/basebmp/endian.hxx
+++ b/basebmp/inc/basebmp/endian.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: endian.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/basebmp/inc/basebmp/fillimage.hxx b/basebmp/inc/basebmp/fillimage.hxx
index 6226c67e3d2f..344ee20e6ce5 100644
--- a/basebmp/inc/basebmp/fillimage.hxx
+++ b/basebmp/inc/basebmp/fillimage.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: fillimage.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/basebmp/inc/basebmp/genericcolorimageaccessor.hxx b/basebmp/inc/basebmp/genericcolorimageaccessor.hxx
index 938d03eafd76..eaf8e2b34bfa 100644
--- a/basebmp/inc/basebmp/genericcolorimageaccessor.hxx
+++ b/basebmp/inc/basebmp/genericcolorimageaccessor.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: genericcolorimageaccessor.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/basebmp/inc/basebmp/greylevelformats.hxx b/basebmp/inc/basebmp/greylevelformats.hxx
index fc04cb275b40..0adbcbb53c30 100644
--- a/basebmp/inc/basebmp/greylevelformats.hxx
+++ b/basebmp/inc/basebmp/greylevelformats.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: greylevelformats.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/basebmp/inc/basebmp/iteratortraits.hxx b/basebmp/inc/basebmp/iteratortraits.hxx
index 22e552b10450..716081f62c53 100644
--- a/basebmp/inc/basebmp/iteratortraits.hxx
+++ b/basebmp/inc/basebmp/iteratortraits.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: iteratortraits.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/basebmp/inc/basebmp/linerenderer.hxx b/basebmp/inc/basebmp/linerenderer.hxx
index ad7d6e9344dc..7c5f09dbb2d1 100644
--- a/basebmp/inc/basebmp/linerenderer.hxx
+++ b/basebmp/inc/basebmp/linerenderer.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: linerenderer.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/basebmp/inc/basebmp/metafunctions.hxx b/basebmp/inc/basebmp/metafunctions.hxx
index 2fe4b15a6e6f..7eafac284f56 100644
--- a/basebmp/inc/basebmp/metafunctions.hxx
+++ b/basebmp/inc/basebmp/metafunctions.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: metafunctions.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/basebmp/inc/basebmp/nonstandarditerator.hxx b/basebmp/inc/basebmp/nonstandarditerator.hxx
index 1a47db33c1f3..c9069da18826 100644
--- a/basebmp/inc/basebmp/nonstandarditerator.hxx
+++ b/basebmp/inc/basebmp/nonstandarditerator.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: nonstandarditerator.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/basebmp/inc/basebmp/packedpixeliterator.hxx b/basebmp/inc/basebmp/packedpixeliterator.hxx
index c0af7993621f..0a48ce2024ff 100644
--- a/basebmp/inc/basebmp/packedpixeliterator.hxx
+++ b/basebmp/inc/basebmp/packedpixeliterator.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: packedpixeliterator.hxx,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/basebmp/inc/basebmp/paletteformats.hxx b/basebmp/inc/basebmp/paletteformats.hxx
index 6e7c5e46f721..d3de0ea18dd7 100644
--- a/basebmp/inc/basebmp/paletteformats.hxx
+++ b/basebmp/inc/basebmp/paletteformats.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: paletteformats.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/basebmp/inc/basebmp/paletteimageaccessor.hxx b/basebmp/inc/basebmp/paletteimageaccessor.hxx
index 08ca608f0e72..79bbb9aae9b7 100644
--- a/basebmp/inc/basebmp/paletteimageaccessor.hxx
+++ b/basebmp/inc/basebmp/paletteimageaccessor.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: paletteimageaccessor.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/basebmp/inc/basebmp/pixelformatadapters.hxx b/basebmp/inc/basebmp/pixelformatadapters.hxx
index 122900a35615..2acd90b5bea8 100644
--- a/basebmp/inc/basebmp/pixelformatadapters.hxx
+++ b/basebmp/inc/basebmp/pixelformatadapters.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: pixelformatadapters.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/basebmp/inc/basebmp/pixeliterator.hxx b/basebmp/inc/basebmp/pixeliterator.hxx
index c797cd7abae4..84b99942927b 100644
--- a/basebmp/inc/basebmp/pixeliterator.hxx
+++ b/basebmp/inc/basebmp/pixeliterator.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: pixeliterator.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/basebmp/inc/basebmp/polypolygonrenderer.hxx b/basebmp/inc/basebmp/polypolygonrenderer.hxx
index 0a1bf3bb8448..7cfacad510e5 100644
--- a/basebmp/inc/basebmp/polypolygonrenderer.hxx
+++ b/basebmp/inc/basebmp/polypolygonrenderer.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: polypolygonrenderer.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/basebmp/inc/basebmp/rgb24pixelformats.hxx b/basebmp/inc/basebmp/rgb24pixelformats.hxx
index a5229437ae30..788144a50b8d 100644
--- a/basebmp/inc/basebmp/rgb24pixelformats.hxx
+++ b/basebmp/inc/basebmp/rgb24pixelformats.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: rgb24pixelformats.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/basebmp/inc/basebmp/rgbmaskpixelformats.hxx b/basebmp/inc/basebmp/rgbmaskpixelformats.hxx
index fd0435ec8b7f..d42125239529 100644
--- a/basebmp/inc/basebmp/rgbmaskpixelformats.hxx
+++ b/basebmp/inc/basebmp/rgbmaskpixelformats.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: rgbmaskpixelformats.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/basebmp/inc/basebmp/scaleimage.hxx b/basebmp/inc/basebmp/scaleimage.hxx
index 202317e33688..cb83e1353d5c 100644
--- a/basebmp/inc/basebmp/scaleimage.hxx
+++ b/basebmp/inc/basebmp/scaleimage.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: scaleimage.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/basebmp/inc/basebmp/scanlineformats.hxx b/basebmp/inc/basebmp/scanlineformats.hxx
index 3a5dd9dd4646..d83aea688a37 100644
--- a/basebmp/inc/basebmp/scanlineformats.hxx
+++ b/basebmp/inc/basebmp/scanlineformats.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: scanlineformats.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/basebmp/inc/basebmp/stridedarrayiterator.hxx b/basebmp/inc/basebmp/stridedarrayiterator.hxx
index 74d3b9ae0980..8139cc8a8bc9 100644
--- a/basebmp/inc/basebmp/stridedarrayiterator.hxx
+++ b/basebmp/inc/basebmp/stridedarrayiterator.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: stridedarrayiterator.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/basebmp/inc/basebmp/tools.hxx b/basebmp/inc/basebmp/tools.hxx
index bba249719043..d7ca0423ac1f 100644
--- a/basebmp/inc/basebmp/tools.hxx
+++ b/basebmp/inc/basebmp/tools.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: tools.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/basebmp/inc/basebmp/truecolormaskaccessor.hxx b/basebmp/inc/basebmp/truecolormaskaccessor.hxx
index b792fea8424e..d4e3ff33f30e 100644
--- a/basebmp/inc/basebmp/truecolormaskaccessor.hxx
+++ b/basebmp/inc/basebmp/truecolormaskaccessor.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: truecolormaskaccessor.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/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 90c5e7b4cc0e..4e179c3a0ce0 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.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: bitmapdevice.cxx,v $
- * $Revision: 1.33.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basebmp/source/debug.cxx b/basebmp/source/debug.cxx
index 8049b598ee40..7781e43c19bc 100644
--- a/basebmp/source/debug.cxx
+++ b/basebmp/source/debug.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: debug.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/basebmp/source/intconversion.hxx b/basebmp/source/intconversion.hxx
index a8c79b97f7ba..0fb7a0bf684a 100644
--- a/basebmp/source/intconversion.hxx
+++ b/basebmp/source/intconversion.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: intconversion.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/basebmp/source/makefile.mk b/basebmp/source/makefile.mk
index df3e2a5d5134..55b27cfa7565 100644
--- a/basebmp/source/makefile.mk
+++ b/basebmp/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.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basebmp/source/polypolygonrenderer.cxx b/basebmp/source/polypolygonrenderer.cxx
index 1ec1611ae34f..79453402ef4c 100644
--- a/basebmp/source/polypolygonrenderer.cxx
+++ b/basebmp/source/polypolygonrenderer.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: polypolygonrenderer.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/basebmp/test/basictest.cxx b/basebmp/test/basictest.cxx
index d4d836a4b553..4129cebdbd3d 100644
--- a/basebmp/test/basictest.cxx
+++ b/basebmp/test/basictest.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: basictest.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/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index d7df51c5eb07..99aa1bac2c5c 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.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: bmpdemo.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/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index 1b9e4ca0c68f..e65c5e569d3c 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.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: bmpmasktest.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/basebmp/test/bmptest.cxx b/basebmp/test/bmptest.cxx
index 978c4bbe6243..ce2e2440dcd1 100644
--- a/basebmp/test/bmptest.cxx
+++ b/basebmp/test/bmptest.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: bmptest.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/basebmp/test/cliptest.cxx b/basebmp/test/cliptest.cxx
index 41da8cac617a..1c4a20bc0d86 100644
--- a/basebmp/test/cliptest.cxx
+++ b/basebmp/test/cliptest.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: cliptest.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/basebmp/test/export.map b/basebmp/test/export.map
index bfd13f454044..709047ae63e5 100644
--- a/basebmp/test/export.map
+++ b/basebmp/test/export.map
@@ -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: export.map,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/basebmp/test/filltest.cxx b/basebmp/test/filltest.cxx
index ba25cfa9044e..ea801de8111f 100644
--- a/basebmp/test/filltest.cxx
+++ b/basebmp/test/filltest.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: filltest.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/basebmp/test/linetest.cxx b/basebmp/test/linetest.cxx
index b78175128eba..3c30ed718b70 100644
--- a/basebmp/test/linetest.cxx
+++ b/basebmp/test/linetest.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: linetest.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/basebmp/test/makefile.mk b/basebmp/test/makefile.mk
index f7a5dded4cf1..a11dacc1125d 100644
--- a/basebmp/test/makefile.mk
+++ b/basebmp/test/makefile.mk
@@ -1,15 +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: makefile.mk,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/basebmp/test/masktest.cxx b/basebmp/test/masktest.cxx
index 94e5bc42a5ea..e3843eba389a 100644
--- a/basebmp/test/masktest.cxx
+++ b/basebmp/test/masktest.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: masktest.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/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index da118e4b6d8a..c8290668d1f8 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.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: polytest.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/basebmp/test/tools.cxx b/basebmp/test/tools.cxx
index c376a414e8cb..dbc11395d715 100644
--- a/basebmp/test/tools.cxx
+++ b/basebmp/test/tools.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: tools.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/basebmp/test/tools.hxx b/basebmp/test/tools.hxx
index 4d4ed3c21af9..254a988fc1bb 100644
--- a/basebmp/test/tools.hxx
+++ b/basebmp/test/tools.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: tools.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/basebmp/util/makefile.mk b/basebmp/util/makefile.mk
index 7946fd311410..bc86ebd6bac4 100644
--- a/basebmp/util/makefile.mk
+++ b/basebmp/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/basegfx/color/bcolor.hxx b/basegfx/inc/basegfx/color/bcolor.hxx
index f19f7e74080f..db66dd8dbdee 100644
--- a/basegfx/inc/basegfx/color/bcolor.hxx
+++ b/basegfx/inc/basegfx/color/bcolor.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: bcolor.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/basegfx/inc/basegfx/color/bcolormodifier.hxx b/basegfx/inc/basegfx/color/bcolormodifier.hxx
index 5116cdbf446e..962da760f850 100644
--- a/basegfx/inc/basegfx/color/bcolormodifier.hxx
+++ b/basegfx/inc/basegfx/color/bcolormodifier.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: bcolormodifier.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/basegfx/inc/basegfx/color/bcolortools.hxx b/basegfx/inc/basegfx/color/bcolortools.hxx
index b4906727d08b..9121b145afa7 100644
--- a/basegfx/inc/basegfx/color/bcolortools.hxx
+++ b/basegfx/inc/basegfx/color/bcolortools.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: bcolor.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/basegfx/inc/basegfx/curve/b2dbeziertools.hxx b/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
index 125599d2f62b..3cc34fec5482 100644
--- a/basegfx/inc/basegfx/curve/b2dbeziertools.hxx
+++ b/basegfx/inc/basegfx/curve/b2dbeziertools.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: b2dbeziertools.hxx,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/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx b/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
index 81be451499ea..ea58a0a50b80 100644
--- a/basegfx/inc/basegfx/curve/b2dcubicbezier.hxx
+++ b/basegfx/inc/basegfx/curve/b2dcubicbezier.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: b2dcubicbezier.hxx,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/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx b/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
index 6d1ec8bfc7bc..08cd6be59c78 100644
--- a/basegfx/inc/basegfx/curve/b2dquadraticbezier.hxx
+++ b/basegfx/inc/basegfx/curve/b2dquadraticbezier.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: b2dquadraticbezier.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/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
index 10b023c5f68c..910224897301 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrix.hxx
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrix.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: b2dhommatrix.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/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
index c90f673a8194..3941ee19cb42 100644
--- a/basegfx/inc/basegfx/matrix/b2dhommatrixtools.hxx
+++ b/basegfx/inc/basegfx/matrix/b2dhommatrixtools.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: b2dhommatrixtools.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/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx b/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
index a6b9a147111e..bc35fcde321e 100644
--- a/basegfx/inc/basegfx/matrix/b3dhommatrix.hxx
+++ b/basegfx/inc/basegfx/matrix/b3dhommatrix.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: b3dhommatrix.hxx,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/basegfx/inc/basegfx/numeric/ftools.hxx b/basegfx/inc/basegfx/numeric/ftools.hxx
index 5003ede0c4cf..b973adb8650b 100644
--- a/basegfx/inc/basegfx/numeric/ftools.hxx
+++ b/basegfx/inc/basegfx/numeric/ftools.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: ftools.hxx,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/basegfx/inc/basegfx/pixel/bpixel.hxx b/basegfx/inc/basegfx/pixel/bpixel.hxx
index df3b72e9d21f..2684ff44e5d6 100644
--- a/basegfx/inc/basegfx/pixel/bpixel.hxx
+++ b/basegfx/inc/basegfx/pixel/bpixel.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: bpixel.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/basegfx/inc/basegfx/point/b2dhompoint.hxx b/basegfx/inc/basegfx/point/b2dhompoint.hxx
index 591aec5e9ad3..254ee9251dd3 100644
--- a/basegfx/inc/basegfx/point/b2dhompoint.hxx
+++ b/basegfx/inc/basegfx/point/b2dhompoint.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: b2dhompoint.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/basegfx/inc/basegfx/point/b2dpoint.hxx b/basegfx/inc/basegfx/point/b2dpoint.hxx
index ad65b836409c..273a1c54e3ba 100644
--- a/basegfx/inc/basegfx/point/b2dpoint.hxx
+++ b/basegfx/inc/basegfx/point/b2dpoint.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: b2dpoint.hxx,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/basegfx/inc/basegfx/point/b2ipoint.hxx b/basegfx/inc/basegfx/point/b2ipoint.hxx
index 198e7a1dd22b..dec51735de7c 100644
--- a/basegfx/inc/basegfx/point/b2ipoint.hxx
+++ b/basegfx/inc/basegfx/point/b2ipoint.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: b2ipoint.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/basegfx/inc/basegfx/point/b3dhompoint.hxx b/basegfx/inc/basegfx/point/b3dhompoint.hxx
index bbe684144641..7417d7528d16 100644
--- a/basegfx/inc/basegfx/point/b3dhompoint.hxx
+++ b/basegfx/inc/basegfx/point/b3dhompoint.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: b3dhompoint.hxx,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/basegfx/inc/basegfx/point/b3dpoint.hxx b/basegfx/inc/basegfx/point/b3dpoint.hxx
index 15a78986f636..943f74c1352d 100644
--- a/basegfx/inc/basegfx/point/b3dpoint.hxx
+++ b/basegfx/inc/basegfx/point/b3dpoint.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: b3dpoint.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/basegfx/inc/basegfx/point/b3ipoint.hxx b/basegfx/inc/basegfx/point/b3ipoint.hxx
index 4d40e0becb37..f20fe3d99c79 100644
--- a/basegfx/inc/basegfx/point/b3ipoint.hxx
+++ b/basegfx/inc/basegfx/point/b3ipoint.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: b3ipoint.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/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx b/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
index d95f0687dbf8..fd8997fcda4d 100644
--- a/basegfx/inc/basegfx/polygon/b2dlinegeometry.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dlinegeometry.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: b2dlinegeometry.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/basegfx/inc/basegfx/polygon/b2dpolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
index c0de4b57ced8..30f7786a6981 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygon.hxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: b2dpolygon.hxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
index d604c454a81f..d13d3d0a862c 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygonclipper.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygonclipper.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: b2dpolygonclipper.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/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
index aa4682a665cd..538baa89aa81 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygoncutandtouch.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: b2dpolygoncutandtouch.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/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
index 47ff41b75e70..bea0de5c98d6 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontools.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: b2dpolygontools.hxx,v $
- * $Revision: 1.24.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx b/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
index a2e2a1958e0e..e23d640b8833 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolygontriangulator.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: b2dpolygontriangulator.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/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
index 9c8724b8ee6d..1ccaaa8330ec 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygon.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: b2dpolypolygon.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/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
index 12532ff078f3..7e648302c5e5 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygoncutter.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: b2dpolypolygoncutter.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/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx
index e90d0bbc1e32..f5ceb67586e8 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygonfillrule.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: b2dpolypolygonfillrule.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/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx
index e26b2063c3e9..a77f1a371a8a 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygonrasterconverter.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: b2dpolypolygonrasterconverter.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/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
index c4687b3cfc5f..1115a96ef8da 100644
--- a/basegfx/inc/basegfx/polygon/b2dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b2dpolypolygontools.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: b2dpolypolygontools.hxx,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/basegfx/inc/basegfx/polygon/b3dgeometry.hxx b/basegfx/inc/basegfx/polygon/b3dgeometry.hxx
index 024c7e695b68..ec66f3e3a570 100644
--- a/basegfx/inc/basegfx/polygon/b3dgeometry.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dgeometry.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: b3dgeometry.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/basegfx/inc/basegfx/polygon/b3dpolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
index 4ac904b7aa8c..1732c1338042 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygon.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: b3dpolygon.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/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
index c33f703424ff..71c7f36d50d8 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygonclipper.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygonclipper.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: b3dpolygonclipper.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/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
index a29204eadc3f..7945fc1bde00 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolygontools.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: b3dpolygontools.hxx,v $
- * $Revision: 1.10.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
index 01a053883499..76e0c2f844c0 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolypolygon.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolypolygon.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: b3dpolypolygon.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/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx b/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
index 466aa25edd96..813be9839a9a 100644
--- a/basegfx/inc/basegfx/polygon/b3dpolypolygontools.hxx
+++ b/basegfx/inc/basegfx/polygon/b3dpolypolygontools.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: b3dpolypolygontools.hxx,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/basegfx/range/b1drange.hxx b/basegfx/inc/basegfx/range/b1drange.hxx
index 366431c3cd50..eba1536f4ee6 100644
--- a/basegfx/inc/basegfx/range/b1drange.hxx
+++ b/basegfx/inc/basegfx/range/b1drange.hxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: b1drange.hxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/basegfx/range/b1ibox.hxx b/basegfx/inc/basegfx/range/b1ibox.hxx
index f2d2e058c4f8..cb4ab8770a49 100644
--- a/basegfx/inc/basegfx/range/b1ibox.hxx
+++ b/basegfx/inc/basegfx/range/b1ibox.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: b1ibox.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/basegfx/inc/basegfx/range/b1irange.hxx b/basegfx/inc/basegfx/range/b1irange.hxx
index 79b4c2bed933..6c65fbaebff4 100644
--- a/basegfx/inc/basegfx/range/b1irange.hxx
+++ b/basegfx/inc/basegfx/range/b1irange.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: b1irange.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/basegfx/inc/basegfx/range/b2dconnectedranges.hxx b/basegfx/inc/basegfx/range/b2dconnectedranges.hxx
index ce56a9efd62a..6c41ede934cf 100644
--- a/basegfx/inc/basegfx/range/b2dconnectedranges.hxx
+++ b/basegfx/inc/basegfx/range/b2dconnectedranges.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: b2dconnectedranges.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/basegfx/inc/basegfx/range/b2dmultirange.hxx b/basegfx/inc/basegfx/range/b2dmultirange.hxx
index d3a0259f0d27..4c1eb37be036 100644
--- a/basegfx/inc/basegfx/range/b2dmultirange.hxx
+++ b/basegfx/inc/basegfx/range/b2dmultirange.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: b2dmultirange.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/basegfx/inc/basegfx/range/b2drange.hxx b/basegfx/inc/basegfx/range/b2drange.hxx
index 8a70d4782f47..fc3a6fe53659 100644
--- a/basegfx/inc/basegfx/range/b2drange.hxx
+++ b/basegfx/inc/basegfx/range/b2drange.hxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: b2drange.hxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/basegfx/range/b2drectangle.hxx b/basegfx/inc/basegfx/range/b2drectangle.hxx
index b1f385e504a4..1fd2087f0bcd 100644
--- a/basegfx/inc/basegfx/range/b2drectangle.hxx
+++ b/basegfx/inc/basegfx/range/b2drectangle.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: b2drectangle.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/basegfx/inc/basegfx/range/b2ibox.hxx b/basegfx/inc/basegfx/range/b2ibox.hxx
index 24a3d19f5ea1..a188c7e8abe6 100644
--- a/basegfx/inc/basegfx/range/b2ibox.hxx
+++ b/basegfx/inc/basegfx/range/b2ibox.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: b2ibox.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/basegfx/inc/basegfx/range/b2irange.hxx b/basegfx/inc/basegfx/range/b2irange.hxx
index 282ff20249bf..8d4690283da0 100644
--- a/basegfx/inc/basegfx/range/b2irange.hxx
+++ b/basegfx/inc/basegfx/range/b2irange.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: b2irange.hxx,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/basegfx/inc/basegfx/range/b2irectangle.hxx b/basegfx/inc/basegfx/range/b2irectangle.hxx
index d4f669855a4b..a9e46c82710c 100644
--- a/basegfx/inc/basegfx/range/b2irectangle.hxx
+++ b/basegfx/inc/basegfx/range/b2irectangle.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: b2irectangle.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/basegfx/inc/basegfx/range/b3drange.hxx b/basegfx/inc/basegfx/range/b3drange.hxx
index dfd41b4f0f39..2a2a42aa0718 100644
--- a/basegfx/inc/basegfx/range/b3drange.hxx
+++ b/basegfx/inc/basegfx/range/b3drange.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: b3drange.hxx,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/basegfx/inc/basegfx/range/b3dvolume.hxx b/basegfx/inc/basegfx/range/b3dvolume.hxx
index 836af3a3ef08..18163d5b6c34 100644
--- a/basegfx/inc/basegfx/range/b3dvolume.hxx
+++ b/basegfx/inc/basegfx/range/b3dvolume.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: b3dvolume.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/basegfx/inc/basegfx/range/b3ibox.hxx b/basegfx/inc/basegfx/range/b3ibox.hxx
index 35b11512962f..f9693465a2bb 100644
--- a/basegfx/inc/basegfx/range/b3ibox.hxx
+++ b/basegfx/inc/basegfx/range/b3ibox.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: b3ibox.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/basegfx/inc/basegfx/range/b3irange.hxx b/basegfx/inc/basegfx/range/b3irange.hxx
index 770bb509182c..e2b9a08c3093 100644
--- a/basegfx/inc/basegfx/range/b3irange.hxx
+++ b/basegfx/inc/basegfx/range/b3irange.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: b3irange.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/basegfx/inc/basegfx/range/b3ivolume.hxx b/basegfx/inc/basegfx/range/b3ivolume.hxx
index 30e1db168d31..0250a9050251 100644
--- a/basegfx/inc/basegfx/range/b3ivolume.hxx
+++ b/basegfx/inc/basegfx/range/b3ivolume.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: b3ivolume.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/basegfx/inc/basegfx/range/basicbox.hxx b/basegfx/inc/basegfx/range/basicbox.hxx
index da6a1ab6b94c..0a5274bc9bc9 100644
--- a/basegfx/inc/basegfx/range/basicbox.hxx
+++ b/basegfx/inc/basegfx/range/basicbox.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: basicbox.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/basegfx/inc/basegfx/range/basicrange.hxx b/basegfx/inc/basegfx/range/basicrange.hxx
index 59d13cf530c0..578e36824cf3 100644
--- a/basegfx/inc/basegfx/range/basicrange.hxx
+++ b/basegfx/inc/basegfx/range/basicrange.hxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: basicrange.hxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/basegfx/range/rangeexpander.hxx b/basegfx/inc/basegfx/range/rangeexpander.hxx
index e1dce0c2821d..f8d2ac9c6b68 100644
--- a/basegfx/inc/basegfx/range/rangeexpander.hxx
+++ b/basegfx/inc/basegfx/range/rangeexpander.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: rangeexpander.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/basegfx/inc/basegfx/raster/bpixelraster.hxx b/basegfx/inc/basegfx/raster/bpixelraster.hxx
index 25d924d304ea..c28adcdb2ef7 100644
--- a/basegfx/inc/basegfx/raster/bpixelraster.hxx
+++ b/basegfx/inc/basegfx/raster/bpixelraster.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: bpixelraster.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/basegfx/inc/basegfx/raster/bzpixelraster.hxx b/basegfx/inc/basegfx/raster/bzpixelraster.hxx
index f0bbad04d4ab..2c0905a78397 100644
--- a/basegfx/inc/basegfx/raster/bzpixelraster.hxx
+++ b/basegfx/inc/basegfx/raster/bzpixelraster.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: bzpixelraster.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/basegfx/inc/basegfx/raster/rasterconvert3d.hxx b/basegfx/inc/basegfx/raster/rasterconvert3d.hxx
index 6a2b550003e7..fb777482246d 100644
--- a/basegfx/inc/basegfx/raster/rasterconvert3d.hxx
+++ b/basegfx/inc/basegfx/raster/rasterconvert3d.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: rasterconvert3d.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/basegfx/inc/basegfx/tools/canvastools.hxx b/basegfx/inc/basegfx/tools/canvastools.hxx
index 746beeb60709..1903518d991b 100755
--- a/basegfx/inc/basegfx/tools/canvastools.hxx
+++ b/basegfx/inc/basegfx/tools/canvastools.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: canvastools.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/basegfx/inc/basegfx/tools/debugplotter.hxx b/basegfx/inc/basegfx/tools/debugplotter.hxx
index f91446ac3148..ece104af3553 100644
--- a/basegfx/inc/basegfx/tools/debugplotter.hxx
+++ b/basegfx/inc/basegfx/tools/debugplotter.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: debugplotter.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/basegfx/inc/basegfx/tools/gradienttools.hxx b/basegfx/inc/basegfx/tools/gradienttools.hxx
index 0c7f2ab2c060..0dab1a5117ff 100644
--- a/basegfx/inc/basegfx/tools/gradienttools.hxx
+++ b/basegfx/inc/basegfx/tools/gradienttools.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: canvastools.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/basegfx/inc/basegfx/tools/rectcliptools.hxx b/basegfx/inc/basegfx/tools/rectcliptools.hxx
index bfcd808ed19c..ae7c057666d9 100644
--- a/basegfx/inc/basegfx/tools/rectcliptools.hxx
+++ b/basegfx/inc/basegfx/tools/rectcliptools.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: rectcliptools.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/basegfx/inc/basegfx/tools/tools.hxx b/basegfx/inc/basegfx/tools/tools.hxx
index 1e33ccbbf995..896fd22c162d 100644
--- a/basegfx/inc/basegfx/tools/tools.hxx
+++ b/basegfx/inc/basegfx/tools/tools.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: tools.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/basegfx/inc/basegfx/tools/unopolypolygon.hxx b/basegfx/inc/basegfx/tools/unopolypolygon.hxx
index db5b1ca22427..8a4044e1ca4b 100755
--- a/basegfx/inc/basegfx/tools/unopolypolygon.hxx
+++ b/basegfx/inc/basegfx/tools/unopolypolygon.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: unopolypolygon.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/basegfx/inc/basegfx/tuple/b2dtuple.hxx b/basegfx/inc/basegfx/tuple/b2dtuple.hxx
index 7c4c1d585d2c..e0e2438307e4 100644
--- a/basegfx/inc/basegfx/tuple/b2dtuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2dtuple.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: b2dtuple.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/basegfx/inc/basegfx/tuple/b2i64tuple.hxx b/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
index 627feb9f7875..1bd81dc0e374 100644
--- a/basegfx/inc/basegfx/tuple/b2i64tuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2i64tuple.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: b2i64tuple.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/basegfx/inc/basegfx/tuple/b2ituple.hxx b/basegfx/inc/basegfx/tuple/b2ituple.hxx
index bee473e88837..9fa6e7119ee7 100644
--- a/basegfx/inc/basegfx/tuple/b2ituple.hxx
+++ b/basegfx/inc/basegfx/tuple/b2ituple.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: b2ituple.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/basegfx/inc/basegfx/tuple/b3dtuple.hxx b/basegfx/inc/basegfx/tuple/b3dtuple.hxx
index 04711aae017f..6ad063d124a0 100644
--- a/basegfx/inc/basegfx/tuple/b3dtuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3dtuple.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: b3dtuple.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/basegfx/inc/basegfx/tuple/b3i64tuple.hxx b/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
index 3791cbd63480..13a7cb87ace3 100644
--- a/basegfx/inc/basegfx/tuple/b3i64tuple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3i64tuple.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: b3i64tuple.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/basegfx/inc/basegfx/tuple/b3ituple.hxx b/basegfx/inc/basegfx/tuple/b3ituple.hxx
index 33432122913b..4df462bf3f22 100644
--- a/basegfx/inc/basegfx/tuple/b3ituple.hxx
+++ b/basegfx/inc/basegfx/tuple/b3ituple.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: b3ituple.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/basegfx/inc/basegfx/vector/b2dsize.hxx b/basegfx/inc/basegfx/vector/b2dsize.hxx
index eda0ca30cf32..6ca3065ba4f9 100644
--- a/basegfx/inc/basegfx/vector/b2dsize.hxx
+++ b/basegfx/inc/basegfx/vector/b2dsize.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: b2dsize.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/basegfx/inc/basegfx/vector/b2dvector.hxx b/basegfx/inc/basegfx/vector/b2dvector.hxx
index 299abee2baa2..e4cd8f3f179a 100644
--- a/basegfx/inc/basegfx/vector/b2dvector.hxx
+++ b/basegfx/inc/basegfx/vector/b2dvector.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: b2dvector.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/basegfx/inc/basegfx/vector/b2enums.hxx b/basegfx/inc/basegfx/vector/b2enums.hxx
index d2c481294ed2..6f68440bf715 100644
--- a/basegfx/inc/basegfx/vector/b2enums.hxx
+++ b/basegfx/inc/basegfx/vector/b2enums.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: b2enums.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/basegfx/inc/basegfx/vector/b2isize.hxx b/basegfx/inc/basegfx/vector/b2isize.hxx
index aef03e8a17cb..e6cdb048995b 100644
--- a/basegfx/inc/basegfx/vector/b2isize.hxx
+++ b/basegfx/inc/basegfx/vector/b2isize.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: b2isize.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/basegfx/inc/basegfx/vector/b2ivector.hxx b/basegfx/inc/basegfx/vector/b2ivector.hxx
index fdc5ba6a6cfd..9e2fe1009841 100644
--- a/basegfx/inc/basegfx/vector/b2ivector.hxx
+++ b/basegfx/inc/basegfx/vector/b2ivector.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: b2ivector.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/basegfx/inc/basegfx/vector/b3dsize.hxx b/basegfx/inc/basegfx/vector/b3dsize.hxx
index 4969f8a80655..e89a66bfa86c 100644
--- a/basegfx/inc/basegfx/vector/b3dsize.hxx
+++ b/basegfx/inc/basegfx/vector/b3dsize.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: b3dsize.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/basegfx/inc/basegfx/vector/b3dvector.hxx b/basegfx/inc/basegfx/vector/b3dvector.hxx
index e39500a15cd7..c4c329881170 100644
--- a/basegfx/inc/basegfx/vector/b3dvector.hxx
+++ b/basegfx/inc/basegfx/vector/b3dvector.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: b3dvector.hxx,v $
- * $Revision: 1.12.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/basegfx/vector/b3isize.hxx b/basegfx/inc/basegfx/vector/b3isize.hxx
index 5946c18e9399..604ce5681ee7 100644
--- a/basegfx/inc/basegfx/vector/b3isize.hxx
+++ b/basegfx/inc/basegfx/vector/b3isize.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: b3isize.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/basegfx/inc/basegfx/vector/b3ivector.hxx b/basegfx/inc/basegfx/vector/b3ivector.hxx
index bc379d0c514d..b4900989cc06 100644
--- a/basegfx/inc/basegfx/vector/b3ivector.hxx
+++ b/basegfx/inc/basegfx/vector/b3ivector.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: b3ivector.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/basegfx/inc/makefile.mk b/basegfx/inc/makefile.mk
index 8c9579b1b673..aa8007b7e507 100644
--- a/basegfx/inc/makefile.mk
+++ b/basegfx/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/inc/pch/precompiled_basegfx.cxx b/basegfx/inc/pch/precompiled_basegfx.cxx
index 9a32a5d91d8a..ee9c448f8af4 100644
--- a/basegfx/inc/pch/precompiled_basegfx.cxx
+++ b/basegfx/inc/pch/precompiled_basegfx.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: precompiled_basegfx.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/basegfx/inc/pch/precompiled_basegfx.hxx b/basegfx/inc/pch/precompiled_basegfx.hxx
index 36d8dafc609d..45f87434590d 100644
--- a/basegfx/inc/pch/precompiled_basegfx.hxx
+++ b/basegfx/inc/pch/precompiled_basegfx.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_basegfx.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/basegfx/source/color/bcolor.cxx b/basegfx/source/color/bcolor.cxx
index f6e8b90b38e2..6e5b4c985e6d 100644
--- a/basegfx/source/color/bcolor.cxx
+++ b/basegfx/source/color/bcolor.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: bcolor.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/basegfx/source/color/bcolormodifier.cxx b/basegfx/source/color/bcolormodifier.cxx
index f1947c70e0f2..15662c44414c 100644
--- a/basegfx/source/color/bcolormodifier.cxx
+++ b/basegfx/source/color/bcolormodifier.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: bcolormodifier.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/basegfx/source/color/bcolortools.cxx b/basegfx/source/color/bcolortools.cxx
index 1c7d2b222fff..f7f26c6dd843 100644
--- a/basegfx/source/color/bcolortools.cxx
+++ b/basegfx/source/color/bcolortools.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: bcolor.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/basegfx/source/color/makefile.mk b/basegfx/source/color/makefile.mk
index 77b91a82f3ac..c4e842db72ae 100644
--- a/basegfx/source/color/makefile.mk
+++ b/basegfx/source/color/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.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/curve/b2dbeziertools.cxx b/basegfx/source/curve/b2dbeziertools.cxx
index dd19356af488..eddd0b281fc2 100644
--- a/basegfx/source/curve/b2dbeziertools.cxx
+++ b/basegfx/source/curve/b2dbeziertools.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: b2dbeziertools.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/basegfx/source/curve/b2dcubicbezier.cxx b/basegfx/source/curve/b2dcubicbezier.cxx
index 83c620df7870..80bd8922160b 100644
--- a/basegfx/source/curve/b2dcubicbezier.cxx
+++ b/basegfx/source/curve/b2dcubicbezier.cxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: b2dcubicbezier.cxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/curve/b2dquadraticbezier.cxx b/basegfx/source/curve/b2dquadraticbezier.cxx
index 9ae3a3d726a1..6afba95e52c1 100644
--- a/basegfx/source/curve/b2dquadraticbezier.cxx
+++ b/basegfx/source/curve/b2dquadraticbezier.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: b2dquadraticbezier.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/basegfx/source/curve/makefile.mk b/basegfx/source/curve/makefile.mk
index 0cef45ad4893..88190cfdfe1a 100644
--- a/basegfx/source/curve/makefile.mk
+++ b/basegfx/source/curve/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/inc/PolygonPoint.hxx b/basegfx/source/inc/PolygonPoint.hxx
index 0f971c3065bd..49b9cd19758b 100644
--- a/basegfx/source/inc/PolygonPoint.hxx
+++ b/basegfx/source/inc/PolygonPoint.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: PolygonPoint.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/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx
index 7baca88bf28a..fe58ed260291 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/basegfx/source/inc/hommatrixtemplate.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: hommatrixtemplate.hxx,v $
- * $Revision: 1.18.12.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/inc/polygontemplate.hxx b/basegfx/source/inc/polygontemplate.hxx
index 878854ce4380..9ab7fdd941bd 100644
--- a/basegfx/source/inc/polygontemplate.hxx
+++ b/basegfx/source/inc/polygontemplate.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: polygontemplate.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/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx
index a7777352effb..96d3bdb01c01 100644
--- a/basegfx/source/matrix/b2dhommatrix.cxx
+++ b/basegfx/source/matrix/b2dhommatrix.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: b2dhommatrix.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/basegfx/source/matrix/b2dhommatrixtools.cxx b/basegfx/source/matrix/b2dhommatrixtools.cxx
index 2c71193f6352..0f294d6a262f 100644
--- a/basegfx/source/matrix/b2dhommatrixtools.cxx
+++ b/basegfx/source/matrix/b2dhommatrixtools.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: b2dhommatrixtools.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/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx
index 4c88f794ec46..bc3c3b0b55dd 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.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: b3dhommatrix.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/basegfx/source/matrix/makefile.mk b/basegfx/source/matrix/makefile.mk
index 7cf3ef0961f0..35ea4d0cb86f 100644
--- a/basegfx/source/matrix/makefile.mk
+++ b/basegfx/source/matrix/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/numeric/ftools.cxx b/basegfx/source/numeric/ftools.cxx
index 25e04a8e770e..3111b26a1818 100644
--- a/basegfx/source/numeric/ftools.cxx
+++ b/basegfx/source/numeric/ftools.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: ftools.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/basegfx/source/numeric/makefile.mk b/basegfx/source/numeric/makefile.mk
index fd758b09ede3..83abbbde4d82 100644
--- a/basegfx/source/numeric/makefile.mk
+++ b/basegfx/source/numeric/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/pixel/bpixel.cxx b/basegfx/source/pixel/bpixel.cxx
index b393c83fad70..57de666787ab 100644
--- a/basegfx/source/pixel/bpixel.cxx
+++ b/basegfx/source/pixel/bpixel.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: bpixel.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/basegfx/source/pixel/makefile.mk b/basegfx/source/pixel/makefile.mk
index f0d51187e12a..75192dc5c180 100644
--- a/basegfx/source/pixel/makefile.mk
+++ b/basegfx/source/pixel/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.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/point/b2dhompoint.cxx b/basegfx/source/point/b2dhompoint.cxx
index ccac775e6995..979fbd4cdd3b 100644
--- a/basegfx/source/point/b2dhompoint.cxx
+++ b/basegfx/source/point/b2dhompoint.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: b2dhompoint.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/basegfx/source/point/b2dpoint.cxx b/basegfx/source/point/b2dpoint.cxx
index e9fb1d8aea14..39b5eaa6fcbf 100644
--- a/basegfx/source/point/b2dpoint.cxx
+++ b/basegfx/source/point/b2dpoint.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: b2dpoint.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/basegfx/source/point/b2ipoint.cxx b/basegfx/source/point/b2ipoint.cxx
index f2017e59dac1..09af767518b3 100644
--- a/basegfx/source/point/b2ipoint.cxx
+++ b/basegfx/source/point/b2ipoint.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: b2ipoint.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/basegfx/source/point/b3dhompoint.cxx b/basegfx/source/point/b3dhompoint.cxx
index 0a495692e042..34dee5bc01d0 100644
--- a/basegfx/source/point/b3dhompoint.cxx
+++ b/basegfx/source/point/b3dhompoint.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: b3dhompoint.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/basegfx/source/point/b3dpoint.cxx b/basegfx/source/point/b3dpoint.cxx
index 9a46e5767d87..8bc1f06f3356 100644
--- a/basegfx/source/point/b3dpoint.cxx
+++ b/basegfx/source/point/b3dpoint.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: b3dpoint.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/basegfx/source/point/b3ipoint.cxx b/basegfx/source/point/b3ipoint.cxx
index fee39d47b126..19bb25b8bf46 100644
--- a/basegfx/source/point/b3ipoint.cxx
+++ b/basegfx/source/point/b3ipoint.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: b3ipoint.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/basegfx/source/point/makefile.mk b/basegfx/source/point/makefile.mk
index b6bb56c3b464..96798eb35cc9 100644
--- a/basegfx/source/point/makefile.mk
+++ b/basegfx/source/point/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/polygon/b2dlinegeometry.cxx b/basegfx/source/polygon/b2dlinegeometry.cxx
index c22b5ea94011..0db5efbfb86d 100644
--- a/basegfx/source/polygon/b2dlinegeometry.cxx
+++ b/basegfx/source/polygon/b2dlinegeometry.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: b2dlinegeometry.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/basegfx/source/polygon/b2dpolygon.cxx b/basegfx/source/polygon/b2dpolygon.cxx
index 48d00ddcec7d..dc16938a3f99 100644
--- a/basegfx/source/polygon/b2dpolygon.cxx
+++ b/basegfx/source/polygon/b2dpolygon.cxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: b2dpolygon.cxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx b/basegfx/source/polygon/b2dpolygonclipper.cxx
index 87e44ed3d063..6e5c7701e2ec 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.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: b2dpolygonclipper.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/basegfx/source/polygon/b2dpolygoncutandtouch.cxx b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
index da6ff8904725..9eab4b26c8b3 100644
--- a/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
+++ b/basegfx/source/polygon/b2dpolygoncutandtouch.cxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: b2dpolygoncutandtouch.cxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/polygon/b2dpolygontools.cxx b/basegfx/source/polygon/b2dpolygontools.cxx
index d62462b8c097..28e5bb1f430d 100644
--- a/basegfx/source/polygon/b2dpolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolygontools.cxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: b2dpolygontools.cxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx
index 4f0a3dc1d8cc..83fcc036c996 100644
--- a/basegfx/source/polygon/b2dpolygontriangulator.cxx
+++ b/basegfx/source/polygon/b2dpolygontriangulator.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: b2dpolygontriangulator.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/basegfx/source/polygon/b2dpolypolygon.cxx b/basegfx/source/polygon/b2dpolypolygon.cxx
index 6467e7120c03..767d2b25ced5 100644
--- a/basegfx/source/polygon/b2dpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dpolypolygon.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: b2dpolypolygon.cxx,v $
- * $Revision: 1.21.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index 0674bfe3953e..4f9cf3a75f72 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.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: b2dpolypolygoncutter.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/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx b/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
index f72b9a6fb732..b795c04e158e 100644
--- a/basegfx/source/polygon/b2dpolypolygonrasterconverter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygonrasterconverter.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: b2dpolypolygonrasterconverter.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/basegfx/source/polygon/b2dpolypolygontools.cxx b/basegfx/source/polygon/b2dpolypolygontools.cxx
index e6b3a448530d..dcfa34f93c02 100644
--- a/basegfx/source/polygon/b2dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b2dpolypolygontools.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: b2dpolypolygontools.cxx,v $
- * $Revision: 1.19.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/polygon/b2dsvgpolypolygon.cxx b/basegfx/source/polygon/b2dsvgpolypolygon.cxx
index e38ec3809fb1..bbb6db4c064a 100644
--- a/basegfx/source/polygon/b2dsvgpolypolygon.cxx
+++ b/basegfx/source/polygon/b2dsvgpolypolygon.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: b2dsvgpolypolygon.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/basegfx/source/polygon/b3dgeometry.cxx b/basegfx/source/polygon/b3dgeometry.cxx
index 38b93b931f53..6c1537bac0a6 100644
--- a/basegfx/source/polygon/b3dgeometry.cxx
+++ b/basegfx/source/polygon/b3dgeometry.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: b3dgeometry.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/basegfx/source/polygon/b3dpolygon.cxx b/basegfx/source/polygon/b3dpolygon.cxx
index 84383bc55ec9..1985d3301d4b 100644
--- a/basegfx/source/polygon/b3dpolygon.cxx
+++ b/basegfx/source/polygon/b3dpolygon.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: b3dpolygon.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/basegfx/source/polygon/b3dpolygonclipper.cxx b/basegfx/source/polygon/b3dpolygonclipper.cxx
index 93c446ff57a5..88ebf12dae7b 100644
--- a/basegfx/source/polygon/b3dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b3dpolygonclipper.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: b3dpolygonclipper.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/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index 52e0f0fcc36f..77bbbd379d3c 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.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: b3dpolygontools.cxx,v $
- * $Revision: 1.11.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/polygon/b3dpolypolygon.cxx b/basegfx/source/polygon/b3dpolypolygon.cxx
index 9e004e67c35f..a29680b14a59 100644
--- a/basegfx/source/polygon/b3dpolypolygon.cxx
+++ b/basegfx/source/polygon/b3dpolypolygon.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: b3dpolypolygon.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/basegfx/source/polygon/b3dpolypolygontools.cxx b/basegfx/source/polygon/b3dpolypolygontools.cxx
index fe75e3919d21..d86a4526acfd 100644
--- a/basegfx/source/polygon/b3dpolypolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolypolygontools.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: b3dpolypolygontools.cxx,v $
- * $Revision: 1.8.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/polygon/makefile.mk b/basegfx/source/polygon/makefile.mk
index b2da44250e66..aeb0af6c5d1b 100644
--- a/basegfx/source/polygon/makefile.mk
+++ b/basegfx/source/polygon/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/range/b1drange.cxx b/basegfx/source/range/b1drange.cxx
index 63f5e398a8be..6581b04680e2 100644
--- a/basegfx/source/range/b1drange.cxx
+++ b/basegfx/source/range/b1drange.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: b1drange.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/basegfx/source/range/b2dmultirange.cxx b/basegfx/source/range/b2dmultirange.cxx
index 64c3cf5ab813..3a47be3b7dc9 100644
--- a/basegfx/source/range/b2dmultirange.cxx
+++ b/basegfx/source/range/b2dmultirange.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: b2dmultirange.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/basegfx/source/range/b2drange.cxx b/basegfx/source/range/b2drange.cxx
index 2508224bf2d8..693470c3ef14 100644
--- a/basegfx/source/range/b2drange.cxx
+++ b/basegfx/source/range/b2drange.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: b2drange.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/basegfx/source/range/b2xrange.cxx b/basegfx/source/range/b2xrange.cxx
index aa373cc38005..296b54574800 100644
--- a/basegfx/source/range/b2xrange.cxx
+++ b/basegfx/source/range/b2xrange.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: b2xrange.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/basegfx/source/range/b3drange.cxx b/basegfx/source/range/b3drange.cxx
index 6de46e981509..aaeeae684bdd 100644
--- a/basegfx/source/range/b3drange.cxx
+++ b/basegfx/source/range/b3drange.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: b3drange.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/basegfx/source/range/makefile.mk b/basegfx/source/range/makefile.mk
index 678bb16a9312..04d8e8e66fa2 100644
--- a/basegfx/source/range/makefile.mk
+++ b/basegfx/source/range/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/raster/bpixelraster.cxx b/basegfx/source/raster/bpixelraster.cxx
index e08d0bce293e..dd62ebd67634 100644
--- a/basegfx/source/raster/bpixelraster.cxx
+++ b/basegfx/source/raster/bpixelraster.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: bpixelraster.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/basegfx/source/raster/bzpixelraster.cxx b/basegfx/source/raster/bzpixelraster.cxx
index 5c5e0a839e62..dd1fe7719b1b 100644
--- a/basegfx/source/raster/bzpixelraster.cxx
+++ b/basegfx/source/raster/bzpixelraster.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: bzpixelraster.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/basegfx/source/raster/makefile.mk b/basegfx/source/raster/makefile.mk
index 5f21a37ef247..1381b9f6d716 100644
--- a/basegfx/source/raster/makefile.mk
+++ b/basegfx/source/raster/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.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/raster/rasterconvert3d.cxx b/basegfx/source/raster/rasterconvert3d.cxx
index 131a5f127cd8..2c42dc313451 100644
--- a/basegfx/source/raster/rasterconvert3d.cxx
+++ b/basegfx/source/raster/rasterconvert3d.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: rasterconvert3d.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/basegfx/source/tools/canvastools.cxx b/basegfx/source/tools/canvastools.cxx
index 3aae34eaa3a8..2192148461dc 100755
--- a/basegfx/source/tools/canvastools.cxx
+++ b/basegfx/source/tools/canvastools.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: canvastools.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/basegfx/source/tools/debugplotter.cxx b/basegfx/source/tools/debugplotter.cxx
index b1576bb910d1..2c68eb44a846 100755
--- a/basegfx/source/tools/debugplotter.cxx
+++ b/basegfx/source/tools/debugplotter.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: debugplotter.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/basegfx/source/tools/gradienttools.cxx b/basegfx/source/tools/gradienttools.cxx
index 51989899ebf4..89293cfcb61c 100644
--- a/basegfx/source/tools/gradienttools.cxx
+++ b/basegfx/source/tools/gradienttools.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: canvastools.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/basegfx/source/tools/liangbarsky.cxx b/basegfx/source/tools/liangbarsky.cxx
index 1e1f4e23e9f8..f07cea4a34d9 100644
--- a/basegfx/source/tools/liangbarsky.cxx
+++ b/basegfx/source/tools/liangbarsky.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: liangbarsky.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/basegfx/source/tools/makefile.mk b/basegfx/source/tools/makefile.mk
index 1bede8b22d88..c70b78be5d4b 100755
--- a/basegfx/source/tools/makefile.mk
+++ b/basegfx/source/tools/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/tools/tools.cxx b/basegfx/source/tools/tools.cxx
index b81b52a1bd61..d375f144169d 100644
--- a/basegfx/source/tools/tools.cxx
+++ b/basegfx/source/tools/tools.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: tools.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/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx
index 05dbe5b1c823..871fed7c7d18 100755
--- a/basegfx/source/tools/unopolypolygon.cxx
+++ b/basegfx/source/tools/unopolypolygon.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: unopolypolygon.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/basegfx/source/tuple/b2dtuple.cxx b/basegfx/source/tuple/b2dtuple.cxx
index eae67f5e9244..01a3bf145d7e 100644
--- a/basegfx/source/tuple/b2dtuple.cxx
+++ b/basegfx/source/tuple/b2dtuple.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: b2dtuple.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/basegfx/source/tuple/b2i64tuple.cxx b/basegfx/source/tuple/b2i64tuple.cxx
index 3b5a60baf432..3457fc138dd1 100644
--- a/basegfx/source/tuple/b2i64tuple.cxx
+++ b/basegfx/source/tuple/b2i64tuple.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: b2i64tuple.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/basegfx/source/tuple/b2ituple.cxx b/basegfx/source/tuple/b2ituple.cxx
index 6b8149e7326c..eb9888f11ecb 100644
--- a/basegfx/source/tuple/b2ituple.cxx
+++ b/basegfx/source/tuple/b2ituple.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: b2ituple.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/basegfx/source/tuple/b3dtuple.cxx b/basegfx/source/tuple/b3dtuple.cxx
index 3b887805132d..d9204154b192 100644
--- a/basegfx/source/tuple/b3dtuple.cxx
+++ b/basegfx/source/tuple/b3dtuple.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: b3dtuple.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/basegfx/source/tuple/b3i64tuple.cxx b/basegfx/source/tuple/b3i64tuple.cxx
index 8bba0fb14171..ce2094568bb8 100644
--- a/basegfx/source/tuple/b3i64tuple.cxx
+++ b/basegfx/source/tuple/b3i64tuple.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: b3i64tuple.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/basegfx/source/tuple/b3ituple.cxx b/basegfx/source/tuple/b3ituple.cxx
index d9a87912a441..014e8876588c 100644
--- a/basegfx/source/tuple/b3ituple.cxx
+++ b/basegfx/source/tuple/b3ituple.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: b3ituple.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/basegfx/source/tuple/makefile.mk b/basegfx/source/tuple/makefile.mk
index 53ccba37dca3..01a4c6de2d3c 100644
--- a/basegfx/source/tuple/makefile.mk
+++ b/basegfx/source/tuple/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/vector/b2dvector.cxx b/basegfx/source/vector/b2dvector.cxx
index 311372348653..bb08b104eff8 100644
--- a/basegfx/source/vector/b2dvector.cxx
+++ b/basegfx/source/vector/b2dvector.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: b2dvector.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/basegfx/source/vector/b2ivector.cxx b/basegfx/source/vector/b2ivector.cxx
index aa5be7fef970..026a600c0c94 100644
--- a/basegfx/source/vector/b2ivector.cxx
+++ b/basegfx/source/vector/b2ivector.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: b2ivector.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/basegfx/source/vector/b3dvector.cxx b/basegfx/source/vector/b3dvector.cxx
index 3a7e04f4eea1..74e4eb07eb33 100644
--- a/basegfx/source/vector/b3dvector.cxx
+++ b/basegfx/source/vector/b3dvector.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: b3dvector.cxx,v $
- * $Revision: 1.9.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/vector/b3ivector.cxx b/basegfx/source/vector/b3ivector.cxx
index be6d7e498592..a11871ef1b19 100644
--- a/basegfx/source/vector/b3ivector.cxx
+++ b/basegfx/source/vector/b3ivector.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: b3ivector.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/basegfx/source/vector/makefile.mk b/basegfx/source/vector/makefile.mk
index 66c4264122be..defc7a31dd51 100644
--- a/basegfx/source/vector/makefile.mk
+++ b/basegfx/source/vector/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/basegfx/source/workbench/bezierclip.cxx b/basegfx/source/workbench/bezierclip.cxx
index acd7e49f1b03..12c0d6f7d6df 100644
--- a/basegfx/source/workbench/bezierclip.cxx
+++ b/basegfx/source/workbench/bezierclip.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: bezierclip.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/basegfx/source/workbench/bezierclip.hxx b/basegfx/source/workbench/bezierclip.hxx
index 3efd74f06f49..ca16ad0fdd44 100644
--- a/basegfx/source/workbench/bezierclip.hxx
+++ b/basegfx/source/workbench/bezierclip.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: bezierclip.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/basegfx/source/workbench/convexhull.cxx b/basegfx/source/workbench/convexhull.cxx
index 6c27221ee734..99d9fb86c1d9 100644
--- a/basegfx/source/workbench/convexhull.cxx
+++ b/basegfx/source/workbench/convexhull.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: convexhull.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/basegfx/source/workbench/gauss.hxx b/basegfx/source/workbench/gauss.hxx
index 9df12ecc88d6..63910c6ded2d 100644
--- a/basegfx/source/workbench/gauss.hxx
+++ b/basegfx/source/workbench/gauss.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: gauss.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/basegfx/test/basegfx1d.cxx b/basegfx/test/basegfx1d.cxx
index 454ed23289b2..5cc823d3daca 100644
--- a/basegfx/test/basegfx1d.cxx
+++ b/basegfx/test/basegfx1d.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: basegfx1d.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/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx
index 1bd15702e143..b169d35ed96a 100644
--- a/basegfx/test/basegfx2d.cxx
+++ b/basegfx/test/basegfx2d.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: basegfx2d.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -489,8 +486,11 @@ public:
         // depending on float precision and the getContinuity() implemetation using
         // fTools::equal, linux and mac produce more 'C' than 'S' statements, while WIN32
         // uses more 'S' statements (as it should be for circles)
-        CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates",
-                               nCount==67 || nCount==50);
+#ifdef S390X
+         CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==61 );
+#else
+          CPPUNIT_ASSERT_MESSAGE("exporting to circle does not produce the expected number of coordinates", nCount==67 || nCount==50 );
+#endif
 
         const B2DPolygon aRect(
             tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) ));
diff --git a/basegfx/test/basegfx3d.cxx b/basegfx/test/basegfx3d.cxx
index f0fe463ce23d..23d3542e2d4a 100644
--- a/basegfx/test/basegfx3d.cxx
+++ b/basegfx/test/basegfx3d.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: basegfx3d.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/basegfx/test/export.map b/basegfx/test/export.map
index 37f3bf2c55d2..709047ae63e5 100644
--- a/basegfx/test/export.map
+++ b/basegfx/test/export.map
@@ -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: export.map,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/basegfx/test/makefile.mk b/basegfx/test/makefile.mk
index da61c60f9308..dd92dfedaa0c 100644
--- a/basegfx/test/makefile.mk
+++ b/basegfx/test/makefile.mk
@@ -1,15 +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: 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/basegfx/test/testtools.cxx b/basegfx/test/testtools.cxx
index 5dfa37131445..e96eb4d8edce 100644
--- a/basegfx/test/testtools.cxx
+++ b/basegfx/test/testtools.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: testtools.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/basegfx/test/testtools.hxx b/basegfx/test/testtools.hxx
index 5dfff34cf8a9..1837f9f31a89 100644
--- a/basegfx/test/testtools.hxx
+++ b/basegfx/test/testtools.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: testtools.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/basegfx/util/makefile.mk b/basegfx/util/makefile.mk
index a595fdafa48a..4d5d92ce7551 100644
--- a/basegfx/util/makefile.mk
+++ b/basegfx/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.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/inc/canvas/base/basemutexhelper.hxx b/canvas/inc/canvas/base/basemutexhelper.hxx
index 884cd080850e..787c200e0b0c 100644
--- a/canvas/inc/canvas/base/basemutexhelper.hxx
+++ b/canvas/inc/canvas/base/basemutexhelper.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: basemutexhelper.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/canvas/inc/canvas/base/bitmapcanvasbase.hxx b/canvas/inc/canvas/base/bitmapcanvasbase.hxx
index f8367f7174fb..0cbf90836bfb 100644
--- a/canvas/inc/canvas/base/bitmapcanvasbase.hxx
+++ b/canvas/inc/canvas/base/bitmapcanvasbase.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: bitmapcanvasbase.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/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx b/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx
index 9c5f7f2a238d..eed9c46a6442 100644
--- a/canvas/inc/canvas/base/bufferedgraphicdevicebase.hxx
+++ b/canvas/inc/canvas/base/bufferedgraphicdevicebase.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: bufferedgraphicdevicebase.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/canvas/inc/canvas/base/cachedprimitivebase.hxx b/canvas/inc/canvas/base/cachedprimitivebase.hxx
index 67f927ac1686..bfcd292615b9 100644
--- a/canvas/inc/canvas/base/cachedprimitivebase.hxx
+++ b/canvas/inc/canvas/base/cachedprimitivebase.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: cachedprimitivebase.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/canvas/inc/canvas/base/canvasbase.hxx b/canvas/inc/canvas/base/canvasbase.hxx
index 74922d6c03d3..1d15910564b9 100644
--- a/canvas/inc/canvas/base/canvasbase.hxx
+++ b/canvas/inc/canvas/base/canvasbase.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: canvasbase.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/canvas/inc/canvas/base/canvascustomspritebase.hxx b/canvas/inc/canvas/base/canvascustomspritebase.hxx
index c7ce10b26e62..aaca84c110de 100644
--- a/canvas/inc/canvas/base/canvascustomspritebase.hxx
+++ b/canvas/inc/canvas/base/canvascustomspritebase.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: canvascustomspritebase.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/canvas/inc/canvas/base/canvascustomspritehelper.hxx b/canvas/inc/canvas/base/canvascustomspritehelper.hxx
index f47d7b829cfa..2dd034d4eb56 100644
--- a/canvas/inc/canvas/base/canvascustomspritehelper.hxx
+++ b/canvas/inc/canvas/base/canvascustomspritehelper.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: canvascustomspritehelper.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/canvas/inc/canvas/base/doublebitmapbase.hxx b/canvas/inc/canvas/base/doublebitmapbase.hxx
index b7b607cde8ec..736e2b84da6a 100644
--- a/canvas/inc/canvas/base/doublebitmapbase.hxx
+++ b/canvas/inc/canvas/base/doublebitmapbase.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: doublebitmapbase.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/canvas/inc/canvas/base/floatbitmapbase.hxx b/canvas/inc/canvas/base/floatbitmapbase.hxx
index d464778e2a35..36d21cc5c36e 100644
--- a/canvas/inc/canvas/base/floatbitmapbase.hxx
+++ b/canvas/inc/canvas/base/floatbitmapbase.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: floatbitmapbase.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/canvas/inc/canvas/base/graphicdevicebase.hxx b/canvas/inc/canvas/base/graphicdevicebase.hxx
index d0cd621f65a2..20de68094028 100644
--- a/canvas/inc/canvas/base/graphicdevicebase.hxx
+++ b/canvas/inc/canvas/base/graphicdevicebase.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: graphicdevicebase.hxx,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/canvas/inc/canvas/base/integerbitmapbase.hxx b/canvas/inc/canvas/base/integerbitmapbase.hxx
index afad1dc97eab..c3956080483b 100644
--- a/canvas/inc/canvas/base/integerbitmapbase.hxx
+++ b/canvas/inc/canvas/base/integerbitmapbase.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: integerbitmapbase.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/canvas/inc/canvas/base/sprite.hxx b/canvas/inc/canvas/base/sprite.hxx
index 9f20a4e2db78..7525e567dc60 100644
--- a/canvas/inc/canvas/base/sprite.hxx
+++ b/canvas/inc/canvas/base/sprite.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: sprite.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/canvas/inc/canvas/base/spritecanvasbase.hxx b/canvas/inc/canvas/base/spritecanvasbase.hxx
index 7838cde1b953..b56001c1c6e9 100644
--- a/canvas/inc/canvas/base/spritecanvasbase.hxx
+++ b/canvas/inc/canvas/base/spritecanvasbase.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: spritecanvasbase.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/canvas/inc/canvas/base/spritesurface.hxx b/canvas/inc/canvas/base/spritesurface.hxx
index c968bde79e3f..8ad6ce7404b5 100644
--- a/canvas/inc/canvas/base/spritesurface.hxx
+++ b/canvas/inc/canvas/base/spritesurface.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: spritesurface.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/canvas/inc/canvas/canvastools.hxx b/canvas/inc/canvas/canvastools.hxx
index 3942ab2726ef..de4785346909 100644
--- a/canvas/inc/canvas/canvastools.hxx
+++ b/canvas/inc/canvas/canvastools.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: canvastools.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/canvas/inc/canvas/debug.hxx b/canvas/inc/canvas/debug.hxx
index 8d1d0838a492..40573cbd758d 100644
--- a/canvas/inc/canvas/debug.hxx
+++ b/canvas/inc/canvas/debug.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: debug.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/canvas/inc/canvas/elapsedtime.hxx b/canvas/inc/canvas/elapsedtime.hxx
index 9faae0123d35..c0ae5218eb64 100644
--- a/canvas/inc/canvas/elapsedtime.hxx
+++ b/canvas/inc/canvas/elapsedtime.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: elapsedtime.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/canvas/inc/canvas/parametricpolypolygon.hxx b/canvas/inc/canvas/parametricpolypolygon.hxx
index 9d0883192094..4bd7e14b0229 100644
--- a/canvas/inc/canvas/parametricpolypolygon.hxx
+++ b/canvas/inc/canvas/parametricpolypolygon.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: parametricpolypolygon.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/canvas/inc/canvas/prioritybooster.hxx b/canvas/inc/canvas/prioritybooster.hxx
index c3c2e11f36b1..012c08138f4b 100644
--- a/canvas/inc/canvas/prioritybooster.hxx
+++ b/canvas/inc/canvas/prioritybooster.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: prioritybooster.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/canvas/inc/canvas/propertysethelper.hxx b/canvas/inc/canvas/propertysethelper.hxx
index 1fb21eb16d6c..6d486d3fee83 100644
--- a/canvas/inc/canvas/propertysethelper.hxx
+++ b/canvas/inc/canvas/propertysethelper.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: propertysethelper.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/canvas/inc/canvas/rendering/bitmap.hxx b/canvas/inc/canvas/rendering/bitmap.hxx
index b4e5e143bfd0..4051e7b14408 100644
--- a/canvas/inc/canvas/rendering/bitmap.hxx
+++ b/canvas/inc/canvas/rendering/bitmap.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: bitmap.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/canvas/inc/canvas/rendering/icachedprimitive.hxx b/canvas/inc/canvas/rendering/icachedprimitive.hxx
index 866322510834..d138770bf1c5 100644
--- a/canvas/inc/canvas/rendering/icachedprimitive.hxx
+++ b/canvas/inc/canvas/rendering/icachedprimitive.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: icachedprimitive.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/canvas/inc/canvas/rendering/icolorbuffer.hxx b/canvas/inc/canvas/rendering/icolorbuffer.hxx
index 5be6748ab73c..d48a52ca5e09 100644
--- a/canvas/inc/canvas/rendering/icolorbuffer.hxx
+++ b/canvas/inc/canvas/rendering/icolorbuffer.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: icolorbuffer.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/canvas/inc/canvas/rendering/irendermodule.hxx b/canvas/inc/canvas/rendering/irendermodule.hxx
index 70cb784e58cf..153112bcf08b 100644
--- a/canvas/inc/canvas/rendering/irendermodule.hxx
+++ b/canvas/inc/canvas/rendering/irendermodule.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: irendermodule.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/canvas/inc/canvas/rendering/isurface.hxx b/canvas/inc/canvas/rendering/isurface.hxx
index 329279c2bff1..dea980e7c179 100644
--- a/canvas/inc/canvas/rendering/isurface.hxx
+++ b/canvas/inc/canvas/rendering/isurface.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: isurface.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/canvas/inc/canvas/rendering/isurfaceproxy.hxx b/canvas/inc/canvas/rendering/isurfaceproxy.hxx
index 99a30eda7e02..90addf75a8f9 100644
--- a/canvas/inc/canvas/rendering/isurfaceproxy.hxx
+++ b/canvas/inc/canvas/rendering/isurfaceproxy.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: isurfaceproxy.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/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx b/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
index 4f16c3e19516..64eaca155d87 100644
--- a/canvas/inc/canvas/rendering/isurfaceproxymanager.hxx
+++ b/canvas/inc/canvas/rendering/isurfaceproxymanager.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: isurfaceproxymanager.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/canvas/inc/canvas/spriteredrawmanager.hxx b/canvas/inc/canvas/spriteredrawmanager.hxx
index dd2d5d257026..41809a84272b 100644
--- a/canvas/inc/canvas/spriteredrawmanager.hxx
+++ b/canvas/inc/canvas/spriteredrawmanager.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: spriteredrawmanager.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/canvas/inc/canvas/vclwrapper.hxx b/canvas/inc/canvas/vclwrapper.hxx
index 5b38f19f56d4..c8b404a02b06 100644
--- a/canvas/inc/canvas/vclwrapper.hxx
+++ b/canvas/inc/canvas/vclwrapper.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: vclwrapper.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/canvas/inc/canvas/verbosetrace.hxx b/canvas/inc/canvas/verbosetrace.hxx
index b1ec85444f84..ad3d736b49f7 100644
--- a/canvas/inc/canvas/verbosetrace.hxx
+++ b/canvas/inc/canvas/verbosetrace.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: verbosetrace.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/canvas/inc/canvas/verifyinput.hxx b/canvas/inc/canvas/verifyinput.hxx
index 1a716017b885..d9bd3f88233f 100644
--- a/canvas/inc/canvas/verifyinput.hxx
+++ b/canvas/inc/canvas/verifyinput.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: verifyinput.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/canvas/inc/makefile.mk b/canvas/inc/makefile.mk
index 8dc044400658..6a74668fd4cd 100644
--- a/canvas/inc/makefile.mk
+++ b/canvas/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/inc/pch/precompiled_canvas.cxx b/canvas/inc/pch/precompiled_canvas.cxx
index 0e05d1e245b0..cf58a0cb5b97 100644
--- a/canvas/inc/pch/precompiled_canvas.cxx
+++ b/canvas/inc/pch/precompiled_canvas.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: precompiled_canvas.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/canvas/inc/pch/precompiled_canvas.hxx b/canvas/inc/pch/precompiled_canvas.hxx
index 065351fca38e..6d4bb1d1b9e6 100644
--- a/canvas/inc/pch/precompiled_canvas.hxx
+++ b/canvas/inc/pch/precompiled_canvas.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_canvas.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/canvas/prj/build.lst b/canvas/prj/build.lst
index df1f8e9f31d3..28e8524a9b38 100644
--- a/canvas/prj/build.lst
+++ b/canvas/prj/build.lst
@@ -1,4 +1,4 @@
-cv	canvas	:	javaunohelper comphelper cppuhelper offuh unoil tools goodies vcl AGG:agg basegfx CAIRO:cairo NULL
+cv	canvas	:	javaunohelper comphelper cppuhelper offuh unoil tools svtools vcl AGG:agg basegfx CAIRO:cairo NULL
 cv	canvas											 usr1	-	all	cv_mkout NULL
 cv	canvas\inc										 nmake	-	all	cv_inc NULL
 cv	canvas\source\tools								 nmake	-	all cv_tools cv_inc NULL
diff --git a/canvas/source/cairo/cairo_cachedbitmap.cxx b/canvas/source/cairo/cairo_cachedbitmap.cxx
index e5f308afe8fd..53b0bb02d76d 100644
--- a/canvas/source/cairo/cairo_cachedbitmap.cxx
+++ b/canvas/source/cairo/cairo_cachedbitmap.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: cairo_cachedbitmap.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/canvas/source/cairo/cairo_cachedbitmap.hxx b/canvas/source/cairo/cairo_cachedbitmap.hxx
index e59ce3697228..a704a0d6c20f 100644
--- a/canvas/source/cairo/cairo_cachedbitmap.hxx
+++ b/canvas/source/cairo/cairo_cachedbitmap.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: cairo_cachedbitmap.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/canvas/source/cairo/cairo_cairo.cxx b/canvas/source/cairo/cairo_cairo.cxx
index d0df7b6ad00e..f855a4f1700c 100644
--- a/canvas/source/cairo/cairo_cairo.cxx
+++ b/canvas/source/cairo/cairo_cairo.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: cairo_cairo.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/canvas/source/cairo/cairo_cairo.hxx b/canvas/source/cairo/cairo_cairo.hxx
index aa3a5b38c46a..10832ac27be6 100644
--- a/canvas/source/cairo/cairo_cairo.hxx
+++ b/canvas/source/cairo/cairo_cairo.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: cairo_cairo.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/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx
index 3ec4ac488fbe..54d04158c993 100644
--- a/canvas/source/cairo/cairo_canvas.cxx
+++ b/canvas/source/cairo/cairo_canvas.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: cairo_canvas.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/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx
index de2b9f8693a1..26e2904cf71f 100644
--- a/canvas/source/cairo/cairo_canvas.hxx
+++ b/canvas/source/cairo/cairo_canvas.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: cairo_canvas.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/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx
index eafd527ae307..445839ca0127 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.cxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.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: cairo_canvasbitmap.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/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx
index c89ddad7c1d6..5597a5ade004 100644
--- a/canvas/source/cairo/cairo_canvasbitmap.hxx
+++ b/canvas/source/cairo/cairo_canvasbitmap.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: cairo_canvasbitmap.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/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx
index 5f53b005a600..ad9a743da885 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.cxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.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: cairo_canvascustomsprite.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/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx
index f32aa5af6e34..abebdc85d917 100644
--- a/canvas/source/cairo/cairo_canvascustomsprite.hxx
+++ b/canvas/source/cairo/cairo_canvascustomsprite.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: cairo_canvascustomsprite.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/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx
index c6fa0847e660..452280728151 100644
--- a/canvas/source/cairo/cairo_canvasfont.cxx
+++ b/canvas/source/cairo/cairo_canvasfont.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: cairo_canvasfont.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/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx
index 7b6f49eaf25e..9b59ca57fa52 100644
--- a/canvas/source/cairo/cairo_canvasfont.hxx
+++ b/canvas/source/cairo/cairo_canvasfont.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: cairo_canvasfont.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/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 5469010f2745..17d187d46b27 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.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: cairo_canvashelper.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -990,7 +987,8 @@ namespace cairocanvas
                         aEdge.setNextControlPoint(0, aCandidate.getNextControlPoint(a));
                         aEdge.setPrevControlPoint(1, aCandidate.getPrevControlPoint(nNextIndex));
 
-                        doPolyPolygonImplementation( aEdge, aOperation,
+                        doPolyPolygonImplementation( basegfx::B2DPolyPolygon(aEdge),
+                                                     aOperation,
                                                      pCairo, pTextures,
                                                      mpSurfaceProvider,
                                                      xPolyPolygon->getFillRule() );
@@ -1187,7 +1185,7 @@ namespace cairocanvas
         cairo_save( mpCairo.get() );
 
         useStates( viewState, renderState, true );
-        doPolyPolygonPath( xPolyPolygon, Fill, &textures );
+        doPolyPolygonPath( xPolyPolygon, Fill, false, &textures );
 
         cairo_restore( mpCairo.get() );
     }
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index 90d365d63b3c..d89429b77a25 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.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: cairo_canvashelper.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/canvas/source/cairo/cairo_canvashelper_text.cxx b/canvas/source/cairo/cairo_canvashelper_text.cxx
index ac530f5d4632..35310e1c078d 100644
--- a/canvas/source/cairo/cairo_canvashelper_text.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_text.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: cairo_canvashelper_text.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/canvas/source/cairo/cairo_canvashelper_texturefill.cxx b/canvas/source/cairo/cairo_canvashelper_texturefill.cxx
index 518205416dab..ee8aff6980cf 100644
--- a/canvas/source/cairo/cairo_canvashelper_texturefill.cxx
+++ b/canvas/source/cairo/cairo_canvashelper_texturefill.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: cairo_canvashelper_texturefill.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/canvas/source/cairo/cairo_devicehelper.cxx b/canvas/source/cairo/cairo_devicehelper.cxx
index 2ce2be60523d..70a5ea51c0ea 100644
--- a/canvas/source/cairo/cairo_devicehelper.cxx
+++ b/canvas/source/cairo/cairo_devicehelper.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: cairo_devicehelper.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/canvas/source/cairo/cairo_devicehelper.hxx b/canvas/source/cairo/cairo_devicehelper.hxx
index f93a09f5e137..84c5a84926ca 100644
--- a/canvas/source/cairo/cairo_devicehelper.hxx
+++ b/canvas/source/cairo/cairo_devicehelper.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: cairo_devicehelper.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/canvas/source/cairo/cairo_quartz_cairo.cxx b/canvas/source/cairo/cairo_quartz_cairo.cxx
index a3c6c9bba255..52626a0ae849 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.cxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.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: cairo_quartz_cairo.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/canvas/source/cairo/cairo_quartz_cairo.hxx b/canvas/source/cairo/cairo_quartz_cairo.hxx
index fe748d26640a..104016751293 100644
--- a/canvas/source/cairo/cairo_quartz_cairo.hxx
+++ b/canvas/source/cairo/cairo_quartz_cairo.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: cairo_quartz_cairo.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/canvas/source/cairo/cairo_repainttarget.hxx b/canvas/source/cairo/cairo_repainttarget.hxx
index a319bb0a5e01..3e4d40f1efe7 100644
--- a/canvas/source/cairo/cairo_repainttarget.hxx
+++ b/canvas/source/cairo/cairo_repainttarget.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: cairo_repainttarget.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/canvas/source/cairo/cairo_services.cxx b/canvas/source/cairo/cairo_services.cxx
index 43d4cc4184f0..a43b281c56bf 100644
--- a/canvas/source/cairo/cairo_services.cxx
+++ b/canvas/source/cairo/cairo_services.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: cairo_services.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/canvas/source/cairo/cairo_sprite.hxx b/canvas/source/cairo/cairo_sprite.hxx
index 940709e5e252..8f5a0d2d3ddd 100644
--- a/canvas/source/cairo/cairo_sprite.hxx
+++ b/canvas/source/cairo/cairo_sprite.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: cairo_sprite.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/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx
index f43d4276b47b..43911c1113d6 100644
--- a/canvas/source/cairo/cairo_spritecanvas.cxx
+++ b/canvas/source/cairo/cairo_spritecanvas.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: cairo_spritecanvas.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/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx
index bdbb42c6da12..0c942cac1ed3 100644
--- a/canvas/source/cairo/cairo_spritecanvas.hxx
+++ b/canvas/source/cairo/cairo_spritecanvas.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: cairo_spritecanvas.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/canvas/source/cairo/cairo_spritecanvashelper.cxx b/canvas/source/cairo/cairo_spritecanvashelper.cxx
index 274cf7cce588..bb4b44201043 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.cxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.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: cairo_spritecanvashelper.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/canvas/source/cairo/cairo_spritecanvashelper.hxx b/canvas/source/cairo/cairo_spritecanvashelper.hxx
index 8ed1072fb523..2adc245fe4e1 100644
--- a/canvas/source/cairo/cairo_spritecanvashelper.hxx
+++ b/canvas/source/cairo/cairo_spritecanvashelper.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: cairo_spritecanvashelper.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/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index bf9e65e71545..ef345cd60eaf 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.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: cairo_spritedevicehelper.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/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index 38fd95bfbb82..3e46014f28b0 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.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: cairo_spritedevicehelper.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/canvas/source/cairo/cairo_spritehelper.cxx b/canvas/source/cairo/cairo_spritehelper.cxx
index f77d725d6080..a3ba84648f3b 100644
--- a/canvas/source/cairo/cairo_spritehelper.cxx
+++ b/canvas/source/cairo/cairo_spritehelper.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: cairo_spritehelper.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/canvas/source/cairo/cairo_spritehelper.hxx b/canvas/source/cairo/cairo_spritehelper.hxx
index 3bd5f8e8f404..0d770e25003e 100644
--- a/canvas/source/cairo/cairo_spritehelper.hxx
+++ b/canvas/source/cairo/cairo_spritehelper.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: cairo_spritehelper.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/canvas/source/cairo/cairo_spritesurface.hxx b/canvas/source/cairo/cairo_spritesurface.hxx
index 5aaf2b28e542..343d51e5d816 100644
--- a/canvas/source/cairo/cairo_spritesurface.hxx
+++ b/canvas/source/cairo/cairo_spritesurface.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: cairo_spritesurface.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/canvas/source/cairo/cairo_surfaceprovider.hxx b/canvas/source/cairo/cairo_surfaceprovider.hxx
index 1af1454c4706..a6ec53be333f 100644
--- a/canvas/source/cairo/cairo_surfaceprovider.hxx
+++ b/canvas/source/cairo/cairo_surfaceprovider.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: cairo_surfaceprovider.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/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 08a4e7a70fa1..dfe2071c3726 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.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: cairo_textlayout.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/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index 9dbc004d551a..6e14907c01bb 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.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: cairo_textlayout.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/canvas/source/cairo/cairo_win32_cairo.cxx b/canvas/source/cairo/cairo_win32_cairo.cxx
index b679d5fdbf12..d0d6558c2fdd 100644
--- a/canvas/source/cairo/cairo_win32_cairo.cxx
+++ b/canvas/source/cairo/cairo_win32_cairo.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: cairo_win32_cairo.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/canvas/source/cairo/cairo_win32_cairo.hxx b/canvas/source/cairo/cairo_win32_cairo.hxx
index 3ecb04608355..3b083d28e748 100644
--- a/canvas/source/cairo/cairo_win32_cairo.hxx
+++ b/canvas/source/cairo/cairo_win32_cairo.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: cairo_win32_cairo.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/canvas/source/cairo/cairo_xlib_cairo.cxx b/canvas/source/cairo/cairo_xlib_cairo.cxx
index 65f0faae659e..823ad05e426f 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.cxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.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: cairo_xlib_cairo.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/canvas/source/cairo/cairo_xlib_cairo.hxx b/canvas/source/cairo/cairo_xlib_cairo.hxx
index eb5206f8b4eb..aa5cfa67a2b6 100644
--- a/canvas/source/cairo/cairo_xlib_cairo.hxx
+++ b/canvas/source/cairo/cairo_xlib_cairo.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: cairo_xlib_cairo.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/canvas/source/cairo/makefile.mk b/canvas/source/cairo/makefile.mk
index 27a1aeb6dcd7..2c568a4efdbd 100644
--- a/canvas/source/cairo/makefile.mk
+++ b/canvas/source/cairo/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/source/directx/dx_5rm.cxx b/canvas/source/directx/dx_5rm.cxx
index 4937934732cd..bf3045e52678 100755
--- a/canvas/source/directx/dx_5rm.cxx
+++ b/canvas/source/directx/dx_5rm.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: dx_5rm.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/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index acef323ddc1b..849ac3713885 100755
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.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: dx_9rm.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/canvas/source/directx/dx_bitmap.cxx b/canvas/source/directx/dx_bitmap.cxx
index 7f2af1020bca..d1468105a22b 100755
--- a/canvas/source/directx/dx_bitmap.cxx
+++ b/canvas/source/directx/dx_bitmap.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: dx_bitmap.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/canvas/source/directx/dx_bitmap.hxx b/canvas/source/directx/dx_bitmap.hxx
index 1745e3d4f779..5e767994e16c 100755
--- a/canvas/source/directx/dx_bitmap.hxx
+++ b/canvas/source/directx/dx_bitmap.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: dx_bitmap.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/canvas/source/directx/dx_bitmapcanvashelper.cxx b/canvas/source/directx/dx_bitmapcanvashelper.cxx
index 467b91dec1d7..860b56401873 100755
--- a/canvas/source/directx/dx_bitmapcanvashelper.cxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.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: dx_bitmapcanvashelper.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/canvas/source/directx/dx_bitmapcanvashelper.hxx b/canvas/source/directx/dx_bitmapcanvashelper.hxx
index 6291adefc707..411d8764dfc7 100755
--- a/canvas/source/directx/dx_bitmapcanvashelper.hxx
+++ b/canvas/source/directx/dx_bitmapcanvashelper.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: dx_bitmapcanvashelper.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/canvas/source/directx/dx_bitmapprovider.hxx b/canvas/source/directx/dx_bitmapprovider.hxx
index 09147eebcf8d..3eccf3c4939e 100644
--- a/canvas/source/directx/dx_bitmapprovider.hxx
+++ b/canvas/source/directx/dx_bitmapprovider.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: dx_bitmapprovider.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/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx
index 26dd88b0b538..f55467c1af50 100644
--- a/canvas/source/directx/dx_canvas.cxx
+++ b/canvas/source/directx/dx_canvas.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: dx_canvas.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/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx
index ab2aa398757d..aca9873387dc 100644
--- a/canvas/source/directx/dx_canvas.hxx
+++ b/canvas/source/directx/dx_canvas.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: dx_canvas.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/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx
index 5e4b61e6d104..f15af7745422 100755
--- a/canvas/source/directx/dx_canvasbitmap.cxx
+++ b/canvas/source/directx/dx_canvasbitmap.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: dx_canvasbitmap.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/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx
index 1d3b223f5827..75800f3c8abd 100755
--- a/canvas/source/directx/dx_canvasbitmap.hxx
+++ b/canvas/source/directx/dx_canvasbitmap.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: dx_canvasbitmap.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/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx
index a63f7cb74011..9c8309d5e39f 100755
--- a/canvas/source/directx/dx_canvascustomsprite.cxx
+++ b/canvas/source/directx/dx_canvascustomsprite.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: dx_canvascustomsprite.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/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx
index 73a4b88b19f6..be83b26e1b52 100755
--- a/canvas/source/directx/dx_canvascustomsprite.hxx
+++ b/canvas/source/directx/dx_canvascustomsprite.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: dx_canvascustomsprite.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/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx
index f041642e51aa..d87079b34c0f 100755
--- a/canvas/source/directx/dx_canvasfont.cxx
+++ b/canvas/source/directx/dx_canvasfont.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: dx_canvasfont.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/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx
index cbd7c273192d..4a6c8b779ad0 100755
--- a/canvas/source/directx/dx_canvasfont.hxx
+++ b/canvas/source/directx/dx_canvasfont.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: dx_canvasfont.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/canvas/source/directx/dx_canvashelper.cxx b/canvas/source/directx/dx_canvashelper.cxx
index 607f7c076e21..866cc0f03ec3 100755
--- a/canvas/source/directx/dx_canvashelper.cxx
+++ b/canvas/source/directx/dx_canvashelper.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: dx_canvashelper.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/canvas/source/directx/dx_canvashelper.hxx b/canvas/source/directx/dx_canvashelper.hxx
index 57de9b3d28f0..2f175cce88e5 100755
--- a/canvas/source/directx/dx_canvashelper.hxx
+++ b/canvas/source/directx/dx_canvashelper.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: dx_canvashelper.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/canvas/source/directx/dx_canvashelper_texturefill.cxx b/canvas/source/directx/dx_canvashelper_texturefill.cxx
index 73a2d49bfb62..8aa21853db1a 100755
--- a/canvas/source/directx/dx_canvashelper_texturefill.cxx
+++ b/canvas/source/directx/dx_canvashelper_texturefill.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: dx_canvashelper_texturefill.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/canvas/source/directx/dx_config.cxx b/canvas/source/directx/dx_config.cxx
index e124d4d78e6a..bfbb46a42d09 100755
--- a/canvas/source/directx/dx_config.cxx
+++ b/canvas/source/directx/dx_config.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: dx_config.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/canvas/source/directx/dx_config.hxx b/canvas/source/directx/dx_config.hxx
index 1fffcb2ed56e..a1499a64f44f 100644
--- a/canvas/source/directx/dx_config.hxx
+++ b/canvas/source/directx/dx_config.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: dx_config.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/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
index f08609a3b1f9..731e28e2700f 100755
--- a/canvas/source/directx/dx_devicehelper.cxx
+++ b/canvas/source/directx/dx_devicehelper.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: dx_devicehelper.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/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx
index 79ffee0562b0..7c85f7a8f8de 100755
--- a/canvas/source/directx/dx_devicehelper.hxx
+++ b/canvas/source/directx/dx_devicehelper.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: dx_devicehelper.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/canvas/source/directx/dx_gdiplususer.cxx b/canvas/source/directx/dx_gdiplususer.cxx
index 0a070e5e67df..f11965ac6860 100755
--- a/canvas/source/directx/dx_gdiplususer.cxx
+++ b/canvas/source/directx/dx_gdiplususer.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: dx_gdiplususer.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/canvas/source/directx/dx_gdiplususer.hxx b/canvas/source/directx/dx_gdiplususer.hxx
index c80a9f1aedc0..409449aab954 100755
--- a/canvas/source/directx/dx_gdiplususer.hxx
+++ b/canvas/source/directx/dx_gdiplususer.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: dx_gdiplususer.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/canvas/source/directx/dx_graphicsprovider.hxx b/canvas/source/directx/dx_graphicsprovider.hxx
index 977795e7583f..74c47e26a99a 100644
--- a/canvas/source/directx/dx_graphicsprovider.hxx
+++ b/canvas/source/directx/dx_graphicsprovider.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: dx_graphicsprovider.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/canvas/source/directx/dx_ibitmap.hxx b/canvas/source/directx/dx_ibitmap.hxx
index 9d78562765e4..6419d5a198fc 100644
--- a/canvas/source/directx/dx_ibitmap.hxx
+++ b/canvas/source/directx/dx_ibitmap.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: dx_ibitmap.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/canvas/source/directx/dx_impltools.cxx b/canvas/source/directx/dx_impltools.cxx
index 4f5b92d6bcb5..30bd11a2271a 100755
--- a/canvas/source/directx/dx_impltools.cxx
+++ b/canvas/source/directx/dx_impltools.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: dx_impltools.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/canvas/source/directx/dx_impltools.hxx b/canvas/source/directx/dx_impltools.hxx
index 222b1a927305..6eb0bc415ea5 100755
--- a/canvas/source/directx/dx_impltools.hxx
+++ b/canvas/source/directx/dx_impltools.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: dx_impltools.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/canvas/source/directx/dx_linepolypolygon.cxx b/canvas/source/directx/dx_linepolypolygon.cxx
index 9a5569384eae..12bd4e98ae31 100755
--- a/canvas/source/directx/dx_linepolypolygon.cxx
+++ b/canvas/source/directx/dx_linepolypolygon.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: dx_linepolypolygon.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/canvas/source/directx/dx_linepolypolygon.hxx b/canvas/source/directx/dx_linepolypolygon.hxx
index 3e061d76e768..cb2d76587169 100755
--- a/canvas/source/directx/dx_linepolypolygon.hxx
+++ b/canvas/source/directx/dx_linepolypolygon.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: dx_linepolypolygon.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/canvas/source/directx/dx_rendermodule.hxx b/canvas/source/directx/dx_rendermodule.hxx
index 11f8cf6e4261..e6bd8a7b5701 100755
--- a/canvas/source/directx/dx_rendermodule.hxx
+++ b/canvas/source/directx/dx_rendermodule.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: dx_rendermodule.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/canvas/source/directx/dx_sprite.hxx b/canvas/source/directx/dx_sprite.hxx
index 6ff6af1bc701..56c984439f45 100755
--- a/canvas/source/directx/dx_sprite.hxx
+++ b/canvas/source/directx/dx_sprite.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: dx_sprite.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/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx
index 8ffeae3715ab..43350287d92a 100755
--- a/canvas/source/directx/dx_spritecanvas.cxx
+++ b/canvas/source/directx/dx_spritecanvas.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: dx_spritecanvas.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/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx
index 555316d14b9f..5d5e65c23230 100755
--- a/canvas/source/directx/dx_spritecanvas.hxx
+++ b/canvas/source/directx/dx_spritecanvas.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: dx_spritecanvas.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/canvas/source/directx/dx_spritecanvashelper.cxx b/canvas/source/directx/dx_spritecanvashelper.cxx
index 3217089a3543..211fd5502919 100755
--- a/canvas/source/directx/dx_spritecanvashelper.cxx
+++ b/canvas/source/directx/dx_spritecanvashelper.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: dx_spritecanvashelper.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/canvas/source/directx/dx_spritecanvashelper.hxx b/canvas/source/directx/dx_spritecanvashelper.hxx
index d1825670cafc..5015818e0c77 100755
--- a/canvas/source/directx/dx_spritecanvashelper.hxx
+++ b/canvas/source/directx/dx_spritecanvashelper.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: dx_spritecanvashelper.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/canvas/source/directx/dx_spritedevicehelper.cxx b/canvas/source/directx/dx_spritedevicehelper.cxx
index ba997f18f8b6..0437634a8d1e 100644
--- a/canvas/source/directx/dx_spritedevicehelper.cxx
+++ b/canvas/source/directx/dx_spritedevicehelper.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: dx_spritedevicehelper.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/canvas/source/directx/dx_spritedevicehelper.hxx b/canvas/source/directx/dx_spritedevicehelper.hxx
index 9e3f4727cfce..f697b246929e 100644
--- a/canvas/source/directx/dx_spritedevicehelper.hxx
+++ b/canvas/source/directx/dx_spritedevicehelper.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: dx_spritedevicehelper.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/canvas/source/directx/dx_spritehelper.cxx b/canvas/source/directx/dx_spritehelper.cxx
index f68c703b9e12..d0b0c3e2101e 100755
--- a/canvas/source/directx/dx_spritehelper.cxx
+++ b/canvas/source/directx/dx_spritehelper.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: dx_spritehelper.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/canvas/source/directx/dx_spritehelper.hxx b/canvas/source/directx/dx_spritehelper.hxx
index c246467b8eb8..b83b8b6a988c 100755
--- a/canvas/source/directx/dx_spritehelper.hxx
+++ b/canvas/source/directx/dx_spritehelper.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: dx_spritehelper.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/canvas/source/directx/dx_surfacebitmap.cxx b/canvas/source/directx/dx_surfacebitmap.cxx
index e82f814d3b23..258c10c4dd5c 100644
--- a/canvas/source/directx/dx_surfacebitmap.cxx
+++ b/canvas/source/directx/dx_surfacebitmap.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: dx_surfacebitmap.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/canvas/source/directx/dx_surfacebitmap.hxx b/canvas/source/directx/dx_surfacebitmap.hxx
index 7519635d5ccc..c3f1f9ed9074 100644
--- a/canvas/source/directx/dx_surfacebitmap.hxx
+++ b/canvas/source/directx/dx_surfacebitmap.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: dx_surfacebitmap.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/canvas/source/directx/dx_surfacegraphics.cxx b/canvas/source/directx/dx_surfacegraphics.cxx
index 8b9af6be6827..97a89b7e66cf 100755
--- a/canvas/source/directx/dx_surfacegraphics.cxx
+++ b/canvas/source/directx/dx_surfacegraphics.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: dx_surfacegraphics.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/canvas/source/directx/dx_surfacegraphics.hxx b/canvas/source/directx/dx_surfacegraphics.hxx
index 696f2de338d3..29b84ed81670 100755
--- a/canvas/source/directx/dx_surfacegraphics.hxx
+++ b/canvas/source/directx/dx_surfacegraphics.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: dx_surfacegraphics.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/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx
index e1fd917ed772..1516b49d1620 100755
--- a/canvas/source/directx/dx_textlayout.cxx
+++ b/canvas/source/directx/dx_textlayout.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: dx_textlayout.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/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx
index a8562ed34f7a..ca8c6793fe87 100755
--- a/canvas/source/directx/dx_textlayout.hxx
+++ b/canvas/source/directx/dx_textlayout.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: dx_textlayout.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/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx
index 358bd1e9d74f..56ec00e9a648 100755
--- a/canvas/source/directx/dx_textlayout_drawhelper.cxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.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: dx_textlayout_drawhelper.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/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx
index b6e4cd60a64f..c484867055af 100755
--- a/canvas/source/directx/dx_textlayout_drawhelper.hxx
+++ b/canvas/source/directx/dx_textlayout_drawhelper.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: dx_textlayout_drawhelper.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/canvas/source/directx/dx_vcltools.cxx b/canvas/source/directx/dx_vcltools.cxx
index e4d8ac04d5ba..c48931b87eae 100755
--- a/canvas/source/directx/dx_vcltools.cxx
+++ b/canvas/source/directx/dx_vcltools.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: dx_vcltools.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/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx
index c3566951d46a..fab96cb79e5a 100755
--- a/canvas/source/directx/dx_vcltools.hxx
+++ b/canvas/source/directx/dx_vcltools.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: dx_vcltools.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/canvas/source/directx/dx_winstuff.hxx b/canvas/source/directx/dx_winstuff.hxx
index 1c64506c0f21..d1718b07f3d1 100755
--- a/canvas/source/directx/dx_winstuff.hxx
+++ b/canvas/source/directx/dx_winstuff.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: dx_winstuff.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -89,7 +86,7 @@
 
     #include <d3d9.h>
     #include <d3dx9.h>
-    #include <dxerr9.h>
+//  #include <dxerr9.h>     #i107614# removing include, it has been changed in the latest sdk fron August2009 from dxerr9.h into dxerr.h
 
     typedef IDirect3DSurface9 surface_type;
 
@@ -97,11 +94,11 @@
 
 #undef DrawText
 
-#ifdef __MINGW32__

-using ::std::max;

-using ::std::min;

-#endif

-

+#ifdef __MINGW32__
+using ::std::max;
+using ::std::min;
+#endif
+
 #include <gdiplus.h>
 
 #ifdef min
diff --git a/canvas/source/directx/makefile.mk b/canvas/source/directx/makefile.mk
index 1a9db2ec51c0..4ccd5a8448b2 100644
--- a/canvas/source/directx/makefile.mk
+++ b/canvas/source/directx/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx
index e192198f2cdf..f949016d9f83 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.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: cf_service.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/canvas/source/factory/makefile.mk b/canvas/source/factory/makefile.mk
index 1051b953ae81..94e3f0d04255 100644
--- a/canvas/source/factory/makefile.mk
+++ b/canvas/source/factory/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/source/java/BackBuffer.java b/canvas/source/java/BackBuffer.java
index c71a523f35d9..472f6603c33c 100644
--- a/canvas/source/java/BackBuffer.java
+++ b/canvas/source/java/BackBuffer.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: BackBuffer.java,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/canvas/source/java/BezierPolyPolygon.java b/canvas/source/java/BezierPolyPolygon.java
index 54a061477ab8..ed6c08a21abc 100644
--- a/canvas/source/java/BezierPolyPolygon.java
+++ b/canvas/source/java/BezierPolyPolygon.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: BezierPolyPolygon.java,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/canvas/source/java/BitmapCanvas.java b/canvas/source/java/BitmapCanvas.java
index 374a0d71c4fc..f40c9bf34c3a 100644
--- a/canvas/source/java/BitmapCanvas.java
+++ b/canvas/source/java/BitmapCanvas.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: BitmapCanvas.java,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/canvas/source/java/BufferedGraphics2D.java b/canvas/source/java/BufferedGraphics2D.java
index 235de2018d80..88691351809e 100644
--- a/canvas/source/java/BufferedGraphics2D.java
+++ b/canvas/source/java/BufferedGraphics2D.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: BufferedGraphics2D.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/canvas/source/java/CanvasBase.java b/canvas/source/java/CanvasBase.java
index 5f086e268069..2df796d06f84 100644
--- a/canvas/source/java/CanvasBase.java
+++ b/canvas/source/java/CanvasBase.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: CanvasBase.java,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/canvas/source/java/CanvasBitmap.java b/canvas/source/java/CanvasBitmap.java
index e55d96b76472..cfb7617dc094 100644
--- a/canvas/source/java/CanvasBitmap.java
+++ b/canvas/source/java/CanvasBitmap.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: CanvasBitmap.java,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/canvas/source/java/CanvasClonedSprite.java b/canvas/source/java/CanvasClonedSprite.java
index 0976f0adbbaa..d5f85678db4f 100644
--- a/canvas/source/java/CanvasClonedSprite.java
+++ b/canvas/source/java/CanvasClonedSprite.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: CanvasClonedSprite.java,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/canvas/source/java/CanvasCustomSprite.java b/canvas/source/java/CanvasCustomSprite.java
index 3440f2f60dcd..c3165fa68e80 100644
--- a/canvas/source/java/CanvasCustomSprite.java
+++ b/canvas/source/java/CanvasCustomSprite.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: CanvasCustomSprite.java,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/canvas/source/java/CanvasFont.java b/canvas/source/java/CanvasFont.java
index c8f0d76395ba..1ca2cc1aa3ec 100644
--- a/canvas/source/java/CanvasFont.java
+++ b/canvas/source/java/CanvasFont.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: CanvasFont.java,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/canvas/source/java/CanvasGraphicDevice.java b/canvas/source/java/CanvasGraphicDevice.java
index 1c9c99b7a408..c521d627f1a9 100644
--- a/canvas/source/java/CanvasGraphicDevice.java
+++ b/canvas/source/java/CanvasGraphicDevice.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: CanvasGraphicDevice.java,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/canvas/source/java/CanvasSprite.java b/canvas/source/java/CanvasSprite.java
index 630b9ed386aa..9b2cfc0debad 100644
--- a/canvas/source/java/CanvasSprite.java
+++ b/canvas/source/java/CanvasSprite.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: CanvasSprite.java,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/canvas/source/java/CanvasTest_perftest.java b/canvas/source/java/CanvasTest_perftest.java
index 035fce6b38b3..047c9de3b16b 100644
--- a/canvas/source/java/CanvasTest_perftest.java
+++ b/canvas/source/java/CanvasTest_perftest.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: CanvasTest_perftest.java,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/canvas/source/java/CanvasUtils.java b/canvas/source/java/CanvasUtils.java
index 423bb6954e06..8b2245176e03 100644
--- a/canvas/source/java/CanvasUtils.java
+++ b/canvas/source/java/CanvasUtils.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: CanvasUtils.java,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/canvas/source/java/JavaCanvas.java b/canvas/source/java/JavaCanvas.java
index c4090d06ee0f..fbee763fc272 100644
--- a/canvas/source/java/JavaCanvas.java
+++ b/canvas/source/java/JavaCanvas.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: JavaCanvas.java,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/canvas/source/java/LinePolyPolygon.java b/canvas/source/java/LinePolyPolygon.java
index 4c67f387a8de..3ab19d97ba19 100644
--- a/canvas/source/java/LinePolyPolygon.java
+++ b/canvas/source/java/LinePolyPolygon.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: LinePolyPolygon.java,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/canvas/source/java/SpriteBase.java b/canvas/source/java/SpriteBase.java
index d275275454c4..5f2ed3c57ecc 100644
--- a/canvas/source/java/SpriteBase.java
+++ b/canvas/source/java/SpriteBase.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: SpriteBase.java,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/canvas/source/java/SpriteRep.java b/canvas/source/java/SpriteRep.java
index 62755dd01ec0..046a45f2d9bb 100644
--- a/canvas/source/java/SpriteRep.java
+++ b/canvas/source/java/SpriteRep.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: SpriteRep.java,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/canvas/source/java/SpriteRunner.java b/canvas/source/java/SpriteRunner.java
index 4a75125e377a..17e472e7e5c7 100644
--- a/canvas/source/java/SpriteRunner.java
+++ b/canvas/source/java/SpriteRunner.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: SpriteRunner.java,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/canvas/source/java/TextLayout.java b/canvas/source/java/TextLayout.java
index 5495fa7e90be..1a443fcbeeac 100644
--- a/canvas/source/java/TextLayout.java
+++ b/canvas/source/java/TextLayout.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: TextLayout.java,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/canvas/source/java/aqua/WindowAdapter.java b/canvas/source/java/aqua/WindowAdapter.java
index 781e12269f73..2529bb56e55c 100644
--- a/canvas/source/java/aqua/WindowAdapter.java
+++ b/canvas/source/java/aqua/WindowAdapter.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: WindowAdapter.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/canvas/source/java/makefile.mk b/canvas/source/java/makefile.mk
index 9a06b3939c64..86f329e4fe3b 100644
--- a/canvas/source/java/makefile.mk
+++ b/canvas/source/java/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/source/java/perftest/PerfTest.java b/canvas/source/java/perftest/PerfTest.java
index 0534ce3dad0b..98e3cc5c3de5 100644
--- a/canvas/source/java/perftest/PerfTest.java
+++ b/canvas/source/java/perftest/PerfTest.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: PerfTest.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/canvas/source/java/perftest/WindowAdapter.java b/canvas/source/java/perftest/WindowAdapter.java
index 982bbd92d04b..fa34e6720fc7 100644
--- a/canvas/source/java/perftest/WindowAdapter.java
+++ b/canvas/source/java/perftest/WindowAdapter.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: WindowAdapter.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/canvas/source/java/perftest/makefile.mk b/canvas/source/java/perftest/makefile.mk
index 3049887d5a06..787a42adfb74 100644
--- a/canvas/source/java/perftest/makefile.mk
+++ b/canvas/source/java/perftest/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/source/java/win/WindowAdapter.java b/canvas/source/java/win/WindowAdapter.java
index fe3a83b17e67..6cfe54db5991 100644
--- a/canvas/source/java/win/WindowAdapter.java
+++ b/canvas/source/java/win/WindowAdapter.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: WindowAdapter.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/canvas/source/java/x11/WindowAdapter.java b/canvas/source/java/x11/WindowAdapter.java
index e45999eb50c0..555f6c8ca1b8 100644
--- a/canvas/source/java/x11/WindowAdapter.java
+++ b/canvas/source/java/x11/WindowAdapter.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: WindowAdapter.java,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/canvas/source/null/makefile.mk b/canvas/source/null/makefile.mk
index 99a6bbab93a4..98bf2c5c9b71 100644
--- a/canvas/source/null/makefile.mk
+++ b/canvas/source/null/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/source/null/null_canvasbitmap.cxx b/canvas/source/null/null_canvasbitmap.cxx
index 28854a8d6482..9bd2058a6d74 100644
--- a/canvas/source/null/null_canvasbitmap.cxx
+++ b/canvas/source/null/null_canvasbitmap.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: null_canvasbitmap.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/canvas/source/null/null_canvasbitmap.hxx b/canvas/source/null/null_canvasbitmap.hxx
index 9fa94a2f0865..3fa0c15cd314 100644
--- a/canvas/source/null/null_canvasbitmap.hxx
+++ b/canvas/source/null/null_canvasbitmap.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: null_canvasbitmap.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/canvas/source/null/null_canvascustomsprite.cxx b/canvas/source/null/null_canvascustomsprite.cxx
index 6846a6ebea9e..9c45c50954f9 100644
--- a/canvas/source/null/null_canvascustomsprite.cxx
+++ b/canvas/source/null/null_canvascustomsprite.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: null_canvascustomsprite.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/canvas/source/null/null_canvascustomsprite.hxx b/canvas/source/null/null_canvascustomsprite.hxx
index 66d14d1351d2..554fb3033b05 100644
--- a/canvas/source/null/null_canvascustomsprite.hxx
+++ b/canvas/source/null/null_canvascustomsprite.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: null_canvascustomsprite.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/canvas/source/null/null_canvasfont.cxx b/canvas/source/null/null_canvasfont.cxx
index 381c4abb8de1..a8c6f027e40d 100644
--- a/canvas/source/null/null_canvasfont.cxx
+++ b/canvas/source/null/null_canvasfont.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: null_canvasfont.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/canvas/source/null/null_canvasfont.hxx b/canvas/source/null/null_canvasfont.hxx
index e534b44e4bb9..01dc5cac5720 100644
--- a/canvas/source/null/null_canvasfont.hxx
+++ b/canvas/source/null/null_canvasfont.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: null_canvasfont.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/canvas/source/null/null_canvashelper.cxx b/canvas/source/null/null_canvashelper.cxx
index f13a2ddbdd6f..21e2c74f6b95 100644
--- a/canvas/source/null/null_canvashelper.cxx
+++ b/canvas/source/null/null_canvashelper.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: null_canvashelper.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/canvas/source/null/null_canvashelper.hxx b/canvas/source/null/null_canvashelper.hxx
index 6ab908898373..976eb529b56f 100644
--- a/canvas/source/null/null_canvashelper.hxx
+++ b/canvas/source/null/null_canvashelper.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: null_canvashelper.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/canvas/source/null/null_devicehelper.cxx b/canvas/source/null/null_devicehelper.cxx
index 0085e3dbdb95..b04820b15716 100644
--- a/canvas/source/null/null_devicehelper.cxx
+++ b/canvas/source/null/null_devicehelper.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: null_devicehelper.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/canvas/source/null/null_devicehelper.hxx b/canvas/source/null/null_devicehelper.hxx
index d289076db89c..2e6298c2e2b6 100644
--- a/canvas/source/null/null_devicehelper.hxx
+++ b/canvas/source/null/null_devicehelper.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: null_devicehelper.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/canvas/source/null/null_spritecanvas.cxx b/canvas/source/null/null_spritecanvas.cxx
index 04150657ee94..ac41b3fe149a 100644
--- a/canvas/source/null/null_spritecanvas.cxx
+++ b/canvas/source/null/null_spritecanvas.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: null_spritecanvas.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/canvas/source/null/null_spritecanvas.hxx b/canvas/source/null/null_spritecanvas.hxx
index 341f2a5a95a6..662897a3df10 100644
--- a/canvas/source/null/null_spritecanvas.hxx
+++ b/canvas/source/null/null_spritecanvas.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: null_spritecanvas.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/canvas/source/null/null_spritecanvashelper.cxx b/canvas/source/null/null_spritecanvashelper.cxx
index 38be4843820a..60a81726b196 100644
--- a/canvas/source/null/null_spritecanvashelper.cxx
+++ b/canvas/source/null/null_spritecanvashelper.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: null_spritecanvashelper.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/canvas/source/null/null_spritecanvashelper.hxx b/canvas/source/null/null_spritecanvashelper.hxx
index 3c5cff8401c9..4fd7f6764779 100644
--- a/canvas/source/null/null_spritecanvashelper.hxx
+++ b/canvas/source/null/null_spritecanvashelper.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: null_spritecanvashelper.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/canvas/source/null/null_spritehelper.cxx b/canvas/source/null/null_spritehelper.cxx
index 23b0ac6662fe..94a4fa6b6578 100644
--- a/canvas/source/null/null_spritehelper.cxx
+++ b/canvas/source/null/null_spritehelper.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: null_spritehelper.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/canvas/source/null/null_spritehelper.hxx b/canvas/source/null/null_spritehelper.hxx
index ddd79fbde304..18585374ad9a 100644
--- a/canvas/source/null/null_spritehelper.hxx
+++ b/canvas/source/null/null_spritehelper.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: null_spritehelper.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/canvas/source/null/null_textlayout.cxx b/canvas/source/null/null_textlayout.cxx
index ce1e9251fe2f..991de3421958 100644
--- a/canvas/source/null/null_textlayout.cxx
+++ b/canvas/source/null/null_textlayout.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: null_textlayout.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/canvas/source/null/null_textlayout.hxx b/canvas/source/null/null_textlayout.hxx
index 71f0377fd784..4e348b2f5fa8 100644
--- a/canvas/source/null/null_textlayout.hxx
+++ b/canvas/source/null/null_textlayout.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: null_textlayout.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/canvas/source/null/null_usagecounter.hxx b/canvas/source/null/null_usagecounter.hxx
index 3c70c5fd8792..28e3c6b2c176 100644
--- a/canvas/source/null/null_usagecounter.hxx
+++ b/canvas/source/null/null_usagecounter.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: null_usagecounter.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/canvas/source/null/sprite.hxx b/canvas/source/null/sprite.hxx
index f1c995a0a6c9..d34070848765 100644
--- a/canvas/source/null/sprite.hxx
+++ b/canvas/source/null/sprite.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: sprite.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/canvas/source/simplecanvas/makefile.mk b/canvas/source/simplecanvas/makefile.mk
index c0a60250ab85..dc99c0a9bbc9 100644
--- a/canvas/source/simplecanvas/makefile.mk
+++ b/canvas/source/simplecanvas/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx
index 7ca251458d22..2c87eb6d5621 100644
--- a/canvas/source/simplecanvas/simplecanvasimpl.cxx
+++ b/canvas/source/simplecanvas/simplecanvasimpl.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: simplecanvasimpl.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/canvas/source/tools/bitmap.cxx b/canvas/source/tools/bitmap.cxx
index 2222da13e278..eb7732b9a8f6 100644
--- a/canvas/source/tools/bitmap.cxx
+++ b/canvas/source/tools/bitmap.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: bitmap.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/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx
index eee7171292d3..0d850b842007 100644
--- a/canvas/source/tools/cachedprimitivebase.cxx
+++ b/canvas/source/tools/cachedprimitivebase.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: cachedprimitivebase.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/canvas/source/tools/canvascustomspritehelper.cxx b/canvas/source/tools/canvascustomspritehelper.cxx
index c52e9bd2ca2c..f9d4f186d7a7 100644
--- a/canvas/source/tools/canvascustomspritehelper.cxx
+++ b/canvas/source/tools/canvascustomspritehelper.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: canvascustomspritehelper.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/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx
index 278789637c72..7ce8d02038b9 100644
--- a/canvas/source/tools/canvastools.cxx
+++ b/canvas/source/tools/canvastools.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: canvastools.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/canvas/source/tools/elapsedtime.cxx b/canvas/source/tools/elapsedtime.cxx
index 30b684990c31..6ca58a2bf1ee 100644
--- a/canvas/source/tools/elapsedtime.cxx
+++ b/canvas/source/tools/elapsedtime.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: elapsedtime.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/canvas/source/tools/image.cxx b/canvas/source/tools/image.cxx
index 49d1e7daa672..2b7d38abc8ea 100644
--- a/canvas/source/tools/image.cxx
+++ b/canvas/source/tools/image.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: image.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/canvas/source/tools/image.hxx b/canvas/source/tools/image.hxx
index 6757e8425bb9..1c62c7d6276b 100644
--- a/canvas/source/tools/image.hxx
+++ b/canvas/source/tools/image.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: image.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/canvas/source/tools/image_sysprereq.h b/canvas/source/tools/image_sysprereq.h
index 3b4eb4206192..ad81259c75c7 100644
--- a/canvas/source/tools/image_sysprereq.h
+++ b/canvas/source/tools/image_sysprereq.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: image_sysprereq.h,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/canvas/source/tools/imagecachedprimitive.hxx b/canvas/source/tools/imagecachedprimitive.hxx
index 26603440b486..dfcf2bc6a831 100644
--- a/canvas/source/tools/imagecachedprimitive.hxx
+++ b/canvas/source/tools/imagecachedprimitive.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: imagecachedprimitive.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/canvas/source/tools/makefile.mk b/canvas/source/tools/makefile.mk
index 9dc9967fac82..9d9e5ba002bf 100644
--- a/canvas/source/tools/makefile.mk
+++ b/canvas/source/tools/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.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/source/tools/page.cxx b/canvas/source/tools/page.cxx
index 5819a94753a9..5035c0e81916 100644
--- a/canvas/source/tools/page.cxx
+++ b/canvas/source/tools/page.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: page.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/canvas/source/tools/page.hxx b/canvas/source/tools/page.hxx
index 54e487ff6f93..51b770ad4ade 100644
--- a/canvas/source/tools/page.hxx
+++ b/canvas/source/tools/page.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: page.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/canvas/source/tools/pagemanager.cxx b/canvas/source/tools/pagemanager.cxx
index 456e1a7519d2..b867b432857c 100644
--- a/canvas/source/tools/pagemanager.cxx
+++ b/canvas/source/tools/pagemanager.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: pagemanager.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/canvas/source/tools/pagemanager.hxx b/canvas/source/tools/pagemanager.hxx
index a2595d1288b1..bf20b1d61e43 100644
--- a/canvas/source/tools/pagemanager.hxx
+++ b/canvas/source/tools/pagemanager.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: pagemanager.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/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx
index bfce116393d0..db449f6c15f8 100644
--- a/canvas/source/tools/parametricpolypolygon.cxx
+++ b/canvas/source/tools/parametricpolypolygon.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: parametricpolypolygon.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/canvas/source/tools/prioritybooster.cxx b/canvas/source/tools/prioritybooster.cxx
index 9fc331949c29..984003ebc984 100644
--- a/canvas/source/tools/prioritybooster.cxx
+++ b/canvas/source/tools/prioritybooster.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: prioritybooster.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/canvas/source/tools/propertysethelper.cxx b/canvas/source/tools/propertysethelper.cxx
index 5352558f0a4f..c95eae045ee5 100644
--- a/canvas/source/tools/propertysethelper.cxx
+++ b/canvas/source/tools/propertysethelper.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: propertysethelper.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/canvas/source/tools/spriteredrawmanager.cxx b/canvas/source/tools/spriteredrawmanager.cxx
index 834574e8f4c4..7027a9d263df 100644
--- a/canvas/source/tools/spriteredrawmanager.cxx
+++ b/canvas/source/tools/spriteredrawmanager.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: spriteredrawmanager.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/canvas/source/tools/surface.cxx b/canvas/source/tools/surface.cxx
index 96162f6d78af..aaef28ba489f 100644
--- a/canvas/source/tools/surface.cxx
+++ b/canvas/source/tools/surface.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: surface.cxx,v $
- * $Revision: 1.6.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/canvas/source/tools/surface.hxx b/canvas/source/tools/surface.hxx
index 9fd6fa43b75c..9acda579803a 100644
--- a/canvas/source/tools/surface.hxx
+++ b/canvas/source/tools/surface.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: surface.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/canvas/source/tools/surfaceproxy.cxx b/canvas/source/tools/surfaceproxy.cxx
index 62b925866e3b..f4c31d4a2dc6 100644
--- a/canvas/source/tools/surfaceproxy.cxx
+++ b/canvas/source/tools/surfaceproxy.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: surfaceproxy.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/canvas/source/tools/surfaceproxy.hxx b/canvas/source/tools/surfaceproxy.hxx
index a95e65dc7078..7e42096c541b 100644
--- a/canvas/source/tools/surfaceproxy.hxx
+++ b/canvas/source/tools/surfaceproxy.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: surfaceproxy.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/canvas/source/tools/surfaceproxymanager.cxx b/canvas/source/tools/surfaceproxymanager.cxx
index bb53b11dd23b..dcc2ff574b57 100644
--- a/canvas/source/tools/surfaceproxymanager.cxx
+++ b/canvas/source/tools/surfaceproxymanager.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: surfaceproxymanager.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/canvas/source/tools/surfacerect.hxx b/canvas/source/tools/surfacerect.hxx
index d58a48f58406..cbeaa5e144d7 100644
--- a/canvas/source/tools/surfacerect.hxx
+++ b/canvas/source/tools/surfacerect.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: surfacerect.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/canvas/source/tools/verifyinput.cxx b/canvas/source/tools/verifyinput.cxx
index a270f6158979..c2ee4ed968a0 100644
--- a/canvas/source/tools/verifyinput.cxx
+++ b/canvas/source/tools/verifyinput.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: verifyinput.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/canvas/source/vcl/backbuffer.cxx b/canvas/source/vcl/backbuffer.cxx
index 5e08204681d3..3820c4e42657 100644
--- a/canvas/source/vcl/backbuffer.cxx
+++ b/canvas/source/vcl/backbuffer.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: backbuffer.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/canvas/source/vcl/backbuffer.hxx b/canvas/source/vcl/backbuffer.hxx
index 2f9a387b3d1e..4f4dfa1f638c 100644
--- a/canvas/source/vcl/backbuffer.hxx
+++ b/canvas/source/vcl/backbuffer.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: backbuffer.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/canvas/source/vcl/bitmapbackbuffer.cxx b/canvas/source/vcl/bitmapbackbuffer.cxx
index 1cc97351d9c0..31c78283a128 100644
--- a/canvas/source/vcl/bitmapbackbuffer.cxx
+++ b/canvas/source/vcl/bitmapbackbuffer.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: bitmapbackbuffer.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/canvas/source/vcl/bitmapbackbuffer.hxx b/canvas/source/vcl/bitmapbackbuffer.hxx
index 7668aaaaf6b2..96dd525b98a4 100644
--- a/canvas/source/vcl/bitmapbackbuffer.hxx
+++ b/canvas/source/vcl/bitmapbackbuffer.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: bitmapbackbuffer.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/canvas/source/vcl/cachedbitmap.cxx b/canvas/source/vcl/cachedbitmap.cxx
index 96bee5a12a89..70ca3a3e67ed 100644
--- a/canvas/source/vcl/cachedbitmap.cxx
+++ b/canvas/source/vcl/cachedbitmap.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: cachedbitmap.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/canvas/source/vcl/cachedbitmap.hxx b/canvas/source/vcl/cachedbitmap.hxx
index 8f60f1661a9b..c45720c086c8 100644
--- a/canvas/source/vcl/cachedbitmap.hxx
+++ b/canvas/source/vcl/cachedbitmap.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: cachedbitmap.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +30,7 @@
 
 #include <canvas/base/cachedprimitivebase.hxx>
 
-#include <goodies/grfmgr.hxx>
+#include <svtools/grfmgr.hxx>
 
 #include <boost/shared_ptr.hpp>
 
diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 9cc81cd08e57..837c064b4411 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.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: canvas.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/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index 2279f817a406..f7667d8f2c19 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.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: canvas.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/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx
index 7185ac56f894..38008e86ba87 100644
--- a/canvas/source/vcl/canvasbitmap.cxx
+++ b/canvas/source/vcl/canvasbitmap.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: canvasbitmap.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/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx
index fa795c63a8d1..6440b830c3ee 100644
--- a/canvas/source/vcl/canvasbitmap.hxx
+++ b/canvas/source/vcl/canvasbitmap.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: canvasbitmap.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/canvas/source/vcl/canvasbitmaphelper.cxx b/canvas/source/vcl/canvasbitmaphelper.cxx
index 5d5aa0dc8179..8fb5a872589d 100644
--- a/canvas/source/vcl/canvasbitmaphelper.cxx
+++ b/canvas/source/vcl/canvasbitmaphelper.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: canvasbitmaphelper.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/canvas/source/vcl/canvasbitmaphelper.hxx b/canvas/source/vcl/canvasbitmaphelper.hxx
index 9cd3f3718920..196d53d7b58a 100644
--- a/canvas/source/vcl/canvasbitmaphelper.hxx
+++ b/canvas/source/vcl/canvasbitmaphelper.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: canvasbitmaphelper.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/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx
index 2413bab0de5c..a55109a9749f 100644
--- a/canvas/source/vcl/canvascustomsprite.cxx
+++ b/canvas/source/vcl/canvascustomsprite.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: canvascustomsprite.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/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx
index de35bdea1587..21202b75368d 100644
--- a/canvas/source/vcl/canvascustomsprite.hxx
+++ b/canvas/source/vcl/canvascustomsprite.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: canvascustomsprite.hxx,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/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx
index d5b276901594..e95a3f79f2b5 100644
--- a/canvas/source/vcl/canvasfont.cxx
+++ b/canvas/source/vcl/canvasfont.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: canvasfont.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/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx
index 7c979e4e7b17..e0c9a567a29a 100644
--- a/canvas/source/vcl/canvasfont.hxx
+++ b/canvas/source/vcl/canvasfont.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: canvasfont.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/canvas/source/vcl/canvashelper.cxx b/canvas/source/vcl/canvashelper.cxx
index 20b489144d0e..f82ce1344a5c 100644
--- a/canvas/source/vcl/canvashelper.cxx
+++ b/canvas/source/vcl/canvashelper.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: canvashelper.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/canvas/source/vcl/canvashelper.hxx b/canvas/source/vcl/canvashelper.hxx
index a4319daeae1d..ef5eafa0c9ef 100644
--- a/canvas/source/vcl/canvashelper.hxx
+++ b/canvas/source/vcl/canvashelper.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: canvashelper.hxx,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/canvas/source/vcl/canvashelper_texturefill.cxx b/canvas/source/vcl/canvashelper_texturefill.cxx
index 571a8c4fc5a3..11350c0b4f9f 100644
--- a/canvas/source/vcl/canvashelper_texturefill.cxx
+++ b/canvas/source/vcl/canvashelper_texturefill.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: canvashelper_texturefill.cxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -970,22 +967,22 @@ namespace vclcanvas
                                            aLocalState );
                     }
                 }
-                else if ( textures[0].RepeatModeX == rendering::TexturingMode::CLAMP &&

-                          textures[0].RepeatModeY == rendering::TexturingMode::CLAMP )

-                {

-                    rendering::RenderState aLocalState( renderState );

-                    ::canvas::tools::appendToRenderState(aLocalState,

-                                                         aTextureTransform);

-                    ::basegfx::B2DHomMatrix aScaleCorrection;

-                    aScaleCorrection.scale( 1.0/aBmpSize.Width,

-                                            1.0/aBmpSize.Height );

-                    ::canvas::tools::appendToRenderState(aLocalState,

-                                                         aScaleCorrection);

-

-                    return drawBitmap( pCanvas, 

-                                       textures[0].Bitmap,

-                                       viewState,

-                                       aLocalState );

+                else if ( textures[0].RepeatModeX == rendering::TexturingMode::CLAMP &&
+                          textures[0].RepeatModeY == rendering::TexturingMode::CLAMP )
+                {
+                    rendering::RenderState aLocalState( renderState );
+                    ::canvas::tools::appendToRenderState(aLocalState,
+                                                         aTextureTransform);
+                    ::basegfx::B2DHomMatrix aScaleCorrection;
+                    aScaleCorrection.scale( 1.0/aBmpSize.Width,
+                                            1.0/aBmpSize.Height );
+                    ::canvas::tools::appendToRenderState(aLocalState,
+                                                         aScaleCorrection);
+
+                    return drawBitmap( pCanvas,
+                                       textures[0].Bitmap,
+                                       viewState,
+                                       aLocalState );
                 }
                 else
                 {
diff --git a/canvas/source/vcl/devicehelper.cxx b/canvas/source/vcl/devicehelper.cxx
index 853ae52c32c8..9b7b9fac2857 100644
--- a/canvas/source/vcl/devicehelper.cxx
+++ b/canvas/source/vcl/devicehelper.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: devicehelper.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/canvas/source/vcl/devicehelper.hxx b/canvas/source/vcl/devicehelper.hxx
index 87d5d31ebffc..aa17e98b8070 100644
--- a/canvas/source/vcl/devicehelper.hxx
+++ b/canvas/source/vcl/devicehelper.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: devicehelper.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/canvas/source/vcl/impltools.cxx b/canvas/source/vcl/impltools.cxx
index aadd2521d488..b4c19aa5a028 100644
--- a/canvas/source/vcl/impltools.cxx
+++ b/canvas/source/vcl/impltools.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: impltools.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/canvas/source/vcl/impltools.hxx b/canvas/source/vcl/impltools.hxx
index 62b18d7526e0..8bedfc6de340 100644
--- a/canvas/source/vcl/impltools.hxx
+++ b/canvas/source/vcl/impltools.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: impltools.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/canvas/source/vcl/makefile.mk b/canvas/source/vcl/makefile.mk
index fdfdd62d16b8..21eed478123a 100644
--- a/canvas/source/vcl/makefile.mk
+++ b/canvas/source/vcl/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
@@ -73,7 +69,7 @@ SLOFILES =	$(SLO)$/backbuffer.obj \
 
 SHL1TARGET=$(TARGET).uno
 
-SHL1STDLIBS= $(TOOLSLIB) $(TKLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(GOODIESLIB) $(I18NISOLANGLIB)
+SHL1STDLIBS= $(TOOLSLIB) $(TKLIB) $(CPPULIB) $(SALLIB) $(VCLLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(BASEGFXLIB) $(CANVASTOOLSLIB) $(SVTOOLLIB) $(I18NISOLANGLIB)
 
 SHL1IMPLIB=i$(TARGET)
 SHL1LIBS=$(SLB)$/$(TARGET).lib
diff --git a/canvas/source/vcl/outdevprovider.hxx b/canvas/source/vcl/outdevprovider.hxx
index ca2c4556f003..dd5f870c7d9c 100644
--- a/canvas/source/vcl/outdevprovider.hxx
+++ b/canvas/source/vcl/outdevprovider.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: outdevprovider.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/canvas/source/vcl/repainttarget.hxx b/canvas/source/vcl/repainttarget.hxx
index 6317ec4d3ce0..ce2037bf5b67 100644
--- a/canvas/source/vcl/repainttarget.hxx
+++ b/canvas/source/vcl/repainttarget.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: repainttarget.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/canvas/source/vcl/services.cxx b/canvas/source/vcl/services.cxx
index 138dc2f433ac..e8cd2379a38f 100644
--- a/canvas/source/vcl/services.cxx
+++ b/canvas/source/vcl/services.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: services.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/canvas/source/vcl/sprite.hxx b/canvas/source/vcl/sprite.hxx
index 059447cee05c..29ff80239e02 100644
--- a/canvas/source/vcl/sprite.hxx
+++ b/canvas/source/vcl/sprite.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: sprite.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/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx
index 69bd4786b4c8..c08529d3cb35 100644
--- a/canvas/source/vcl/spritecanvas.cxx
+++ b/canvas/source/vcl/spritecanvas.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: spritecanvas.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/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx
index 545eeeed4577..a5d4a6fe1e10 100644
--- a/canvas/source/vcl/spritecanvas.hxx
+++ b/canvas/source/vcl/spritecanvas.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: spritecanvas.hxx,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/canvas/source/vcl/spritecanvashelper.cxx b/canvas/source/vcl/spritecanvashelper.cxx
index 89d3896d0a16..f2327a29c480 100644
--- a/canvas/source/vcl/spritecanvashelper.cxx
+++ b/canvas/source/vcl/spritecanvashelper.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: spritecanvashelper.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/canvas/source/vcl/spritecanvashelper.hxx b/canvas/source/vcl/spritecanvashelper.hxx
index 3a91753240e7..bc80f4359e5b 100644
--- a/canvas/source/vcl/spritecanvashelper.hxx
+++ b/canvas/source/vcl/spritecanvashelper.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: spritecanvashelper.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/canvas/source/vcl/spritedevicehelper.cxx b/canvas/source/vcl/spritedevicehelper.cxx
index 755f1ce9cfdc..4c0ea4fd6d3b 100644
--- a/canvas/source/vcl/spritedevicehelper.cxx
+++ b/canvas/source/vcl/spritedevicehelper.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: spritedevicehelper.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/canvas/source/vcl/spritedevicehelper.hxx b/canvas/source/vcl/spritedevicehelper.hxx
index 14bdc63a4303..eaedbc8ca5ac 100644
--- a/canvas/source/vcl/spritedevicehelper.hxx
+++ b/canvas/source/vcl/spritedevicehelper.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: spritedevicehelper.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/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx
index 123fe1002332..a09905e006a8 100644
--- a/canvas/source/vcl/spritehelper.cxx
+++ b/canvas/source/vcl/spritehelper.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: spritehelper.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/canvas/source/vcl/spritehelper.hxx b/canvas/source/vcl/spritehelper.hxx
index 64b35d6f0703..67aa588dff6e 100644
--- a/canvas/source/vcl/spritehelper.hxx
+++ b/canvas/source/vcl/spritehelper.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: spritehelper.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/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx
index 5787f32cf4bf..a2fd331fa66f 100644
--- a/canvas/source/vcl/textlayout.cxx
+++ b/canvas/source/vcl/textlayout.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: textlayout.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/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx
index 7abe06ea7af0..ad443ae76376 100644
--- a/canvas/source/vcl/textlayout.hxx
+++ b/canvas/source/vcl/textlayout.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: textlayout.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/canvas/source/vcl/windowoutdevholder.cxx b/canvas/source/vcl/windowoutdevholder.cxx
index 23889b0c690d..9515912a1d93 100644
--- a/canvas/source/vcl/windowoutdevholder.cxx
+++ b/canvas/source/vcl/windowoutdevholder.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: windowoutdevholder.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/canvas/source/vcl/windowoutdevholder.hxx b/canvas/source/vcl/windowoutdevholder.hxx
index 6108f5ff5536..ae20a49462e1 100644
--- a/canvas/source/vcl/windowoutdevholder.hxx
+++ b/canvas/source/vcl/windowoutdevholder.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: windowoutdevholder.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/canvas/workben/canvasdemo.cxx b/canvas/workben/canvasdemo.cxx
index dad94cf843c0..6cb2afa82d7b 100644
--- a/canvas/workben/canvasdemo.cxx
+++ b/canvas/workben/canvasdemo.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: canvasdemo.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/comphelper/inc/comphelper/ChainablePropertySet.hxx b/comphelper/inc/comphelper/ChainablePropertySet.hxx
index 2ff717e51c40..0d36c2d10144 100644
--- a/comphelper/inc/comphelper/ChainablePropertySet.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySet.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: ChainablePropertySet.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/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx b/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
index 3f0c2fb9b0ff..76d181e21e7b 100644
--- a/comphelper/inc/comphelper/ChainablePropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/ChainablePropertySetInfo.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: ChainablePropertySetInfo.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/comphelper/inc/comphelper/IdPropArrayHelper.hxx b/comphelper/inc/comphelper/IdPropArrayHelper.hxx
index c7ec62c4c1b8..187c52fdc446 100644
--- a/comphelper/inc/comphelper/IdPropArrayHelper.hxx
+++ b/comphelper/inc/comphelper/IdPropArrayHelper.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: IdPropArrayHelper.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/comphelper/inc/comphelper/InlineContainer.hxx b/comphelper/inc/comphelper/InlineContainer.hxx
index 379aa318cf21..a5d80e263aac 100644
--- a/comphelper/inc/comphelper/InlineContainer.hxx
+++ b/comphelper/inc/comphelper/InlineContainer.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: InlineContainer.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/comphelper/inc/comphelper/MasterPropertySet.hxx b/comphelper/inc/comphelper/MasterPropertySet.hxx
index 25a3dbc78e50..170b4f72db3b 100644
--- a/comphelper/inc/comphelper/MasterPropertySet.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySet.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: MasterPropertySet.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/comphelper/inc/comphelper/MasterPropertySetInfo.hxx b/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
index 8aa50ce9ab22..94a639fca755 100644
--- a/comphelper/inc/comphelper/MasterPropertySetInfo.hxx
+++ b/comphelper/inc/comphelper/MasterPropertySetInfo.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: MasterPropertySetInfo.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/comphelper/inc/comphelper/PropertyInfoHash.hxx b/comphelper/inc/comphelper/PropertyInfoHash.hxx
index 1dedfea288e7..106f40487f5b 100644
--- a/comphelper/inc/comphelper/PropertyInfoHash.hxx
+++ b/comphelper/inc/comphelper/PropertyInfoHash.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: PropertyInfoHash.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/comphelper/inc/comphelper/SelectionMultiplex.hxx b/comphelper/inc/comphelper/SelectionMultiplex.hxx
index 6129b0efe120..633a86f4fdb8 100644
--- a/comphelper/inc/comphelper/SelectionMultiplex.hxx
+++ b/comphelper/inc/comphelper/SelectionMultiplex.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: SelectionMultiplex.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/comphelper/inc/comphelper/SettingsHelper.hxx b/comphelper/inc/comphelper/SettingsHelper.hxx
index f1b1325cd3a8..fa954009c78e 100644
--- a/comphelper/inc/comphelper/SettingsHelper.hxx
+++ b/comphelper/inc/comphelper/SettingsHelper.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: SettingsHelper.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/comphelper/inc/comphelper/TypeGeneration.hxx b/comphelper/inc/comphelper/TypeGeneration.hxx
index 1c177ed7d76c..6660e560f4af 100644
--- a/comphelper/inc/comphelper/TypeGeneration.hxx
+++ b/comphelper/inc/comphelper/TypeGeneration.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: TypeGeneration.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/comphelper/inc/comphelper/accessiblecomponenthelper.hxx b/comphelper/inc/comphelper/accessiblecomponenthelper.hxx
index e9f103b61ba7..68fef8eb1f9e 100644
--- a/comphelper/inc/comphelper/accessiblecomponenthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecomponenthelper.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: accessiblecomponenthelper.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/comphelper/inc/comphelper/accessiblecontexthelper.hxx b/comphelper/inc/comphelper/accessiblecontexthelper.hxx
index bcf646f5e4f7..32a83ca87219 100644
--- a/comphelper/inc/comphelper/accessiblecontexthelper.hxx
+++ b/comphelper/inc/comphelper/accessiblecontexthelper.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: accessiblecontexthelper.hxx,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/comphelper/inc/comphelper/accessibleeventbuffer.hxx b/comphelper/inc/comphelper/accessibleeventbuffer.hxx
index 32e6cee8ae3f..7f1107df50ad 100644
--- a/comphelper/inc/comphelper/accessibleeventbuffer.hxx
+++ b/comphelper/inc/comphelper/accessibleeventbuffer.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: accessibleeventbuffer.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/comphelper/inc/comphelper/accessibleeventnotifier.hxx b/comphelper/inc/comphelper/accessibleeventnotifier.hxx
index 970f73b7b647..7bf5ba76fa0c 100644
--- a/comphelper/inc/comphelper/accessibleeventnotifier.hxx
+++ b/comphelper/inc/comphelper/accessibleeventnotifier.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: accessibleeventnotifier.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/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx b/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
index 6df29331f980..4a7777727290 100644
--- a/comphelper/inc/comphelper/accessiblekeybindinghelper.hxx
+++ b/comphelper/inc/comphelper/accessiblekeybindinghelper.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: accessiblekeybindinghelper.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/comphelper/inc/comphelper/accessibleselectionhelper.hxx b/comphelper/inc/comphelper/accessibleselectionhelper.hxx
index 340662737bbd..12c31b39046c 100644
--- a/comphelper/inc/comphelper/accessibleselectionhelper.hxx
+++ b/comphelper/inc/comphelper/accessibleselectionhelper.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: accessibleselectionhelper.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/comphelper/inc/comphelper/accessibletexthelper.hxx b/comphelper/inc/comphelper/accessibletexthelper.hxx
index 7e31424b95ba..85ad893fd4c4 100644
--- a/comphelper/inc/comphelper/accessibletexthelper.hxx
+++ b/comphelper/inc/comphelper/accessibletexthelper.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: accessibletexthelper.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/comphelper/inc/comphelper/accessiblewrapper.hxx b/comphelper/inc/comphelper/accessiblewrapper.hxx
index 1280d381ad4e..3157142e990f 100644
--- a/comphelper/inc/comphelper/accessiblewrapper.hxx
+++ b/comphelper/inc/comphelper/accessiblewrapper.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: accessiblewrapper.hxx,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/comphelper/inc/comphelper/accimplaccess.hxx b/comphelper/inc/comphelper/accimplaccess.hxx
index b99ef9dc86d8..8c0052ceae61 100644
--- a/comphelper/inc/comphelper/accimplaccess.hxx
+++ b/comphelper/inc/comphelper/accimplaccess.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: accimplaccess.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/comphelper/inc/comphelper/anytostring.hxx b/comphelper/inc/comphelper/anytostring.hxx
index 463bf688888e..92c1685fb440 100644
--- a/comphelper/inc/comphelper/anytostring.hxx
+++ b/comphelper/inc/comphelper/anytostring.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: anytostring.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/comphelper/inc/comphelper/asyncnotification.hxx b/comphelper/inc/comphelper/asyncnotification.hxx
index 20dbbff886b4..fc4dfcd48dd9 100644
--- a/comphelper/inc/comphelper/asyncnotification.hxx
+++ b/comphelper/inc/comphelper/asyncnotification.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: asyncnotification.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/comphelper/inc/comphelper/attributelist.hxx b/comphelper/inc/comphelper/attributelist.hxx
index 6a787f493016..f408f6496fb9 100644
--- a/comphelper/inc/comphelper/attributelist.hxx
+++ b/comphelper/inc/comphelper/attributelist.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: attributelist.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/comphelper/inc/comphelper/basicio.hxx b/comphelper/inc/comphelper/basicio.hxx
index 48e2928fab49..13ec58954d7d 100644
--- a/comphelper/inc/comphelper/basicio.hxx
+++ b/comphelper/inc/comphelper/basicio.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: basicio.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/comphelper/inc/comphelper/broadcasthelper.hxx b/comphelper/inc/comphelper/broadcasthelper.hxx
index ecc483f67e56..9e3f4816238c 100644
--- a/comphelper/inc/comphelper/broadcasthelper.hxx
+++ b/comphelper/inc/comphelper/broadcasthelper.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: broadcasthelper.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/comphelper/inc/comphelper/classids.hxx b/comphelper/inc/comphelper/classids.hxx
index 01241e8a61ca..fddd7c5ad8c1 100644
--- a/comphelper/inc/comphelper/classids.hxx
+++ b/comphelper/inc/comphelper/classids.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: classids.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/comphelper/inc/comphelper/componentbase.hxx b/comphelper/inc/comphelper/componentbase.hxx
index ca12610a709d..12d5fdb64355 100644
--- a/comphelper/inc/comphelper/componentbase.hxx
+++ b/comphelper/inc/comphelper/componentbase.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 COMPHELPER_COMPONENTBASE_HXX
 #define COMPHELPER_COMPONENTBASE_HXX
 
diff --git a/comphelper/inc/comphelper/componentcontext.hxx b/comphelper/inc/comphelper/componentcontext.hxx
index 7ce4917bcba4..c2f68aab96c0 100644
--- a/comphelper/inc/comphelper/componentcontext.hxx
+++ b/comphelper/inc/comphelper/componentcontext.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: componentcontext.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/comphelper/inc/comphelper/componentfactory.hxx b/comphelper/inc/comphelper/componentfactory.hxx
index e1b4482daf31..c23fbbca80d1 100644
--- a/comphelper/inc/comphelper/componentfactory.hxx
+++ b/comphelper/inc/comphelper/componentfactory.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: componentfactory.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/comphelper/inc/comphelper/componentmodule.hxx b/comphelper/inc/comphelper/componentmodule.hxx
index 9e136072a73e..660a685d0fd3 100644
--- a/comphelper/inc/comphelper/componentmodule.hxx
+++ b/comphelper/inc/comphelper/componentmodule.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: componentmodule.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/comphelper/inc/comphelper/composedprops.hxx b/comphelper/inc/comphelper/composedprops.hxx
index 80aa718dcbe3..93dab60cde13 100644
--- a/comphelper/inc/comphelper/composedprops.hxx
+++ b/comphelper/inc/comphelper/composedprops.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: composedprops.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/comphelper/inc/comphelper/configurationhelper.hxx b/comphelper/inc/comphelper/configurationhelper.hxx
index fc6365ef422a..52603cd78b06 100644
--- a/comphelper/inc/comphelper/configurationhelper.hxx
+++ b/comphelper/inc/comphelper/configurationhelper.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: configurationhelper.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/comphelper/inc/comphelper/container.hxx b/comphelper/inc/comphelper/container.hxx
index eb4f07c55423..d509cada5603 100644
--- a/comphelper/inc/comphelper/container.hxx
+++ b/comphelper/inc/comphelper/container.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: container.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/comphelper/inc/comphelper/containermultiplexer.hxx b/comphelper/inc/comphelper/containermultiplexer.hxx
index af0a72298c67..f623f3040cad 100644
--- a/comphelper/inc/comphelper/containermultiplexer.hxx
+++ b/comphelper/inc/comphelper/containermultiplexer.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: containermultiplexer.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/comphelper/inc/comphelper/docpasswordhelper.hxx b/comphelper/inc/comphelper/docpasswordhelper.hxx
index 90927a3e9c6c..0a60c4b53ce9 100644
--- a/comphelper/inc/comphelper/docpasswordhelper.hxx
+++ b/comphelper/inc/comphelper/docpasswordhelper.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: docpasswordhelper.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/comphelper/inc/comphelper/docpasswordrequest.hxx b/comphelper/inc/comphelper/docpasswordrequest.hxx
index b1e042e876bd..7b186b3a261a 100644
--- a/comphelper/inc/comphelper/docpasswordrequest.hxx
+++ b/comphelper/inc/comphelper/docpasswordrequest.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: docpasswordrequest.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/comphelper/inc/comphelper/documentconstants.hxx b/comphelper/inc/comphelper/documentconstants.hxx
index 3bd1151ee6e7..b78150586e28 100644
--- a/comphelper/inc/comphelper/documentconstants.hxx
+++ b/comphelper/inc/comphelper/documentconstants.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: documentconstants.hxx,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/comphelper/inc/comphelper/documentinfo.hxx b/comphelper/inc/comphelper/documentinfo.hxx
index 9c489c600213..c791b8d26aab 100644
--- a/comphelper/inc/comphelper/documentinfo.hxx
+++ b/comphelper/inc/comphelper/documentinfo.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: documentinfo.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/comphelper/inc/comphelper/embeddedobjectcontainer.hxx b/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
index 26a3d4ff82e1..c1382557c52a 100644
--- a/comphelper/inc/comphelper/embeddedobjectcontainer.hxx
+++ b/comphelper/inc/comphelper/embeddedobjectcontainer.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: embeddedobjectcontainer.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/comphelper/inc/comphelper/enumhelper.hxx b/comphelper/inc/comphelper/enumhelper.hxx
index 4a30c3e53a01..7272d9e91d20 100644
--- a/comphelper/inc/comphelper/enumhelper.hxx
+++ b/comphelper/inc/comphelper/enumhelper.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: enumhelper.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/comphelper/inc/comphelper/eventattachermgr.hxx b/comphelper/inc/comphelper/eventattachermgr.hxx
index 53e6a8a2eac1..cae67a71d4d0 100644
--- a/comphelper/inc/comphelper/eventattachermgr.hxx
+++ b/comphelper/inc/comphelper/eventattachermgr.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: eventattachermgr.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/comphelper/inc/comphelper/evtlistenerhlp.hxx b/comphelper/inc/comphelper/evtlistenerhlp.hxx
index 577144ebad5c..422b44abe7a0 100644
--- a/comphelper/inc/comphelper/evtlistenerhlp.hxx
+++ b/comphelper/inc/comphelper/evtlistenerhlp.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: evtlistenerhlp.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/goodies/source/filter.vcl/eos2met/eos2mstr.src b/comphelper/inc/comphelper/evtmethodhelper.hxx
index 9f304706861b..8e34b0e00149 100644..100755
--- a/goodies/source/filter.vcl/eos2met/eos2mstr.src
+++ b/comphelper/inc/comphelper/evtmethodhelper.hxx
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: eos2mstr.src,v $
- * $Revision: 1.4 $
+ * $RCSfile: evtlistenerhlp.hxx,v $
+ * $Revision$
  *
  * This file is part of OpenOffice.org.
  *
@@ -27,15 +27,15 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-
-#include "strings.hrc"
-
-String KEY_MODE
+#ifndef COMPHELPER_EVENTMEHODHELPER_HXX
+#define COMPHELPER_EVENMETHODHELPER_HXX
+#include <comphelper/sequence.hxx>
+//........................................................................
+namespace comphelper
 {
-    Text = "ExportMode";
-};
+    COMPHELPER_DLLPUBLIC ::com::sun::star::uno::Sequence< ::rtl::OUString> getEventMethodsForType(const ::com::sun::star::uno::Type& type);
+//........................................................................
 
-String KEY_SIZE
-{
-    Text = "Size";
-};
+}   // namespace comphelper
+//........................................................................
+#endif // COMPHELPER_EVENTMEHODHELPER_HXX
diff --git a/comphelper/inc/comphelper/extract.hxx b/comphelper/inc/comphelper/extract.hxx
index 84a9011972a9..b44391c17911 100644
--- a/comphelper/inc/comphelper/extract.hxx
+++ b/comphelper/inc/comphelper/extract.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: extract.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/comphelper/inc/comphelper/fileformat.h b/comphelper/inc/comphelper/fileformat.h
index a7da672c17fe..65f37a2551b7 100644
--- a/comphelper/inc/comphelper/fileformat.h
+++ b/comphelper/inc/comphelper/fileformat.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: fileformat.h,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/comphelper/inc/comphelper/genericpropertyset.hxx b/comphelper/inc/comphelper/genericpropertyset.hxx
index 095c2b4be9ec..6364dea5f020 100644
--- a/comphelper/inc/comphelper/genericpropertyset.hxx
+++ b/comphelper/inc/comphelper/genericpropertyset.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: genericpropertyset.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/comphelper/inc/comphelper/guarding.hxx b/comphelper/inc/comphelper/guarding.hxx
index 0cd1ad86a09c..66de00738601 100644
--- a/comphelper/inc/comphelper/guarding.hxx
+++ b/comphelper/inc/comphelper/guarding.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: guarding.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/comphelper/inc/comphelper/ihwrapnofilter.hxx b/comphelper/inc/comphelper/ihwrapnofilter.hxx
index 82ff989997c0..1765716acb66 100644
--- a/comphelper/inc/comphelper/ihwrapnofilter.hxx
+++ b/comphelper/inc/comphelper/ihwrapnofilter.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: ihwrapnofilter.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/comphelper/inc/comphelper/implbase_var.hxx b/comphelper/inc/comphelper/implbase_var.hxx
index f5d60aa7d110..97d360f853a6 100644
--- a/comphelper/inc/comphelper/implbase_var.hxx
+++ b/comphelper/inc/comphelper/implbase_var.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: implbase_var.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/comphelper/inc/comphelper/implementationreference.hxx b/comphelper/inc/comphelper/implementationreference.hxx
index 66f06c803626..806cdc86f129 100644
--- a/comphelper/inc/comphelper/implementationreference.hxx
+++ b/comphelper/inc/comphelper/implementationreference.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: implementationreference.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/comphelper/inc/comphelper/interaction.hxx b/comphelper/inc/comphelper/interaction.hxx
index 1c6c063f476f..1ae1dda61ec4 100644
--- a/comphelper/inc/comphelper/interaction.hxx
+++ b/comphelper/inc/comphelper/interaction.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: interaction.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/comphelper/inc/comphelper/legacysingletonfactory.hxx b/comphelper/inc/comphelper/legacysingletonfactory.hxx
index 1a3c8af95b52..7180a66403bb 100644
--- a/comphelper/inc/comphelper/legacysingletonfactory.hxx
+++ b/comphelper/inc/comphelper/legacysingletonfactory.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: legacysingletonfactory.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/comphelper/inc/comphelper/listenernotification.hxx b/comphelper/inc/comphelper/listenernotification.hxx
index 3e5309e30def..f4bf2f916859 100644
--- a/comphelper/inc/comphelper/listenernotification.hxx
+++ b/comphelper/inc/comphelper/listenernotification.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: listenernotification.hxx,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/comphelper/inc/comphelper/locale.hxx b/comphelper/inc/comphelper/locale.hxx
index 40152555a3d0..3fd8a15aa163 100644
--- a/comphelper/inc/comphelper/locale.hxx
+++ b/comphelper/inc/comphelper/locale.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: locale.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/comphelper/inc/comphelper/logging.hxx b/comphelper/inc/comphelper/logging.hxx
index 6acbba663de6..20f9302cc853 100644
--- a/comphelper/inc/comphelper/logging.hxx
+++ b/comphelper/inc/comphelper/logging.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: logging.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/comphelper/inc/comphelper/make_shared_from_uno.hxx b/comphelper/inc/comphelper/make_shared_from_uno.hxx
index c683ed12fed4..3acd4ec13dfe 100644
--- a/comphelper/inc/comphelper/make_shared_from_uno.hxx
+++ b/comphelper/inc/comphelper/make_shared_from_uno.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: make_shared_from_uno.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/comphelper/inc/comphelper/makesequence.hxx b/comphelper/inc/comphelper/makesequence.hxx
index a1068c8f486d..4273356bf9aa 100644
--- a/comphelper/inc/comphelper/makesequence.hxx
+++ b/comphelper/inc/comphelper/makesequence.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: makesequence.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/comphelper/inc/comphelper/mediadescriptor.hxx b/comphelper/inc/comphelper/mediadescriptor.hxx
index e388c0b4ca3c..ac9661c76ebc 100644
--- a/comphelper/inc/comphelper/mediadescriptor.hxx
+++ b/comphelper/inc/comphelper/mediadescriptor.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: mediadescriptor.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/comphelper/inc/comphelper/mimeconfighelper.hxx b/comphelper/inc/comphelper/mimeconfighelper.hxx
index 011443ad451b..5e02d4761cb1 100644
--- a/comphelper/inc/comphelper/mimeconfighelper.hxx
+++ b/comphelper/inc/comphelper/mimeconfighelper.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: mimeconfighelper.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/comphelper/inc/comphelper/namecontainer.hxx b/comphelper/inc/comphelper/namecontainer.hxx
index 30aefe7fd5ac..30d2326794b0 100644
--- a/comphelper/inc/comphelper/namecontainer.hxx
+++ b/comphelper/inc/comphelper/namecontainer.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: namecontainer.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/comphelper/inc/comphelper/namedvaluecollection.hxx b/comphelper/inc/comphelper/namedvaluecollection.hxx
index e84f29f02580..81aed9171408 100644
--- a/comphelper/inc/comphelper/namedvaluecollection.hxx
+++ b/comphelper/inc/comphelper/namedvaluecollection.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: namedvaluecollection.hxx,v $
- * $Revision: 1.11.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/inc/comphelper/numberedcollection.hxx b/comphelper/inc/comphelper/numberedcollection.hxx
index 3e075634aa74..03bc1e0b78ed 100644
--- a/comphelper/inc/comphelper/numberedcollection.hxx
+++ b/comphelper/inc/comphelper/numberedcollection.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: numberedcollection.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/comphelper/inc/comphelper/numbers.hxx b/comphelper/inc/comphelper/numbers.hxx
index 4aefe0bcf74c..ef5bbe73931c 100644
--- a/comphelper/inc/comphelper/numbers.hxx
+++ b/comphelper/inc/comphelper/numbers.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: numbers.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/comphelper/inc/comphelper/officeresourcebundle.hxx b/comphelper/inc/comphelper/officeresourcebundle.hxx
index d9903d50f9a2..d45209da9374 100644
--- a/comphelper/inc/comphelper/officeresourcebundle.hxx
+++ b/comphelper/inc/comphelper/officeresourcebundle.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: officeresourcebundle.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/comphelper/inc/comphelper/ofopxmlhelper.hxx b/comphelper/inc/comphelper/ofopxmlhelper.hxx
index a10272757472..db203a08d750 100644
--- a/comphelper/inc/comphelper/ofopxmlhelper.hxx
+++ b/comphelper/inc/comphelper/ofopxmlhelper.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: ofopxmlhelper.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/comphelper/inc/comphelper/optional.hxx b/comphelper/inc/comphelper/optional.hxx
index df65c6209c4f..790e117622fd 100644
--- a/comphelper/inc/comphelper/optional.hxx
+++ b/comphelper/inc/comphelper/optional.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: optional.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/comphelper/inc/comphelper/optionalvalue.hxx b/comphelper/inc/comphelper/optionalvalue.hxx
index 14e35ea0b8d7..f63e1cde51aa 100644
--- a/comphelper/inc/comphelper/optionalvalue.hxx
+++ b/comphelper/inc/comphelper/optionalvalue.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: optionalvalue.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/comphelper/inc/comphelper/oslfile2streamwrap.hxx b/comphelper/inc/comphelper/oslfile2streamwrap.hxx
index 2ae927bcee4c..1a0a7cc55e04 100644
--- a/comphelper/inc/comphelper/oslfile2streamwrap.hxx
+++ b/comphelper/inc/comphelper/oslfile2streamwrap.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: oslfile2streamwrap.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/comphelper/inc/comphelper/otransactedfilestream.hxx b/comphelper/inc/comphelper/otransactedfilestream.hxx
index 95257df9d621..b4533b5d9694 100644
--- a/comphelper/inc/comphelper/otransactedfilestream.hxx
+++ b/comphelper/inc/comphelper/otransactedfilestream.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: otransactedfilestream.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/comphelper/inc/comphelper/processfactory.hxx b/comphelper/inc/comphelper/processfactory.hxx
index 9b24f8e784ac..aeaaf498c918 100644
--- a/comphelper/inc/comphelper/processfactory.hxx
+++ b/comphelper/inc/comphelper/processfactory.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: processfactory.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/comphelper/inc/comphelper/propagg.hxx b/comphelper/inc/comphelper/propagg.hxx
index 79015308aeff..b82f737d534b 100644
--- a/comphelper/inc/comphelper/propagg.hxx
+++ b/comphelper/inc/comphelper/propagg.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: propagg.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/comphelper/inc/comphelper/proparrhlp.hxx b/comphelper/inc/comphelper/proparrhlp.hxx
index 133f31423e69..193f7e100c4a 100644
--- a/comphelper/inc/comphelper/proparrhlp.hxx
+++ b/comphelper/inc/comphelper/proparrhlp.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: proparrhlp.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/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx
index 0c31f6b2cb93..5631cf5670f2 100644
--- a/comphelper/inc/comphelper/property.hxx
+++ b/comphelper/inc/comphelper/property.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: property.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/comphelper/inc/comphelper/propertybag.hxx b/comphelper/inc/comphelper/propertybag.hxx
index 75c5330ff638..cf7e99768e44 100644
--- a/comphelper/inc/comphelper/propertybag.hxx
+++ b/comphelper/inc/comphelper/propertybag.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: propertybag.hxx,v $
- * $Revision: 1.4.60.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/inc/comphelper/propertycontainer.hxx b/comphelper/inc/comphelper/propertycontainer.hxx
index 9036879d9875..845ebd05e484 100644
--- a/comphelper/inc/comphelper/propertycontainer.hxx
+++ b/comphelper/inc/comphelper/propertycontainer.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: propertycontainer.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/comphelper/inc/comphelper/propertycontainerhelper.hxx b/comphelper/inc/comphelper/propertycontainerhelper.hxx
index 930c09f82898..247e1a678e02 100644
--- a/comphelper/inc/comphelper/propertycontainerhelper.hxx
+++ b/comphelper/inc/comphelper/propertycontainerhelper.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: propertycontainerhelper.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/comphelper/inc/comphelper/propertysethelper.hxx b/comphelper/inc/comphelper/propertysethelper.hxx
index 5d6fef15a909..505a03c1b4ec 100644
--- a/comphelper/inc/comphelper/propertysethelper.hxx
+++ b/comphelper/inc/comphelper/propertysethelper.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: propertysethelper.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/comphelper/inc/comphelper/propertysetinfo.hxx b/comphelper/inc/comphelper/propertysetinfo.hxx
index 899a46d6b550..06ad4f4eecc3 100644
--- a/comphelper/inc/comphelper/propertysetinfo.hxx
+++ b/comphelper/inc/comphelper/propertysetinfo.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: propertysetinfo.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/comphelper/inc/comphelper/propertystatecontainer.hxx b/comphelper/inc/comphelper/propertystatecontainer.hxx
index 88a233117b73..dde26ddf90cf 100644
--- a/comphelper/inc/comphelper/propertystatecontainer.hxx
+++ b/comphelper/inc/comphelper/propertystatecontainer.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: propertystatecontainer.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/comphelper/inc/comphelper/propmultiplex.hxx b/comphelper/inc/comphelper/propmultiplex.hxx
index 9e2dce0d7b9d..4d640442a9ae 100644
--- a/comphelper/inc/comphelper/propmultiplex.hxx
+++ b/comphelper/inc/comphelper/propmultiplex.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: propmultiplex.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/comphelper/inc/comphelper/propstate.hxx b/comphelper/inc/comphelper/propstate.hxx
index c30024aaf5e4..b0c75147c95c 100644
--- a/comphelper/inc/comphelper/propstate.hxx
+++ b/comphelper/inc/comphelper/propstate.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: propstate.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/comphelper/inc/comphelper/proxyaggregation.hxx b/comphelper/inc/comphelper/proxyaggregation.hxx
index d22a40fa6509..c4c9281da8f2 100644
--- a/comphelper/inc/comphelper/proxyaggregation.hxx
+++ b/comphelper/inc/comphelper/proxyaggregation.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: proxyaggregation.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/comphelper/inc/comphelper/querydeep.hxx b/comphelper/inc/comphelper/querydeep.hxx
index 3b4c05026feb..4115412d8d6c 100644
--- a/comphelper/inc/comphelper/querydeep.hxx
+++ b/comphelper/inc/comphelper/querydeep.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: querydeep.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/comphelper/inc/comphelper/regpathhelper.hxx b/comphelper/inc/comphelper/regpathhelper.hxx
index 499f3e35386a..431cdfb930a6 100644
--- a/comphelper/inc/comphelper/regpathhelper.hxx
+++ b/comphelper/inc/comphelper/regpathhelper.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: regpathhelper.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/comphelper/inc/comphelper/scopeguard.hxx b/comphelper/inc/comphelper/scopeguard.hxx
index b77bec8cded2..4841a564ae61 100644
--- a/comphelper/inc/comphelper/scopeguard.hxx
+++ b/comphelper/inc/comphelper/scopeguard.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: scopeguard.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/comphelper/inc/comphelper/seekableinput.hxx b/comphelper/inc/comphelper/seekableinput.hxx
index 4d1f30e3cf45..5fc7ab5b369f 100644
--- a/comphelper/inc/comphelper/seekableinput.hxx
+++ b/comphelper/inc/comphelper/seekableinput.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: seekableinput.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/comphelper/inc/comphelper/seqstream.hxx b/comphelper/inc/comphelper/seqstream.hxx
index f14e82eb4689..dcde150953f6 100644
--- a/comphelper/inc/comphelper/seqstream.hxx
+++ b/comphelper/inc/comphelper/seqstream.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: seqstream.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/comphelper/inc/comphelper/sequence.hxx b/comphelper/inc/comphelper/sequence.hxx
index ce4d9bbc6103..5e9c5dc49040 100644
--- a/comphelper/inc/comphelper/sequence.hxx
+++ b/comphelper/inc/comphelper/sequence.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: sequence.hxx,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/comphelper/inc/comphelper/sequenceashashmap.hxx b/comphelper/inc/comphelper/sequenceashashmap.hxx
index db8ba1071101..737fd41efb84 100644
--- a/comphelper/inc/comphelper/sequenceashashmap.hxx
+++ b/comphelper/inc/comphelper/sequenceashashmap.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: sequenceashashmap.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/comphelper/inc/comphelper/sequenceasvector.hxx b/comphelper/inc/comphelper/sequenceasvector.hxx
index eff35b3d313b..263b68b24c7c 100644
--- a/comphelper/inc/comphelper/sequenceasvector.hxx
+++ b/comphelper/inc/comphelper/sequenceasvector.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: sequenceasvector.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/comphelper/inc/comphelper/servicedecl.hxx b/comphelper/inc/comphelper/servicedecl.hxx
index 7b77d3ba29e7..5d11d41831f5 100644
--- a/comphelper/inc/comphelper/servicedecl.hxx
+++ b/comphelper/inc/comphelper/servicedecl.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: servicedecl.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/comphelper/inc/comphelper/servicehelper.hxx b/comphelper/inc/comphelper/servicehelper.hxx
index 408684943b44..e856ec9f64b5 100644
--- a/comphelper/inc/comphelper/servicehelper.hxx
+++ b/comphelper/inc/comphelper/servicehelper.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: servicehelper.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/comphelper/inc/comphelper/serviceinfohelper.hxx b/comphelper/inc/comphelper/serviceinfohelper.hxx
new file mode 100644
index 000000000000..87e450260b51
--- /dev/null
+++ b/comphelper/inc/comphelper/serviceinfohelper.hxx
@@ -0,0 +1,63 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: unoprov.hxx,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.
+ *
+ ************************************************************************/
+
+#ifndef COMPHELPER_SERVICEINFOHELPER_HXX
+#define COMPHELPER_SERVICEINFOHELPER_HXX
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include "comphelper/comphelperdllapi.h"
+
+namespace comphelper {
+
+/** this class provides a basic helper for classes suporting the XServiceInfo Interface.
+ *
+ *  you can overload the <code>getSupprotedServiceNames</code> to implement a XServiceInfo.
+ *  you can use the static helper methods to combine your services with that of parent
+ *  or aggregatet classes.
+ */
+class COMPHELPER_DLLPUBLIC ServiceInfoHelper : public ::com::sun::star::lang::XServiceInfo
+{
+public:
+    // 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);
+
+    // helper
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString > concatSequences( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq1,
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq2 ) throw();
+    static void addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* sal_Char* */... ) throw();
+    static sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw();
+};
+
+}
+
+#endif
+
diff --git a/comphelper/inc/comphelper/sharedmutex.hxx b/comphelper/inc/comphelper/sharedmutex.hxx
index 50a643455e85..c57c241f1cbb 100644
--- a/comphelper/inc/comphelper/sharedmutex.hxx
+++ b/comphelper/inc/comphelper/sharedmutex.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: sharedmutex.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
-* it under the terms of the GNU Lesser General Public License version 3
-* only, as published by the Free Software Foundation.
-*
-* OpenOffice.org is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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 COMPHELPER_SHAREDMUTEX_HXX
diff --git a/comphelper/inc/comphelper/stl_types.hxx b/comphelper/inc/comphelper/stl_types.hxx
index 4b3126043a08..7a8a56f5f238 100644
--- a/comphelper/inc/comphelper/stl_types.hxx
+++ b/comphelper/inc/comphelper/stl_types.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: stl_types.hxx,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/comphelper/inc/comphelper/stlunosequence.hxx b/comphelper/inc/comphelper/stlunosequence.hxx
index c9bc525cabd6..d9757bbd9b51 100644
--- a/comphelper/inc/comphelper/stlunosequence.hxx
+++ b/comphelper/inc/comphelper/stlunosequence.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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
@@ -25,6 +21,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
+ *
  ************************************************************************/
 
 #ifndef _COMPHELPER_STLUNOITERATOR_HXX
diff --git a/comphelper/inc/comphelper/storagehelper.hxx b/comphelper/inc/comphelper/storagehelper.hxx
index efb5431959ba..796c0ad47142 100644
--- a/comphelper/inc/comphelper/storagehelper.hxx
+++ b/comphelper/inc/comphelper/storagehelper.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: storagehelper.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/comphelper/inc/comphelper/streamsection.hxx b/comphelper/inc/comphelper/streamsection.hxx
index 4cab0205c94f..e3b8d4ebfe8f 100644
--- a/comphelper/inc/comphelper/streamsection.hxx
+++ b/comphelper/inc/comphelper/streamsection.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: streamsection.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/comphelper/inc/comphelper/string.hxx b/comphelper/inc/comphelper/string.hxx
index 9f6165e03328..8c262edaddfe 100644
--- a/comphelper/inc/comphelper/string.hxx
+++ b/comphelper/inc/comphelper/string.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: string.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/comphelper/inc/comphelper/synchronousdispatch.hxx b/comphelper/inc/comphelper/synchronousdispatch.hxx
index a48cf5e5a286..b215ec2b990b 100644
--- a/comphelper/inc/comphelper/synchronousdispatch.hxx
+++ b/comphelper/inc/comphelper/synchronousdispatch.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: synchronousdispatch.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/comphelper/inc/comphelper/types.hxx b/comphelper/inc/comphelper/types.hxx
index 5a86f8279383..8d5b9f744451 100644
--- a/comphelper/inc/comphelper/types.hxx
+++ b/comphelper/inc/comphelper/types.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: types.hxx,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/comphelper/inc/comphelper/uieventslogger.hxx b/comphelper/inc/comphelper/uieventslogger.hxx
index 97ad6ba4fc62..5cf270751dd1 100644
--- a/comphelper/inc/comphelper/uieventslogger.hxx
+++ b/comphelper/inc/comphelper/uieventslogger.hxx
@@ -1,14 +1,10 @@
 /*************************************************************************
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: uieventslogger.hxx,v $
- *
- * $Revision: 1.2.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,6 +21,7 @@
  * version 3 along with OpenOffice.org.  If not, see
  * <http://www.openoffice.org/license.html>
  * for a copy of the LGPLv3 License.
+ *
  ************************************************************************/
 
 #ifndef _COMPHELPER_UIEVENTSLOGGER_HXX
diff --git a/comphelper/inc/comphelper/uno3.hxx b/comphelper/inc/comphelper/uno3.hxx
index 5b8093025642..cd6196e50e53 100644
--- a/comphelper/inc/comphelper/uno3.hxx
+++ b/comphelper/inc/comphelper/uno3.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: uno3.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/comphelper/inc/comphelper/unwrapargs.hxx b/comphelper/inc/comphelper/unwrapargs.hxx
index 9d63ea0acc92..652187f9139f 100644
--- a/comphelper/inc/comphelper/unwrapargs.hxx
+++ b/comphelper/inc/comphelper/unwrapargs.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: unwrapargs.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/comphelper/inc/comphelper/weak.hxx b/comphelper/inc/comphelper/weak.hxx
index f0490e41e319..b23b673e9b1c 100644
--- a/comphelper/inc/comphelper/weak.hxx
+++ b/comphelper/inc/comphelper/weak.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: weak.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/comphelper/inc/comphelper/weakbag.hxx b/comphelper/inc/comphelper/weakbag.hxx
index f3b3dfb55c46..8b2fa1c4449d 100644
--- a/comphelper/inc/comphelper/weakbag.hxx
+++ b/comphelper/inc/comphelper/weakbag.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: weakbag.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/comphelper/inc/comphelper/weakeventlistener.hxx b/comphelper/inc/comphelper/weakeventlistener.hxx
index c6938e2b8423..930f19f3a40f 100644
--- a/comphelper/inc/comphelper/weakeventlistener.hxx
+++ b/comphelper/inc/comphelper/weakeventlistener.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: weakeventlistener.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -76,7 +73,7 @@ namespace comphelper
 
         inline void resetListener( )
         {
-            m_aListener = ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >();
+            m_aListener.clear();
         }
 
 
diff --git a/comphelper/inc/makefile.mk b/comphelper/inc/makefile.mk
index acc9e04ecd3e..5c466f93be42 100644
--- a/comphelper/inc/makefile.mk
+++ b/comphelper/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/inc/pch/precompiled_comphelper.cxx b/comphelper/inc/pch/precompiled_comphelper.cxx
index 4248678be794..2936d22924b7 100644
--- a/comphelper/inc/pch/precompiled_comphelper.cxx
+++ b/comphelper/inc/pch/precompiled_comphelper.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: precompiled_comphelper.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/comphelper/inc/pch/precompiled_comphelper.hxx b/comphelper/inc/pch/precompiled_comphelper.hxx
index 30b5283e40b4..a3679864b3b1 100644
--- a/comphelper/inc/pch/precompiled_comphelper.hxx
+++ b/comphelper/inc/pch/precompiled_comphelper.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_comphelper.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/comphelper/qa/complex/comphelper/Map.java b/comphelper/qa/complex/comphelper/Map.java
index 00d0b83b94d5..deeffe6baf32 100644
--- a/comphelper/qa/complex/comphelper/Map.java
+++ b/comphelper/qa/complex/comphelper/Map.java
@@ -1,7 +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
  *
@@ -21,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.comphelper;
diff --git a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
index b5e8a4052897..26879a7c83ad 100644
--- a/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.java
+++ b/comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest.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: SequenceOutputStreamUnitTest.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/comphelper/qa/complex/comphelper/Test01.java b/comphelper/qa/complex/comphelper/Test01.java
index 4404a8468734..6900b738aeba 100644
--- a/comphelper/qa/complex/comphelper/Test01.java
+++ b/comphelper/qa/complex/comphelper/Test01.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: Test01.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/comphelper/qa/complex/comphelper/TestHelper.java b/comphelper/qa/complex/comphelper/TestHelper.java
index 6d88280bb372..0a6989e95271 100644
--- a/comphelper/qa/complex/comphelper/TestHelper.java
+++ b/comphelper/qa/complex/comphelper/TestHelper.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: TestHelper.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/comphelper/qa/complex/makefile.mk b/comphelper/qa/complex/makefile.mk
index d0e8a078e2c7..341b6868e1ec 100644
--- a/comphelper/qa/complex/makefile.mk
+++ b/comphelper/qa/complex/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.2.20.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/qa/makefile.mk b/comphelper/qa/makefile.mk
index 52c57a9d77de..6e715675bb03 100644
--- a/comphelper/qa/makefile.mk
+++ b/comphelper/qa/makefile.mk
@@ -1,15 +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: makefile.mk,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/comphelper/qa/test_string.cxx b/comphelper/qa/test_string.cxx
index c237158beccc..648b7a204340 100644
--- a/comphelper/qa/test_string.cxx
+++ b/comphelper/qa/test_string.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: test_string.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/comphelper/qa/test_weakbag.cxx b/comphelper/qa/test_weakbag.cxx
index 470ac2eef6c0..3827e393b58d 100644
--- a/comphelper/qa/test_weakbag.cxx
+++ b/comphelper/qa/test_weakbag.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: test_weakbag.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/comphelper/qa/version.map b/comphelper/qa/version.map
index 4833b67470ca..7321bbca16ad 100644
--- a/comphelper/qa/version.map
+++ b/comphelper/qa/version.map
@@ -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: version.map,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/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx
index c77aaf75f5a8..136bff63f69b 100644
--- a/comphelper/source/compare/AnyCompareFactory.cxx
+++ b/comphelper/source/compare/AnyCompareFactory.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: AnyCompareFactory.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/comphelper/source/compare/makefile.mk b/comphelper/source/compare/makefile.mk
index 5006698823b3..156701d1d969 100644
--- a/comphelper/source/compare/makefile.mk
+++ b/comphelper/source/compare/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx
index a9f413bc46e1..928cb78a8b85 100644
--- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/IndexedPropertyValuesContainer.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: IndexedPropertyValuesContainer.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/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx
index 99a33bb8470e..e57efaec9118 100644
--- a/comphelper/source/container/NamedPropertyValuesContainer.cxx
+++ b/comphelper/source/container/NamedPropertyValuesContainer.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: NamedPropertyValuesContainer.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/comphelper/source/container/container.cxx b/comphelper/source/container/container.cxx
index 86fdc91bdf5c..9f834de85b66 100644
--- a/comphelper/source/container/container.cxx
+++ b/comphelper/source/container/container.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: container.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/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx
index cf01177e9a3e..176f9cab6f8f 100644
--- a/comphelper/source/container/containermultiplexer.cxx
+++ b/comphelper/source/container/containermultiplexer.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: containermultiplexer.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/comphelper/source/container/embeddedobjectcontainer.cxx b/comphelper/source/container/embeddedobjectcontainer.cxx
index 518595742f65..17740e7ef09b 100644
--- a/comphelper/source/container/embeddedobjectcontainer.cxx
+++ b/comphelper/source/container/embeddedobjectcontainer.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: embeddedobjectcontainer.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx
index c7179ff07b91..15241cd72dd6 100644
--- a/comphelper/source/container/enumerablemap.cxx
+++ b/comphelper/source/container/enumerablemap.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_comphelper.hxx"
 
diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx
index 3611333cbbf9..646bffa9810f 100644
--- a/comphelper/source/container/enumhelper.cxx
+++ b/comphelper/source/container/enumhelper.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: enumhelper.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/comphelper/source/container/makefile.mk b/comphelper/source/container/makefile.mk
index 2c43a774b030..97a066f9802a 100644
--- a/comphelper/source/container/makefile.mk
+++ b/comphelper/source/container/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx
index c8e3817bab18..7239a8d573dc 100644
--- a/comphelper/source/container/namecontainer.cxx
+++ b/comphelper/source/container/namecontainer.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: namecontainer.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/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 99ced48127ad..bf217f75c8db 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.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: eventattachermgr.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/comphelper/source/eventattachermgr/makefile.mk b/comphelper/source/eventattachermgr/makefile.mk
index 16043666500b..26aca0467d7d 100644
--- a/comphelper/source/eventattachermgr/makefile.mk
+++ b/comphelper/source/eventattachermgr/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/inc/comphelper_module.hxx b/comphelper/source/inc/comphelper_module.hxx
index 5bbac6f9efc6..ea2fc7eeb4eb 100644
--- a/comphelper/source/inc/comphelper_module.hxx
+++ b/comphelper/source/inc/comphelper_module.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 COMPHELPER_COMPHELPER_MODULE_HXX
 #define COMPHELPER_COMPHELPER_MODULE_HXX
 
diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx
index 17cdd382d802..d61dee3f29f0 100644
--- a/comphelper/source/misc/SelectionMultiplex.cxx
+++ b/comphelper/source/misc/SelectionMultiplex.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: SelectionMultiplex.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/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx
index 639768d20a82..5fb86f3f7b1d 100644
--- a/comphelper/source/misc/accessiblecomponenthelper.cxx
+++ b/comphelper/source/misc/accessiblecomponenthelper.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: accessiblecomponenthelper.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/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx
index 3cbf4c8561e7..2e0281848e8c 100644
--- a/comphelper/source/misc/accessiblecontexthelper.cxx
+++ b/comphelper/source/misc/accessiblecontexthelper.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: accessiblecontexthelper.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/comphelper/source/misc/accessibleeventbuffer.cxx b/comphelper/source/misc/accessibleeventbuffer.cxx
index 9e2b6ec92277..50c61d59b9e6 100644
--- a/comphelper/source/misc/accessibleeventbuffer.cxx
+++ b/comphelper/source/misc/accessibleeventbuffer.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: accessibleeventbuffer.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/comphelper/source/misc/accessibleeventnotifier.cxx b/comphelper/source/misc/accessibleeventnotifier.cxx
index 59d6dc3038a1..421fb9868d73 100644
--- a/comphelper/source/misc/accessibleeventnotifier.cxx
+++ b/comphelper/source/misc/accessibleeventnotifier.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: accessibleeventnotifier.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/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx
index 99002b64bc6f..d3c22071bfd8 100644
--- a/comphelper/source/misc/accessiblekeybindinghelper.cxx
+++ b/comphelper/source/misc/accessiblekeybindinghelper.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: accessiblekeybindinghelper.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/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx
index 3ead475d74be..8e31410b337e 100644
--- a/comphelper/source/misc/accessibleselectionhelper.cxx
+++ b/comphelper/source/misc/accessibleselectionhelper.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: accessibleselectionhelper.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/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx
index 51d0ae03f5f8..e3247cae5b60 100644
--- a/comphelper/source/misc/accessibletexthelper.cxx
+++ b/comphelper/source/misc/accessibletexthelper.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: accessibletexthelper.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/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx
index 766ce813b511..0ed694856b97 100644
--- a/comphelper/source/misc/accessiblewrapper.cxx
+++ b/comphelper/source/misc/accessiblewrapper.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: accessiblewrapper.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/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx
index fb050f48f992..e792b9fe43c1 100644
--- a/comphelper/source/misc/accimplaccess.cxx
+++ b/comphelper/source/misc/accimplaccess.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: accimplaccess.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/comphelper/source/misc/anytostring.cxx b/comphelper/source/misc/anytostring.cxx
index b8bea559e91f..01f282172f18 100644
--- a/comphelper/source/misc/anytostring.cxx
+++ b/comphelper/source/misc/anytostring.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: anytostring.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/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx
index 359fd86060b3..e8bee632a9b4 100644
--- a/comphelper/source/misc/asyncnotification.cxx
+++ b/comphelper/source/misc/asyncnotification.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: asyncnotification.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/comphelper/source/misc/comphelper_module.cxx b/comphelper/source/misc/comphelper_module.cxx
index 08cb48b3ef42..5f423691592a 100644
--- a/comphelper/source/misc/comphelper_module.cxx
+++ b/comphelper/source/misc/comphelper_module.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_comphelper.hxx"
 
diff --git a/comphelper/source/misc/comphelper_services.cxx b/comphelper/source/misc/comphelper_services.cxx
index 8fa318a92eb1..a2d4dd8fc0de 100644
--- a/comphelper/source/misc/comphelper_services.cxx
+++ b/comphelper/source/misc/comphelper_services.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_comphelper.hxx"
 
diff --git a/comphelper/source/misc/componentbase.cxx b/comphelper/source/misc/componentbase.cxx
index bf230f59b132..657c2c6a5972 100644
--- a/comphelper/source/misc/componentbase.cxx
+++ b/comphelper/source/misc/componentbase.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_comphelper.hxx"
 
diff --git a/comphelper/source/misc/componentcontext.cxx b/comphelper/source/misc/componentcontext.cxx
index fd09cca9da9c..0f9ddad5d2f5 100644
--- a/comphelper/source/misc/componentcontext.cxx
+++ b/comphelper/source/misc/componentcontext.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: componentcontext.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/comphelper/source/misc/componentmodule.cxx b/comphelper/source/misc/componentmodule.cxx
index bd79f357aa52..63893d0f6d0d 100644
--- a/comphelper/source/misc/componentmodule.cxx
+++ b/comphelper/source/misc/componentmodule.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: componentmodule.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/comphelper/source/misc/configurationhelper.cxx b/comphelper/source/misc/configurationhelper.cxx
index 12d1c4314818..b78d39217d90 100644
--- a/comphelper/source/misc/configurationhelper.cxx
+++ b/comphelper/source/misc/configurationhelper.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: configurationhelper.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/comphelper/source/misc/docpasswordhelper.cxx b/comphelper/source/misc/docpasswordhelper.cxx
index 1f362c02f881..ea25cb795a53 100644
--- a/comphelper/source/misc/docpasswordhelper.cxx
+++ b/comphelper/source/misc/docpasswordhelper.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: docpasswordhelper.cxx,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/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx
index 187642e10fe9..9377d6c7c473 100644
--- a/comphelper/source/misc/docpasswordrequest.cxx
+++ b/comphelper/source/misc/docpasswordrequest.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: docpasswordrequest.cxx,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/comphelper/source/misc/documentinfo.cxx b/comphelper/source/misc/documentinfo.cxx
index 4104f0888758..aee3a8e005a6 100644
--- a/comphelper/source/misc/documentinfo.cxx
+++ b/comphelper/source/misc/documentinfo.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: documentinfo.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/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx
index 8b999aaf4449..5f07f8058fb3 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.cxx
@@ -1,182 +1,179 @@
-/*************************************************************************

- *

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

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

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

- *

- * $RCSfile: documentiologring.hxx,v $

- * $Revision: 1.0 $

- *

- * 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_comphelper.hxx"

-

-#include <com/sun/star/frame/DoubleInitializationException.hpp>

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

-

-#include <comphelper_module.hxx>

-

-#include "documentiologring.hxx"

-

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

-

-namespace comphelper

-{

-

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

-OSimpleLogRing::OSimpleLogRing( const uno::Reference< uno::XComponentContext >& /*xContext*/ )

-: m_aMessages( SIMPLELOGRING_SIZE )

-, m_bInitialized( sal_False )

-, m_bFull( sal_False )

-, m_nPos( 0 )

-{

-}

-

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

-OSimpleLogRing::~OSimpleLogRing()

-{

-}

-

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

-uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static()

-{

-    uno::Sequence< rtl::OUString > aResult( 1 );

-    aResult[0] = getServiceName_static();

-    return aResult;

-}

-

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

-::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName_static()

-{

-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.logging.SimpleLogRing" ) );

-}

-

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

-::rtl::OUString SAL_CALL OSimpleLogRing::getSingletonName_static()

-{

-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.DocumentIOLogRing" ) );

-}

-

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

-::rtl::OUString SAL_CALL OSimpleLogRing::getServiceName_static()

-{

-    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.SimpleLogRing" ) );

-}

-

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

-uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( const uno::Reference< uno::XComponentContext >& rxContext )

-{

-    return static_cast< cppu::OWeakObject* >( new OSimpleLogRing( rxContext ) );

-}

-

-// XSimpleLogRing

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

-void SAL_CALL OSimpleLogRing::logString( const ::rtl::OUString& aMessage ) throw (uno::RuntimeException)

-{

-    ::osl::MutexGuard aGuard( m_aMutex );

-

-    m_aMessages[m_nPos] = aMessage;

-    if ( ++m_nPos >= m_aMessages.getLength() )

-    {

-        m_nPos = 0;

-        m_bFull = sal_True;

-    }

-

-    // if used once then default initialized

-    m_bInitialized = sal_True;

-}

-

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

-uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException)

-{

-    ::osl::MutexGuard aGuard( m_aMutex );

-

-    sal_Int32 nResLen = m_bFull ? m_aMessages.getLength() : m_nPos;

-    sal_Int32 nStart = m_bFull ? m_nPos : 0;

-    uno::Sequence< ::rtl::OUString > aResult( nResLen );

-

-    for ( sal_Int32 nInd = 0; nInd < nResLen; nInd++ )

-        aResult[nInd] = m_aMessages[ ( nStart + nInd ) % m_aMessages.getLength() ];

-

-    // if used once then default initialized

-    m_bInitialized = sal_True;

-

-    return aResult;

-}

-

-// XInitialization

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

-void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException)

-{

-    ::osl::MutexGuard aGuard( m_aMutex );

-    if ( m_bInitialized )

-        throw frame::DoubleInitializationException();

-

-    if ( !m_refCount )

-        throw uno::RuntimeException(); // the object must be refcounted already!

-

-    sal_Int32 nLen = 0;

-    if ( aArguments.getLength() == 1 && ( aArguments[0] >>= nLen ) && nLen )

-        m_aMessages.realloc( nLen );

-    else

-        throw lang::IllegalArgumentException(

-                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Nonnull size is expected as the first argument!" ) ),

-                uno::Reference< uno::XInterface >(),

-                0 );

-

-    m_bInitialized = sal_True;

-}

-

-// XServiceInfo

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

-::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException)

-{

-    return getImplementationName_static();

-}

-

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

-::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException)

-{

-    const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static();

-    for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ )

-    {

-        if ( aSupportedNames[ nInd ].equals( aServiceName ) )

-            return sal_True;

-    }

-

-    return sal_False;

-}

-

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

-uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException)

-{

-    return getSupportedServiceNames_static();

-}

-

-} // namespace comphelper

-

-void createRegistryInfo_OSimpleLogRing()

-{

-    static ::comphelper::module::OAutoRegistration< ::comphelper::OSimpleLogRing > aAutoRegistration;

-    static ::comphelper::module::OSingletonRegistration< ::comphelper::OSimpleLogRing > aSingletonRegistration;

-}

+/*************************************************************************
+ *
+ * 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_comphelper.hxx"
+
+#include <com/sun/star/frame/DoubleInitializationException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
+
+#include <comphelper_module.hxx>
+
+#include "documentiologring.hxx"
+
+using namespace ::com::sun::star;
+
+namespace comphelper
+{
+
+// ----------------------------------------------------------
+OSimpleLogRing::OSimpleLogRing( const uno::Reference< uno::XComponentContext >& /*xContext*/ )
+: m_aMessages( SIMPLELOGRING_SIZE )
+, m_bInitialized( sal_False )
+, m_bFull( sal_False )
+, m_nPos( 0 )
+{
+}
+
+// ----------------------------------------------------------
+OSimpleLogRing::~OSimpleLogRing()
+{
+}
+
+// ----------------------------------------------------------
+uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames_static()
+{
+    uno::Sequence< rtl::OUString > aResult( 1 );
+    aResult[0] = getServiceName_static();
+    return aResult;
+}
+
+// ----------------------------------------------------------
+::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName_static()
+{
+    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.logging.SimpleLogRing" ) );
+}
+
+// ----------------------------------------------------------
+::rtl::OUString SAL_CALL OSimpleLogRing::getSingletonName_static()
+{
+    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.DocumentIOLogRing" ) );
+}
+
+// ----------------------------------------------------------
+::rtl::OUString SAL_CALL OSimpleLogRing::getServiceName_static()
+{
+    return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.logging.SimpleLogRing" ) );
+}
+
+// ----------------------------------------------------------
+uno::Reference< uno::XInterface > SAL_CALL OSimpleLogRing::Create( const uno::Reference< uno::XComponentContext >& rxContext )
+{
+    return static_cast< cppu::OWeakObject* >( new OSimpleLogRing( rxContext ) );
+}
+
+// XSimpleLogRing
+// ----------------------------------------------------------
+void SAL_CALL OSimpleLogRing::logString( const ::rtl::OUString& aMessage ) throw (uno::RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    m_aMessages[m_nPos] = aMessage;
+    if ( ++m_nPos >= m_aMessages.getLength() )
+    {
+        m_nPos = 0;
+        m_bFull = sal_True;
+    }
+
+    // if used once then default initialized
+    m_bInitialized = sal_True;
+}
+
+// ----------------------------------------------------------
+uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+
+    sal_Int32 nResLen = m_bFull ? m_aMessages.getLength() : m_nPos;
+    sal_Int32 nStart = m_bFull ? m_nPos : 0;
+    uno::Sequence< ::rtl::OUString > aResult( nResLen );
+
+    for ( sal_Int32 nInd = 0; nInd < nResLen; nInd++ )
+        aResult[nInd] = m_aMessages[ ( nStart + nInd ) % m_aMessages.getLength() ];
+
+    // if used once then default initialized
+    m_bInitialized = sal_True;
+
+    return aResult;
+}
+
+// XInitialization
+// ----------------------------------------------------------
+void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException)
+{
+    ::osl::MutexGuard aGuard( m_aMutex );
+    if ( m_bInitialized )
+        throw frame::DoubleInitializationException();
+
+    if ( !m_refCount )
+        throw uno::RuntimeException(); // the object must be refcounted already!
+
+    sal_Int32 nLen = 0;
+    if ( aArguments.getLength() == 1 && ( aArguments[0] >>= nLen ) && nLen )
+        m_aMessages.realloc( nLen );
+    else
+        throw lang::IllegalArgumentException(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Nonnull size is expected as the first argument!" ) ),
+                uno::Reference< uno::XInterface >(),
+                0 );
+
+    m_bInitialized = sal_True;
+}
+
+// XServiceInfo
+// ----------------------------------------------------------
+::rtl::OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException)
+{
+    return getImplementationName_static();
+}
+
+// ----------------------------------------------------------
+::sal_Bool SAL_CALL OSimpleLogRing::supportsService( const ::rtl::OUString& aServiceName ) throw (uno::RuntimeException)
+{
+    const uno::Sequence< rtl::OUString > & aSupportedNames = getSupportedServiceNames_static();
+    for ( sal_Int32 nInd = 0; nInd < aSupportedNames.getLength(); nInd++ )
+    {
+        if ( aSupportedNames[ nInd ].equals( aServiceName ) )
+            return sal_True;
+    }
+
+    return sal_False;
+}
+
+// ----------------------------------------------------------
+uno::Sequence< ::rtl::OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException)
+{
+    return getSupportedServiceNames_static();
+}
+
+} // namespace comphelper
+
+void createRegistryInfo_OSimpleLogRing()
+{
+    static ::comphelper::module::OAutoRegistration< ::comphelper::OSimpleLogRing > aAutoRegistration;
+    static ::comphelper::module::OSingletonRegistration< ::comphelper::OSimpleLogRing > aSingletonRegistration;
+}
diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx
index b2b935c478af..f9626ffe5d62 100644
--- a/comphelper/source/misc/documentiologring.hxx
+++ b/comphelper/source/misc/documentiologring.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: documentiologring.hxx,v $
- * $Revision: 1.0 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx
index 258d50ac3902..6511b9a9ecf7 100644
--- a/comphelper/source/misc/evtlistenerhlp.cxx
+++ b/comphelper/source/misc/evtlistenerhlp.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: evtlistenerhlp.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/comphelper/source/misc/evtmethodhelper.cxx b/comphelper/source/misc/evtmethodhelper.cxx
new file mode 100755
index 000000000000..e91adee3912b
--- /dev/null
+++ b/comphelper/source/misc/evtmethodhelper.cxx
@@ -0,0 +1,77 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: evtlistenerhlp.cxx,v $
+ * $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.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_comphelper.hxx"
+#include "comphelper/evtmethodhelper.hxx"
+#include "cppuhelper/typeprovider.hxx"
+
+using ::com::sun::star::uno::Sequence;
+using ::com::sun::star::uno::Type;
+
+namespace comphelper
+{
+
+    Sequence< ::rtl::OUString> getEventMethodsForType(const Type& type)
+    {
+        typelib_InterfaceTypeDescription *pType=0;
+        type.getDescription( (typelib_TypeDescription**)&pType);
+
+        if(!pType)
+            return Sequence< ::rtl::OUString>();
+
+        Sequence< ::rtl::OUString> aNames(pType->nMembers);
+        ::rtl::OUString* pNames = aNames.getArray();
+        for(sal_Int32 i=0;i<pType->nMembers;i++,++pNames)
+        {
+            // the decription reference
+            typelib_TypeDescriptionReference* pMemberDescriptionReference = pType->ppMembers[i];
+            // the description for the reference
+            typelib_TypeDescription* pMemberDescription = NULL;
+            typelib_typedescriptionreference_getDescription(&pMemberDescription, pMemberDescriptionReference);
+            if (pMemberDescription)
+            {
+                typelib_InterfaceMemberTypeDescription* pRealMemberDescription =
+                reinterpret_cast<typelib_InterfaceMemberTypeDescription*>(pMemberDescription);
+                *pNames = pRealMemberDescription->pMemberName;
+            }
+        }
+        typelib_typedescription_release( (typelib_TypeDescription *)pType );
+        return aNames;
+    }
+
+}
+
+
+
+
+
+
+
diff --git a/comphelper/source/misc/ihwrapnofilter.cxx b/comphelper/source/misc/ihwrapnofilter.cxx
index 5648dedbfd10..1cbd1f09f4c6 100644
--- a/comphelper/source/misc/ihwrapnofilter.cxx
+++ b/comphelper/source/misc/ihwrapnofilter.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: ihwrapnofilter.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/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx
index 11a590c618c3..c147217f1e7f 100644
--- a/comphelper/source/misc/instancelocker.cxx
+++ b/comphelper/source/misc/instancelocker.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: instancelocker.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/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx
index 637cc9fc4579..73800e3cee6f 100644
--- a/comphelper/source/misc/instancelocker.hxx
+++ b/comphelper/source/misc/instancelocker.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: instancelocker.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/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx
index 0bbca8056eb5..c97f879581e4 100644
--- a/comphelper/source/misc/interaction.cxx
+++ b/comphelper/source/misc/interaction.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: interaction.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/comphelper/source/misc/legacysingletonfactory.cxx b/comphelper/source/misc/legacysingletonfactory.cxx
index 0eb7daa178f9..cfc1793e7db2 100644
--- a/comphelper/source/misc/legacysingletonfactory.cxx
+++ b/comphelper/source/misc/legacysingletonfactory.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: legacysingletonfactory.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/comphelper/source/misc/listenernotification.cxx b/comphelper/source/misc/listenernotification.cxx
index 0c20205a1819..a9a14a0b9b72 100644
--- a/comphelper/source/misc/listenernotification.cxx
+++ b/comphelper/source/misc/listenernotification.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: listenernotification.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/comphelper/source/misc/locale.cxx b/comphelper/source/misc/locale.cxx
index 91d3a3704e7e..53c53f1c3c48 100644
--- a/comphelper/source/misc/locale.cxx
+++ b/comphelper/source/misc/locale.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: locale.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/comphelper/source/misc/logging.cxx b/comphelper/source/misc/logging.cxx
index cf5f88dc95c7..445f2cbe6c14 100644
--- a/comphelper/source/misc/logging.cxx
+++ b/comphelper/source/misc/logging.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: logging.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/comphelper/source/misc/makefile.mk b/comphelper/source/misc/makefile.mk
index d0ffc368fd20..94837ce49df9 100644
--- a/comphelper/source/misc/makefile.mk
+++ b/comphelper/source/misc/makefile.mk
@@ -1,15 +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: makefile.mk,v $
-#
-# $Revision: 1.48.16.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,6 +56,7 @@ SLOFILES=   \
             $(SLO)$/docpasswordhelper.obj \
             $(SLO)$/docpasswordrequest.obj \
             $(SLO)$/documentinfo.obj \
+            $(SLO)$/evtmethodhelper.obj \
             $(SLO)$/documentiologring.obj \
             $(SLO)$/evtlistenerhlp.obj \
             $(SLO)$/ihwrapnofilter.obj \
@@ -83,6 +80,7 @@ SLOFILES=   \
             $(SLO)$/sequenceashashmap.obj \
             $(SLO)$/sequence.obj \
             $(SLO)$/servicedecl.obj \
+            $(SLO)$/serviceinfohelper.obj \
             $(SLO)$/sharedmutex.obj \
             $(SLO)$/synchronousdispatch.obj \
             $(SLO)$/storagehelper.obj \
diff --git a/comphelper/source/misc/mediadescriptor.cxx b/comphelper/source/misc/mediadescriptor.cxx
index 44578f840da9..7e3be338992b 100644
--- a/comphelper/source/misc/mediadescriptor.cxx
+++ b/comphelper/source/misc/mediadescriptor.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: mediadescriptor.cxx,v $
- * $Revision: 1.20.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/misc/mimeconfighelper.cxx b/comphelper/source/misc/mimeconfighelper.cxx
index 43fa644d6b52..b677c977739e 100644
--- a/comphelper/source/misc/mimeconfighelper.cxx
+++ b/comphelper/source/misc/mimeconfighelper.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: mimeconfighelper.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/comphelper/source/misc/namedvaluecollection.cxx b/comphelper/source/misc/namedvaluecollection.cxx
index a644b072d303..570a85122c96 100644
--- a/comphelper/source/misc/namedvaluecollection.cxx
+++ b/comphelper/source/misc/namedvaluecollection.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: namedvaluecollection.cxx,v $
- * $Revision: 1.11.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx
index 3fbac134af5f..11f430a30fba 100644
--- a/comphelper/source/misc/numberedcollection.cxx
+++ b/comphelper/source/misc/numberedcollection.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: numberedcollection.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/comphelper/source/misc/numbers.cxx b/comphelper/source/misc/numbers.cxx
index b67007714276..06f9f519c318 100644
--- a/comphelper/source/misc/numbers.cxx
+++ b/comphelper/source/misc/numbers.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: numbers.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/comphelper/source/misc/officeresourcebundle.cxx b/comphelper/source/misc/officeresourcebundle.cxx
index 187b90ca1a81..cbe5b0dc2659 100644
--- a/comphelper/source/misc/officeresourcebundle.cxx
+++ b/comphelper/source/misc/officeresourcebundle.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: officeresourcebundle.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/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx
index 75b911206e90..1a3dd73930ba 100644
--- a/comphelper/source/misc/proxyaggregation.cxx
+++ b/comphelper/source/misc/proxyaggregation.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: proxyaggregation.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/comphelper/source/misc/querydeep.cxx b/comphelper/source/misc/querydeep.cxx
index 4cebd5b1da6c..92e475686783 100644
--- a/comphelper/source/misc/querydeep.cxx
+++ b/comphelper/source/misc/querydeep.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: querydeep.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/comphelper/source/misc/regpathhelper.cxx b/comphelper/source/misc/regpathhelper.cxx
index bfe360bb53bf..0ac8f0277236 100644
--- a/comphelper/source/misc/regpathhelper.cxx
+++ b/comphelper/source/misc/regpathhelper.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: regpathhelper.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/comphelper/source/misc/scopeguard.cxx b/comphelper/source/misc/scopeguard.cxx
index 47a319e6efb6..7ce478d8bea0 100644
--- a/comphelper/source/misc/scopeguard.cxx
+++ b/comphelper/source/misc/scopeguard.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: scopeguard.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/comphelper/source/misc/sequence.cxx b/comphelper/source/misc/sequence.cxx
index f5f643d906c3..b0d7c4da1587 100644
--- a/comphelper/source/misc/sequence.cxx
+++ b/comphelper/source/misc/sequence.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: sequence.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/comphelper/source/misc/sequenceashashmap.cxx b/comphelper/source/misc/sequenceashashmap.cxx
index 8e0d64eb23e2..a79ffc9037cc 100644
--- a/comphelper/source/misc/sequenceashashmap.cxx
+++ b/comphelper/source/misc/sequenceashashmap.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: sequenceashashmap.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/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx
index 08b01dcd8bf4..7c3dd169485d 100644
--- a/comphelper/source/misc/servicedecl.cxx
+++ b/comphelper/source/misc/servicedecl.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: servicedecl.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/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx
new file mode 100644
index 000000000000..f2f9da278a06
--- /dev/null
+++ b/comphelper/source/misc/serviceinfohelper.cxx
@@ -0,0 +1,112 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: unoprov.cxx,v $
+ * $Revision: 1.72.92.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_comphelper.hxx"
+
+#include "comphelper/serviceinfohelper.hxx"
+#include <stdarg.h>
+
+// #####################################################################
+
+namespace comphelper
+{
+
+/** returns an empty UString(). most times sufficient */
+::rtl::OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( ::com::sun::star::uno::RuntimeException )
+{
+    return ::rtl::OUString();
+}
+
+/** the base implementation iterates over the service names from <code>getSupportedServiceNames</code> */
+sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException)
+{
+    return supportsService( ServiceName, getSupportedServiceNames() );
+}
+
+sal_Bool SAL_CALL ServiceInfoHelper::supportsService( const ::rtl::OUString& ServiceName, const ::com::sun::star::uno::Sequence< ::rtl::OUString >& SupportedServices ) throw()
+{
+    const ::rtl::OUString * pArray = SupportedServices.getConstArray();
+    for( sal_Int32 i = 0; i < SupportedServices.getLength(); i++ )
+        if( pArray[i] == ServiceName )
+            return sal_True;
+    return sal_False;
+}
+
+/** the base implementation has no supported services */
+::com::sun::star::uno::Sequence< ::rtl::OUString > ServiceInfoHelper::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
+{
+    ::com::sun::star::uno::Sequence< ::rtl::OUString> aSeq(0);
+    return aSeq;
+}
+
+/** this method concatenates the given sequences and returns the result
+ */
+::com::sun::star::uno::Sequence< ::rtl::OUString > ServiceInfoHelper::concatSequences( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq1,
+        const ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq2 ) throw()
+{
+    const sal_Int32 nLen1 = rSeq1.getLength();
+    const sal_Int32 nLen2 = rSeq2.getLength();
+
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq( nLen1 + nLen2 );
+
+    ::rtl::OUString* pStrings = aSeq.getArray();
+
+    sal_Int32 nIdx;
+    const ::rtl::OUString* pStringSrc = rSeq1.getConstArray();
+    for( nIdx = 0; nIdx < nLen1; nIdx++ )
+        *pStrings++ = *pStringSrc++;
+
+    pStringSrc = rSeq2.getConstArray();
+    for( nIdx = 0; nIdx < nLen2; nIdx++ )
+        *pStrings++ = *pStringSrc++;
+
+    return aSeq;
+}
+
+/** this method adds a variable number of char pointer to a given Sequence
+ */
+void ServiceInfoHelper::addToSequence( ::com::sun::star::uno::Sequence< ::rtl::OUString >& rSeq, sal_uInt16 nServices, /* char * */ ... ) throw()
+{
+    sal_uInt32 nCount = rSeq.getLength();
+
+    rSeq.realloc( nCount + nServices );
+    rtl::OUString* pStrings = rSeq.getArray();
+
+    va_list marker;
+    va_start( marker, nServices );
+    for( sal_uInt16 i = 0 ; i < nServices; i++ )
+        pStrings[nCount++] = rtl::OUString::createFromAscii(va_arg( marker, char*));
+    va_end( marker );
+}
+
+}
+
+
diff --git a/comphelper/source/misc/sharedmutex.cxx b/comphelper/source/misc/sharedmutex.cxx
index a3ede5b71821..4d3fade030a6 100644
--- a/comphelper/source/misc/sharedmutex.cxx
+++ b/comphelper/source/misc/sharedmutex.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: sharedmutex.cxx,v $
-*
-* $Revision: 1.1.2.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.
+ *
 ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx
index d2284409bdce..eda42ec98abb 100644
--- a/comphelper/source/misc/storagehelper.cxx
+++ b/comphelper/source/misc/storagehelper.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: storagehelper.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/comphelper/source/misc/string.cxx b/comphelper/source/misc/string.cxx
index e9437528b0de..951baf0be8d2 100644
--- a/comphelper/source/misc/string.cxx
+++ b/comphelper/source/misc/string.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: string.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/comphelper/source/misc/synchronousdispatch.cxx b/comphelper/source/misc/synchronousdispatch.cxx
index 4a5dfcf5da20..3c55556973f3 100644
--- a/comphelper/source/misc/synchronousdispatch.cxx
+++ b/comphelper/source/misc/synchronousdispatch.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: synchronousdispatch.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/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx
index 2a9180c038b0..31719eec881a 100644
--- a/comphelper/source/misc/types.cxx
+++ b/comphelper/source/misc/types.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: types.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/comphelper/source/misc/uieventslogger.cxx b/comphelper/source/misc/uieventslogger.cxx
index b88abff17f4a..710c08fdd706 100644
--- a/comphelper/source/misc/uieventslogger.cxx
+++ b/comphelper/source/misc/uieventslogger.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: uieventslogger.cxx,v $
-*
-* $Revision: 1.3.20.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/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx
index 892c59179cfb..e84e069f0e38 100644
--- a/comphelper/source/misc/weak.cxx
+++ b/comphelper/source/misc/weak.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: weak.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/comphelper/source/misc/weakeventlistener.cxx b/comphelper/source/misc/weakeventlistener.cxx
index 6e391b072a94..0a96698e7b92 100644
--- a/comphelper/source/misc/weakeventlistener.cxx
+++ b/comphelper/source/misc/weakeventlistener.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: weakeventlistener.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/comphelper/source/officeinstdir/makefile.mk b/comphelper/source/officeinstdir/makefile.mk
index 4ff9f447c9cc..dfe195da662a 100644
--- a/comphelper/source/officeinstdir/makefile.mk
+++ b/comphelper/source/officeinstdir/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 219e56ce1a37..3ce0d4de865a 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.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: officeinstallationdirectories.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/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index 52dcd38d564a..2ffb3582718a 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.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: officeinstallationdirectories.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/comphelper/source/processfactory/componentfactory.cxx b/comphelper/source/processfactory/componentfactory.cxx
index ccc05f58afdb..7a3b17111072 100644
--- a/comphelper/source/processfactory/componentfactory.cxx
+++ b/comphelper/source/processfactory/componentfactory.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: componentfactory.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/comphelper/source/processfactory/makefile.mk b/comphelper/source/processfactory/makefile.mk
index 168e7a99b2df..531291bb3a15 100644
--- a/comphelper/source/processfactory/makefile.mk
+++ b/comphelper/source/processfactory/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/processfactory/processfactory.cxx b/comphelper/source/processfactory/processfactory.cxx
index c4eac583e3c0..514d3377edab 100644
--- a/comphelper/source/processfactory/processfactory.cxx
+++ b/comphelper/source/processfactory/processfactory.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: processfactory.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/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx
index 567db83d1626..936510f21309 100644
--- a/comphelper/source/property/ChainablePropertySet.cxx
+++ b/comphelper/source/property/ChainablePropertySet.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: ChainablePropertySet.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/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx
index c5d134eb9982..6660517ef97e 100644
--- a/comphelper/source/property/ChainablePropertySetInfo.cxx
+++ b/comphelper/source/property/ChainablePropertySetInfo.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: ChainablePropertySetInfo.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/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx
index 884f3d635628..28078a8019fc 100644
--- a/comphelper/source/property/MasterPropertySet.cxx
+++ b/comphelper/source/property/MasterPropertySet.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: MasterPropertySet.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/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx
index 91a9a17856d4..57cf22b77508 100644
--- a/comphelper/source/property/MasterPropertySetInfo.cxx
+++ b/comphelper/source/property/MasterPropertySetInfo.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: MasterPropertySetInfo.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/comphelper/source/property/TypeGeneration.cxx b/comphelper/source/property/TypeGeneration.cxx
index b771c8d90349..bf880330ce75 100644
--- a/comphelper/source/property/TypeGeneration.cxx
+++ b/comphelper/source/property/TypeGeneration.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: TypeGeneration.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/comphelper/source/property/composedprops.cxx b/comphelper/source/property/composedprops.cxx
index fe41319ebccc..4b44a8fb474e 100644
--- a/comphelper/source/property/composedprops.cxx
+++ b/comphelper/source/property/composedprops.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: composedprops.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/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx
index 19911709860d..b7fb09912153 100644
--- a/comphelper/source/property/genericpropertyset.cxx
+++ b/comphelper/source/property/genericpropertyset.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: genericpropertyset.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/comphelper/source/property/makefile.mk b/comphelper/source/property/makefile.mk
index 1ccc04a2662f..1bcdb4c8dd63 100644
--- a/comphelper/source/property/makefile.mk
+++ b/comphelper/source/property/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.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx
index 8b816e8c1ce9..f1282a48c2dd 100644
--- a/comphelper/source/property/opropertybag.cxx
+++ b/comphelper/source/property/opropertybag.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: opropertybag.cxx,v $
- * $Revision: 1.3.44.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -240,7 +237,7 @@ namespace comphelper
         if ( !( _element >>= aProperty ) )
             throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
 
-        ::osl::MutexGuard aGuard( m_aMutex );
+        ::osl::ClearableMutexGuard g( m_aMutex );
 
         // check whether the type is allowed, everything else will be checked
         // by m_aDynamicProperties
@@ -254,6 +251,7 @@ namespace comphelper
         // our property info is dirty
         m_pArrayHelper.reset();
 
+        g.clear();
         setModified(sal_True);
     }
 
@@ -346,7 +344,7 @@ namespace comphelper
     //--------------------------------------------------------------------
     void SAL_CALL OPropertyBag::addProperty( const ::rtl::OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
+        ::osl::ClearableMutexGuard g( m_aMutex );
 
         // check whether the type is allowed, everything else will be checked
         // by m_aDynamicProperties
@@ -362,19 +360,21 @@ namespace comphelper
         // our property info is dirty
         m_pArrayHelper.reset();
 
+        g.clear();
         setModified(sal_True);
     }
 
     //--------------------------------------------------------------------
     void SAL_CALL OPropertyBag::removeProperty( const ::rtl::OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException)
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
+        ::osl::ClearableMutexGuard g( m_aMutex );
 
         m_aDynamicProperties.removeProperty( _rName );
 
         // our property info is dirty
         m_pArrayHelper.reset();
 
+        g.clear();
         setModified(sal_True);
     }
 
diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx
index 47e5816b3484..3b9549f7c023 100644
--- a/comphelper/source/property/opropertybag.hxx
+++ b/comphelper/source/property/opropertybag.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: opropertybag.hxx,v $
- * $Revision: 1.4.38.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx
index bb16941c3e60..e796c29eba90 100644
--- a/comphelper/source/property/propagg.cxx
+++ b/comphelper/source/property/propagg.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: propagg.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/comphelper/source/property/property.cxx b/comphelper/source/property/property.cxx
index fe6cbaa9d767..6ab48aa1965b 100644
--- a/comphelper/source/property/property.cxx
+++ b/comphelper/source/property/property.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: property.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,15 +35,11 @@
 #include <osl/diagnose.h>
 
 #if OSL_DEBUG_LEVEL > 0
-    #ifndef _RTL_STRBUF_HXX_
     #include <rtl/strbuf.hxx>
-    #endif
-    #ifndef _CPPUHELPER_EXC_HLP_HXX_
     #include <cppuhelper/exc_hlp.hxx>
-    #endif
-    #ifndef _OSL_THREAD_H_
     #include <osl/thread.h>
-    #endif
+    #include <com/sun/star/lang/XServiceInfo.hpp>
+    #include <typeinfo>
 #endif
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
@@ -71,6 +64,10 @@ namespace comphelper
     using ::com::sun::star::uno::cpp_queryInterface;
     using ::com::sun::star::uno::cpp_acquire;
     using ::com::sun::star::uno::cpp_release;
+#if OSL_DEBUG_LEVEL > 0
+    using ::com::sun::star::lang::XServiceInfo;
+#endif
+    using ::com::sun::star::uno::UNO_QUERY;
     /** === end UNO using === **/
     namespace PropertyAttribute = ::com::sun::star::beans::PropertyAttribute;
 
@@ -110,7 +107,18 @@ void copyProperties(const Reference<XPropertySet>& _rxSource,
                 ::rtl::OStringBuffer aBuffer;
                 aBuffer.append( "::comphelper::copyProperties: could not copy property '" );
                 aBuffer.append( ::rtl::OString( pSourceProps->Name.getStr(), pSourceProps->Name.getLength(), RTL_TEXTENCODING_ASCII_US ) );
-                aBuffer.append( "' to the destination set.\n" );
+                aBuffer.append( "' to the destination set (a '" );
+
+                Reference< XServiceInfo > xSI( _rxDest, UNO_QUERY );
+                if ( xSI.is() )
+                {
+                    aBuffer.append( ::rtl::OUStringToOString( xSI->getImplementationName(), osl_getThreadTextEncoding() ) );
+                }
+                else
+                {
+                    aBuffer.append( typeid( *_rxDest.get() ).name() );
+                }
+                aBuffer.append( "' implementation).\n" );
 
                 Any aException( ::cppu::getCaughtException() );
                 aBuffer.append( "Caught an exception of type '" );
diff --git a/comphelper/source/property/propertybag.cxx b/comphelper/source/property/propertybag.cxx
index 383e1cc2c5aa..88f925e20db7 100644
--- a/comphelper/source/property/propertybag.cxx
+++ b/comphelper/source/property/propertybag.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: propertybag.cxx,v $
- * $Revision: 1.4.60.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx
index b9a2993b19f7..c385107733fe 100644
--- a/comphelper/source/property/propertycontainer.cxx
+++ b/comphelper/source/property/propertycontainer.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: propertycontainer.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/comphelper/source/property/propertycontainerhelper.cxx b/comphelper/source/property/propertycontainerhelper.cxx
index 7f5db1d6cf7e..0b420a3eebd8 100644
--- a/comphelper/source/property/propertycontainerhelper.cxx
+++ b/comphelper/source/property/propertycontainerhelper.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: propertycontainerhelper.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/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx
index 7996585eb915..9d2abf784c1b 100644
--- a/comphelper/source/property/propertysethelper.cxx
+++ b/comphelper/source/property/propertysethelper.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: propertysethelper.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/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx
index 83b769553331..efdd495ac1bc 100644
--- a/comphelper/source/property/propertysetinfo.cxx
+++ b/comphelper/source/property/propertysetinfo.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: propertysetinfo.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/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx
index b53c7dd3cdb9..341dc1b43a78 100644
--- a/comphelper/source/property/propertystatecontainer.cxx
+++ b/comphelper/source/property/propertystatecontainer.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: propertystatecontainer.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/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx
index f78265efdf52..db0b35650d32 100644
--- a/comphelper/source/property/propmultiplex.cxx
+++ b/comphelper/source/property/propmultiplex.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: propmultiplex.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/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx
index 7c7c4f1e50a7..214bccb3f40f 100644
--- a/comphelper/source/property/propstate.cxx
+++ b/comphelper/source/property/propstate.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: propstate.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/comphelper/source/streaming/basicio.cxx b/comphelper/source/streaming/basicio.cxx
index 1b70cc624eec..eef5c6b844fa 100644
--- a/comphelper/source/streaming/basicio.cxx
+++ b/comphelper/source/streaming/basicio.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: basicio.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/comphelper/source/streaming/makefile.mk b/comphelper/source/streaming/makefile.mk
index 4590337276f3..2a6ea38ca65e 100644
--- a/comphelper/source/streaming/makefile.mk
+++ b/comphelper/source/streaming/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx
index a2baef21010e..5298b7511f09 100644
--- a/comphelper/source/streaming/memorystream.cxx
+++ b/comphelper/source/streaming/memorystream.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: memorystream.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/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx
index 3270ae91f7de..9cf8eeaaf08a 100644
--- a/comphelper/source/streaming/oslfile2streamwrap.cxx
+++ b/comphelper/source/streaming/oslfile2streamwrap.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: oslfile2streamwrap.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/comphelper/source/streaming/otransactedfilestream.cxx b/comphelper/source/streaming/otransactedfilestream.cxx
index be42bedcf85b..03539a12305b 100644
--- a/comphelper/source/streaming/otransactedfilestream.cxx
+++ b/comphelper/source/streaming/otransactedfilestream.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: otransactedfilestream.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/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx
index ba9c06842a9c..abaf46faf014 100644
--- a/comphelper/source/streaming/seekableinput.cxx
+++ b/comphelper/source/streaming/seekableinput.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: seekableinput.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/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx
index af7d9fcf44dd..015387b9894d 100644
--- a/comphelper/source/streaming/seqinputstreamserv.cxx
+++ b/comphelper/source/streaming/seqinputstreamserv.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: seqinputstreamserv.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/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx
index 63ff63321f2e..a51653e6e419 100644
--- a/comphelper/source/streaming/seqoutputstreamserv.cxx
+++ b/comphelper/source/streaming/seqoutputstreamserv.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: seqoutputstreamserv.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/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx
index e6b0f403fe97..5c8a32b1f6e5 100644
--- a/comphelper/source/streaming/seqstream.cxx
+++ b/comphelper/source/streaming/seqstream.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: seqstream.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/comphelper/source/streaming/streamsection.cxx b/comphelper/source/streaming/streamsection.cxx
index 17cb373cbf89..324299813986 100644
--- a/comphelper/source/streaming/streamsection.cxx
+++ b/comphelper/source/streaming/streamsection.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: streamsection.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/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx
index b0f245afdefb..bcf32b85011f 100644
--- a/comphelper/source/xml/attributelist.cxx
+++ b/comphelper/source/xml/attributelist.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: attributelist.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/comphelper/source/xml/makefile.mk b/comphelper/source/xml/makefile.mk
index 7e60939b3820..8fa34b2477a2 100644
--- a/comphelper/source/xml/makefile.mk
+++ b/comphelper/source/xml/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx
index ed13fa2207f9..9ad617b0e6d1 100644
--- a/comphelper/source/xml/ofopxmlhelper.cxx
+++ b/comphelper/source/xml/ofopxmlhelper.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: ofopxmlhelper.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/comphelper/test/uno_iterators/makefile.mk b/comphelper/test/uno_iterators/makefile.mk
index a3392a7499ab..2346a0d24742 100644
--- a/comphelper/test/uno_iterators/makefile.mk
+++ b/comphelper/test/uno_iterators/makefile.mk
@@ -1,14 +1,10 @@
 #*************************************************************************
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -25,6 +21,7 @@
 # version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
+#
 #***********************************************************************/
 
 PRJNAME=extensions
diff --git a/comphelper/test/uno_iterators/uno_iterators.cxx b/comphelper/test/uno_iterators/uno_iterators.cxx
index ad66215af644..6f45b16cf6da 100644
--- a/comphelper/test/uno_iterators/uno_iterators.cxx
+++ b/comphelper/test/uno_iterators/uno_iterators.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: uno_iterators.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.
+ *
 ************************************************************************/
 
 #include <algorithm>
diff --git a/comphelper/util/makefile.mk b/comphelper/util/makefile.mk
index 74122a0f4e2a..ae391e92abf7 100644
--- a/comphelper/util/makefile.mk
+++ b/comphelper/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.15 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/comphelper/util/makefile.pmk b/comphelper/util/makefile.pmk
index fa057a4986a4..9a2e65bb0be7 100644
--- a/comphelper/util/makefile.pmk
+++ b/comphelper/util/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: makefile.pmk,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/comphelper/version.mk b/comphelper/version.mk
index abd6101b0571..f8d798a404b7 100644
--- a/comphelper/version.mk
+++ b/comphelper/version.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: version.mk,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/cppcanvas/inc/cppcanvas/basegfxfactory.hxx b/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
index f9a9d3140c32..268292eb4a55 100644
--- a/cppcanvas/inc/cppcanvas/basegfxfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/basegfxfactory.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: basegfxfactory.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/cppcanvas/inc/cppcanvas/bitmap.hxx b/cppcanvas/inc/cppcanvas/bitmap.hxx
index e41a48f4c480..cd17ec1837c9 100644
--- a/cppcanvas/inc/cppcanvas/bitmap.hxx
+++ b/cppcanvas/inc/cppcanvas/bitmap.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: bitmap.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/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx b/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx
index 3f6838231286..896f0c72845e 100644
--- a/cppcanvas/inc/cppcanvas/bitmapcanvas.hxx
+++ b/cppcanvas/inc/cppcanvas/bitmapcanvas.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: bitmapcanvas.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/cppcanvas/inc/cppcanvas/canvas.hxx b/cppcanvas/inc/cppcanvas/canvas.hxx
index 0bc36d83303a..e08adeac2912 100644
--- a/cppcanvas/inc/cppcanvas/canvas.hxx
+++ b/cppcanvas/inc/cppcanvas/canvas.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: canvas.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/cppcanvas/inc/cppcanvas/canvasgraphic.hxx b/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
index 54be3003de1d..24467771dc50 100644
--- a/cppcanvas/inc/cppcanvas/canvasgraphic.hxx
+++ b/cppcanvas/inc/cppcanvas/canvasgraphic.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: canvasgraphic.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/cppcanvas/inc/cppcanvas/color.hxx b/cppcanvas/inc/cppcanvas/color.hxx
index 7441f6f2937a..9a5237c264b7 100644
--- a/cppcanvas/inc/cppcanvas/color.hxx
+++ b/cppcanvas/inc/cppcanvas/color.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: color.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -83,6 +80,16 @@ namespace cppcanvas
         return (nRed << 24U)|(nGreen << 16U)|(nBlue << 8U)|(nAlpha);
     }
 
+    inline sal_Int32 unMakeColor( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue)
+    {
+        return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue);
+    }
+
+    inline sal_Int32 makeColorARGB( sal_uInt8 nAlpha, sal_uInt8 nRed, sal_uInt8 nGreen, sal_uInt8 nBlue)
+    {
+        return (nAlpha << 24U)|(nRed << 16U)|(nGreen << 8U)|(nBlue);
+    }
+
 }
 
 #endif /* _CPPCANVAS_COLOR_HXX */
diff --git a/cppcanvas/inc/cppcanvas/customsprite.hxx b/cppcanvas/inc/cppcanvas/customsprite.hxx
index a7d087545c7b..15e1c1185aad 100644
--- a/cppcanvas/inc/cppcanvas/customsprite.hxx
+++ b/cppcanvas/inc/cppcanvas/customsprite.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: customsprite.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/cppcanvas/inc/cppcanvas/font.hxx b/cppcanvas/inc/cppcanvas/font.hxx
index ea1e6f1fcbed..2077ae811c85 100644
--- a/cppcanvas/inc/cppcanvas/font.hxx
+++ b/cppcanvas/inc/cppcanvas/font.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: font.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/cppcanvas/inc/cppcanvas/polypolygon.hxx b/cppcanvas/inc/cppcanvas/polypolygon.hxx
index 54be50278040..a32e0c19ae50 100644
--- a/cppcanvas/inc/cppcanvas/polypolygon.hxx
+++ b/cppcanvas/inc/cppcanvas/polypolygon.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: polypolygon.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/cppcanvas/inc/cppcanvas/renderer.hxx b/cppcanvas/inc/cppcanvas/renderer.hxx
index 50b24cd4ae05..780a27f31503 100644
--- a/cppcanvas/inc/cppcanvas/renderer.hxx
+++ b/cppcanvas/inc/cppcanvas/renderer.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: renderer.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/cppcanvas/inc/cppcanvas/sprite.hxx b/cppcanvas/inc/cppcanvas/sprite.hxx
index a0e069e8a838..3a80a8137754 100644
--- a/cppcanvas/inc/cppcanvas/sprite.hxx
+++ b/cppcanvas/inc/cppcanvas/sprite.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: sprite.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/cppcanvas/inc/cppcanvas/spritecanvas.hxx b/cppcanvas/inc/cppcanvas/spritecanvas.hxx
index 16e0d7e9524d..e5fda82d2e41 100644
--- a/cppcanvas/inc/cppcanvas/spritecanvas.hxx
+++ b/cppcanvas/inc/cppcanvas/spritecanvas.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: spritecanvas.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/cppcanvas/inc/cppcanvas/text.hxx b/cppcanvas/inc/cppcanvas/text.hxx
index f91b3e79f524..6fd54b4e0106 100644
--- a/cppcanvas/inc/cppcanvas/text.hxx
+++ b/cppcanvas/inc/cppcanvas/text.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: text.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/cppcanvas/inc/cppcanvas/vclfactory.hxx b/cppcanvas/inc/cppcanvas/vclfactory.hxx
index bb246030bc87..b95102f31472 100644
--- a/cppcanvas/inc/cppcanvas/vclfactory.hxx
+++ b/cppcanvas/inc/cppcanvas/vclfactory.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: vclfactory.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/cppcanvas/inc/makefile.mk b/cppcanvas/inc/makefile.mk
index 8387aae9e661..ccf2d3a92425 100644
--- a/cppcanvas/inc/makefile.mk
+++ b/cppcanvas/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.cxx b/cppcanvas/inc/pch/precompiled_cppcanvas.cxx
index 78fe308b6f68..8b82ed878284 100644
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.cxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.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: precompiled_cppcanvas.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/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
index 2d5bf6f41654..b1bd1d18e74e 100644
--- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx
+++ b/cppcanvas/inc/pch/precompiled_cppcanvas.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_cppcanvas.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/cppcanvas/source/inc/action.hxx b/cppcanvas/source/inc/action.hxx
index ec59f77960a6..9be2b5309e0f 100644
--- a/cppcanvas/source/inc/action.hxx
+++ b/cppcanvas/source/inc/action.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: action.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/cppcanvas/source/inc/canvasgraphichelper.hxx b/cppcanvas/source/inc/canvasgraphichelper.hxx
index edc16b46a09e..40cda1d2d186 100644
--- a/cppcanvas/source/inc/canvasgraphichelper.hxx
+++ b/cppcanvas/source/inc/canvasgraphichelper.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: canvasgraphichelper.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/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 46f025b40b48..8c1f7941abc4 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.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: implrenderer.hxx,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/cppcanvas/source/inc/tools.hxx b/cppcanvas/source/inc/tools.hxx
index 1f709861428b..f6d157d2c60e 100644
--- a/cppcanvas/source/inc/tools.hxx
+++ b/cppcanvas/source/inc/tools.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: tools.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/cppcanvas/source/mtfrenderer/bitmapaction.cxx b/cppcanvas/source/mtfrenderer/bitmapaction.cxx
index 4f54b10c4879..fd0bb268b6f5 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.cxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.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: bitmapaction.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/cppcanvas/source/mtfrenderer/bitmapaction.hxx b/cppcanvas/source/mtfrenderer/bitmapaction.hxx
index 662b585acd66..6c41579d39dd 100644
--- a/cppcanvas/source/mtfrenderer/bitmapaction.hxx
+++ b/cppcanvas/source/mtfrenderer/bitmapaction.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: bitmapaction.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/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
index 68c1b0ad2c16..15096c4cfec6 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.cxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.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: cachedprimitivebase.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/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx b/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
index 6bb0348cc570..2c6ad0411f4b 100644
--- a/cppcanvas/source/mtfrenderer/cachedprimitivebase.hxx
+++ b/cppcanvas/source/mtfrenderer/cachedprimitivebase.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: cachedprimitivebase.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/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 8ea2ae453a97..58892b73233c 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.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: implrenderer.cxx,v $
- * $Revision: 1.25.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1876,16 +1873,16 @@ namespace cppcanvas
                                         ::vcl::unotools::xBitmapFromBitmapEx(
                                             rCanvas->getUNOCanvas()->getDevice(),
                                             aBmpEx );
-                                    if( aFill.isTiling() )

-                                    {

-                                        aTexture.RepeatModeX = rendering::TexturingMode::REPEAT;

-                                        aTexture.RepeatModeY = rendering::TexturingMode::REPEAT;

-                                    }

-                                    else

-                                    {

-                                        aTexture.RepeatModeX = rendering::TexturingMode::CLAMP;

-                                        aTexture.RepeatModeY = rendering::TexturingMode::CLAMP;

-                                    }

+                                    if( aFill.isTiling() )
+                                    {
+                                        aTexture.RepeatModeX = rendering::TexturingMode::REPEAT;
+                                        aTexture.RepeatModeY = rendering::TexturingMode::REPEAT;
+                                    }
+                                    else
+                                    {
+                                        aTexture.RepeatModeX = rendering::TexturingMode::CLAMP;
+                                        aTexture.RepeatModeY = rendering::TexturingMode::CLAMP;
+                                    }
 
                                     ::PolyPolygon aPath;
                                     aFill.getPath( aPath );
diff --git a/cppcanvas/source/mtfrenderer/lineaction.cxx b/cppcanvas/source/mtfrenderer/lineaction.cxx
index d32ed56a8001..a779e45ab64a 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.cxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.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: lineaction.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/cppcanvas/source/mtfrenderer/lineaction.hxx b/cppcanvas/source/mtfrenderer/lineaction.hxx
index 3d4f366eee89..12d308557837 100644
--- a/cppcanvas/source/mtfrenderer/lineaction.hxx
+++ b/cppcanvas/source/mtfrenderer/lineaction.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: lineaction.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/cppcanvas/source/mtfrenderer/makefile.mk b/cppcanvas/source/mtfrenderer/makefile.mk
index e58c9f87e0e2..dfe6e28030bf 100644
--- a/cppcanvas/source/mtfrenderer/makefile.mk
+++ b/cppcanvas/source/mtfrenderer/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/cppcanvas/source/mtfrenderer/mtftools.cxx b/cppcanvas/source/mtfrenderer/mtftools.cxx
index b6a548aa49be..2d165eca4d38 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.cxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.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: mtftools.cxx,v $
- * $Revision: 1.14.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/cppcanvas/source/mtfrenderer/mtftools.hxx b/cppcanvas/source/mtfrenderer/mtftools.hxx
index d44272342ee9..3bf0fe31e344 100644
--- a/cppcanvas/source/mtfrenderer/mtftools.hxx
+++ b/cppcanvas/source/mtfrenderer/mtftools.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: mtftools.hxx,v $
- * $Revision: 1.9.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/cppcanvas/source/mtfrenderer/outdevstate.hxx b/cppcanvas/source/mtfrenderer/outdevstate.hxx
index b1eee1ab6f2e..37930b2e78b4 100644
--- a/cppcanvas/source/mtfrenderer/outdevstate.hxx
+++ b/cppcanvas/source/mtfrenderer/outdevstate.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: outdevstate.hxx,v $
- * $Revision: 1.9.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/cppcanvas/source/mtfrenderer/pointaction.cxx b/cppcanvas/source/mtfrenderer/pointaction.cxx
index a7adecec6ec2..dbdc632af11c 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.cxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.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: pointaction.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/cppcanvas/source/mtfrenderer/pointaction.hxx b/cppcanvas/source/mtfrenderer/pointaction.hxx
index 54b63af172e9..c45b71a7dee6 100644
--- a/cppcanvas/source/mtfrenderer/pointaction.hxx
+++ b/cppcanvas/source/mtfrenderer/pointaction.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: pointaction.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/cppcanvas/source/mtfrenderer/polypolyaction.cxx b/cppcanvas/source/mtfrenderer/polypolyaction.cxx
index 225f2e318764..13be4652acd8 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.cxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.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: polypolyaction.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/cppcanvas/source/mtfrenderer/polypolyaction.hxx b/cppcanvas/source/mtfrenderer/polypolyaction.hxx
index 3b0a5da0ff3c..4ae85a2c3d5d 100644
--- a/cppcanvas/source/mtfrenderer/polypolyaction.hxx
+++ b/cppcanvas/source/mtfrenderer/polypolyaction.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: polypolyaction.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/cppcanvas/source/mtfrenderer/textaction.cxx b/cppcanvas/source/mtfrenderer/textaction.cxx
index 038b68c3008e..bc4cf6688ca3 100644
--- a/cppcanvas/source/mtfrenderer/textaction.cxx
+++ b/cppcanvas/source/mtfrenderer/textaction.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: textaction.cxx,v $
- * $Revision: 1.22.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx
index 53f08b63d6df..43aab762f635 100644
--- a/cppcanvas/source/mtfrenderer/textaction.hxx
+++ b/cppcanvas/source/mtfrenderer/textaction.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: textaction.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/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
index b17baf6526a2..a8984d41e585 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.cxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.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: transparencygroupaction.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/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx b/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
index db102eba60bb..8384ea2818be 100644
--- a/cppcanvas/source/mtfrenderer/transparencygroupaction.hxx
+++ b/cppcanvas/source/mtfrenderer/transparencygroupaction.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: transparencygroupaction.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/cppcanvas/source/tools/canvasgraphichelper.cxx b/cppcanvas/source/tools/canvasgraphichelper.cxx
index e4d92ff6ebfb..1e62b816e1d4 100644
--- a/cppcanvas/source/tools/canvasgraphichelper.cxx
+++ b/cppcanvas/source/tools/canvasgraphichelper.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: canvasgraphichelper.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/cppcanvas/source/tools/makefile.mk b/cppcanvas/source/tools/makefile.mk
index 4a222544fc44..ee543616f6e0 100644
--- a/cppcanvas/source/tools/makefile.mk
+++ b/cppcanvas/source/tools/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/cppcanvas/source/tools/tools.cxx b/cppcanvas/source/tools/tools.cxx
index 0428f13ad9c3..04e6d7f07458 100644
--- a/cppcanvas/source/tools/tools.cxx
+++ b/cppcanvas/source/tools/tools.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: tools.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/cppcanvas/source/wrapper/basegfxfactory.cxx b/cppcanvas/source/wrapper/basegfxfactory.cxx
index debc296807cd..acf6001d0ca7 100644
--- a/cppcanvas/source/wrapper/basegfxfactory.cxx
+++ b/cppcanvas/source/wrapper/basegfxfactory.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: basegfxfactory.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/cppcanvas/source/wrapper/implbitmap.cxx b/cppcanvas/source/wrapper/implbitmap.cxx
index 080bc215063a..81d5a5d4e755 100644
--- a/cppcanvas/source/wrapper/implbitmap.cxx
+++ b/cppcanvas/source/wrapper/implbitmap.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: implbitmap.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/cppcanvas/source/wrapper/implbitmap.hxx b/cppcanvas/source/wrapper/implbitmap.hxx
index c910476875e1..974eb4176b5a 100644
--- a/cppcanvas/source/wrapper/implbitmap.hxx
+++ b/cppcanvas/source/wrapper/implbitmap.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: implbitmap.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/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx
index 8c7caa8ece20..b9de616ebab1 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.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: implbitmapcanvas.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/cppcanvas/source/wrapper/implbitmapcanvas.hxx b/cppcanvas/source/wrapper/implbitmapcanvas.hxx
index 1aac433ce782..7d70f226848e 100644
--- a/cppcanvas/source/wrapper/implbitmapcanvas.hxx
+++ b/cppcanvas/source/wrapper/implbitmapcanvas.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: implbitmapcanvas.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/cppcanvas/source/wrapper/implcanvas.cxx b/cppcanvas/source/wrapper/implcanvas.cxx
index 7dac599a1b3a..e08f270d117b 100644
--- a/cppcanvas/source/wrapper/implcanvas.cxx
+++ b/cppcanvas/source/wrapper/implcanvas.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: implcanvas.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/cppcanvas/source/wrapper/implcanvas.hxx b/cppcanvas/source/wrapper/implcanvas.hxx
index 48563bb5a348..87cb8b8c85fc 100644
--- a/cppcanvas/source/wrapper/implcanvas.hxx
+++ b/cppcanvas/source/wrapper/implcanvas.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: implcanvas.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/cppcanvas/source/wrapper/implcolor.cxx b/cppcanvas/source/wrapper/implcolor.cxx
index 5deff0ee3757..9e591e3e98f0 100644
--- a/cppcanvas/source/wrapper/implcolor.cxx
+++ b/cppcanvas/source/wrapper/implcolor.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: implcolor.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/cppcanvas/source/wrapper/implcolor.hxx b/cppcanvas/source/wrapper/implcolor.hxx
index 8515353dbac7..5140d905245c 100644
--- a/cppcanvas/source/wrapper/implcolor.hxx
+++ b/cppcanvas/source/wrapper/implcolor.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: implcolor.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/cppcanvas/source/wrapper/implcustomsprite.cxx b/cppcanvas/source/wrapper/implcustomsprite.cxx
index d151cf9d02a9..786b3699af3b 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.cxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.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: implcustomsprite.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/cppcanvas/source/wrapper/implcustomsprite.hxx b/cppcanvas/source/wrapper/implcustomsprite.hxx
index 1991beccbbd4..b02eab38df1e 100644
--- a/cppcanvas/source/wrapper/implcustomsprite.hxx
+++ b/cppcanvas/source/wrapper/implcustomsprite.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: implcustomsprite.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/cppcanvas/source/wrapper/implfont.cxx b/cppcanvas/source/wrapper/implfont.cxx
index 03133c0bfcca..48decd6677da 100644
--- a/cppcanvas/source/wrapper/implfont.cxx
+++ b/cppcanvas/source/wrapper/implfont.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: implfont.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/cppcanvas/source/wrapper/implfont.hxx b/cppcanvas/source/wrapper/implfont.hxx
index e1e9b89d284f..c7b93b876e10 100644
--- a/cppcanvas/source/wrapper/implfont.hxx
+++ b/cppcanvas/source/wrapper/implfont.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: implfont.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/cppcanvas/source/wrapper/implpolypolygon.cxx b/cppcanvas/source/wrapper/implpolypolygon.cxx
index 283256be01a8..5e7b8c8cf635 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.cxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.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: implpolypolygon.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/cppcanvas/source/wrapper/implpolypolygon.hxx b/cppcanvas/source/wrapper/implpolypolygon.hxx
index 6a50cf512ed6..bd5e02d6a3de 100644
--- a/cppcanvas/source/wrapper/implpolypolygon.hxx
+++ b/cppcanvas/source/wrapper/implpolypolygon.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: implpolypolygon.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/cppcanvas/source/wrapper/implsprite.cxx b/cppcanvas/source/wrapper/implsprite.cxx
index aa7fadcb2e3b..bf8a1a1a67d6 100644
--- a/cppcanvas/source/wrapper/implsprite.cxx
+++ b/cppcanvas/source/wrapper/implsprite.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: implsprite.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/cppcanvas/source/wrapper/implsprite.hxx b/cppcanvas/source/wrapper/implsprite.hxx
index 38e1b2fdd3b4..4f8c5fdcaef6 100644
--- a/cppcanvas/source/wrapper/implsprite.hxx
+++ b/cppcanvas/source/wrapper/implsprite.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: implsprite.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/cppcanvas/source/wrapper/implspritecanvas.cxx b/cppcanvas/source/wrapper/implspritecanvas.cxx
index 77805077d613..4cd555adfb28 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.cxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.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: implspritecanvas.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/cppcanvas/source/wrapper/implspritecanvas.hxx b/cppcanvas/source/wrapper/implspritecanvas.hxx
index d7a1afc0d084..655bce3c05a2 100644
--- a/cppcanvas/source/wrapper/implspritecanvas.hxx
+++ b/cppcanvas/source/wrapper/implspritecanvas.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: implspritecanvas.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/cppcanvas/source/wrapper/impltext.cxx b/cppcanvas/source/wrapper/impltext.cxx
index 58a95910d0f1..7ebb378ea401 100644
--- a/cppcanvas/source/wrapper/impltext.cxx
+++ b/cppcanvas/source/wrapper/impltext.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: impltext.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/cppcanvas/source/wrapper/impltext.hxx b/cppcanvas/source/wrapper/impltext.hxx
index 9f91cde6199a..b2c8d9fd0e1f 100644
--- a/cppcanvas/source/wrapper/impltext.hxx
+++ b/cppcanvas/source/wrapper/impltext.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: impltext.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/cppcanvas/source/wrapper/makefile.mk b/cppcanvas/source/wrapper/makefile.mk
index ed5d78ab6b49..255cc023d75c 100644
--- a/cppcanvas/source/wrapper/makefile.mk
+++ b/cppcanvas/source/wrapper/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/cppcanvas/source/wrapper/vclfactory.cxx b/cppcanvas/source/wrapper/vclfactory.cxx
index c83a4f258f23..7983f081b2a9 100644
--- a/cppcanvas/source/wrapper/vclfactory.cxx
+++ b/cppcanvas/source/wrapper/vclfactory.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: vclfactory.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/cppcanvas/util/makefile.mk b/cppcanvas/util/makefile.mk
index 4d0ff2a8dc55..f0d6fc7426a4 100644
--- a/cppcanvas/util/makefile.mk
+++ b/cppcanvas/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.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/inc/makefile.mk b/dtrans/inc/makefile.mk
index 971a769f6b20..2738985607cb 100644
--- a/dtrans/inc/makefile.mk
+++ b/dtrans/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/inc/pch/precompiled_dtrans.cxx b/dtrans/inc/pch/precompiled_dtrans.cxx
index b0ccc8c2213c..97ae0d1450c1 100644
--- a/dtrans/inc/pch/precompiled_dtrans.cxx
+++ b/dtrans/inc/pch/precompiled_dtrans.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: precompiled_dtrans.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/dtrans/inc/pch/precompiled_dtrans.hxx b/dtrans/inc/pch/precompiled_dtrans.hxx
index eafbdde26d25..fe3362638432 100644
--- a/dtrans/inc/pch/precompiled_dtrans.hxx
+++ b/dtrans/inc/pch/precompiled_dtrans.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_dtrans.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/dtrans/source/cnttype/makefile.mk b/dtrans/source/cnttype/makefile.mk
index b537e512bb44..d99b8d4c9ac6 100644
--- a/dtrans/source/cnttype/makefile.mk
+++ b/dtrans/source/cnttype/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/cnttype/mcnttfactory.cxx b/dtrans/source/cnttype/mcnttfactory.cxx
index 3953d56c9749..07b557350bc0 100644
--- a/dtrans/source/cnttype/mcnttfactory.cxx
+++ b/dtrans/source/cnttype/mcnttfactory.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: mcnttfactory.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/dtrans/source/cnttype/mcnttfactory.hxx b/dtrans/source/cnttype/mcnttfactory.hxx
index ecf62a96606f..608a6a5b4e19 100644
--- a/dtrans/source/cnttype/mcnttfactory.hxx
+++ b/dtrans/source/cnttype/mcnttfactory.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: mcnttfactory.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/dtrans/source/cnttype/mcnttype.cxx b/dtrans/source/cnttype/mcnttype.cxx
index ad14b7c51c39..bc5a52920bfb 100644
--- a/dtrans/source/cnttype/mcnttype.cxx
+++ b/dtrans/source/cnttype/mcnttype.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: mcnttype.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/dtrans/source/cnttype/mcnttype.hxx b/dtrans/source/cnttype/mcnttype.hxx
index 46c43ada87f1..f9b416b51de4 100644
--- a/dtrans/source/cnttype/mcnttype.hxx
+++ b/dtrans/source/cnttype/mcnttype.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: mcnttype.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/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx
index 5d3797b2f7e7..095c9ed186ce 100644
--- a/dtrans/source/cnttype/mctfentry.cxx
+++ b/dtrans/source/cnttype/mctfentry.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: mctfentry.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/dtrans/source/cnttype/wbench/makefile.mk b/dtrans/source/cnttype/wbench/makefile.mk
index a5728fa8d7b9..e154a5ac633e 100644
--- a/dtrans/source/cnttype/wbench/makefile.mk
+++ b/dtrans/source/cnttype/wbench/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/cnttype/wbench/testcnttype.cxx b/dtrans/source/cnttype/wbench/testcnttype.cxx
index f2058749c64f..ff3587ee22e6 100644
--- a/dtrans/source/cnttype/wbench/testcnttype.cxx
+++ b/dtrans/source/cnttype/wbench/testcnttype.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: testcnttype.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/dtrans/source/generic/clipboardmanager.cxx b/dtrans/source/generic/clipboardmanager.cxx
index 2562d22792ba..49b5cde947f7 100644
--- a/dtrans/source/generic/clipboardmanager.cxx
+++ b/dtrans/source/generic/clipboardmanager.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: clipboardmanager.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/dtrans/source/generic/clipboardmanager.hxx b/dtrans/source/generic/clipboardmanager.hxx
index da27a331c052..0429c7640ed7 100644
--- a/dtrans/source/generic/clipboardmanager.hxx
+++ b/dtrans/source/generic/clipboardmanager.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: clipboardmanager.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/dtrans/source/generic/dtrans.cxx b/dtrans/source/generic/dtrans.cxx
index 069d29fa45cd..1e69158a6a12 100644
--- a/dtrans/source/generic/dtrans.cxx
+++ b/dtrans/source/generic/dtrans.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: dtrans.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/dtrans/source/generic/generic_clipboard.cxx b/dtrans/source/generic/generic_clipboard.cxx
index 4ce906298029..046632d82bf8 100644
--- a/dtrans/source/generic/generic_clipboard.cxx
+++ b/dtrans/source/generic/generic_clipboard.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: generic_clipboard.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/dtrans/source/generic/generic_clipboard.hxx b/dtrans/source/generic/generic_clipboard.hxx
index 77743b64bf16..54308b0a1bdd 100644
--- a/dtrans/source/generic/generic_clipboard.hxx
+++ b/dtrans/source/generic/generic_clipboard.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: generic_clipboard.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/dtrans/source/generic/makefile.mk b/dtrans/source/generic/makefile.mk
index aa856865a3a8..c1afa848d7ed 100644
--- a/dtrans/source/generic/makefile.mk
+++ b/dtrans/source/generic/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/dtrans/source/inc/DtObjFactory.hxx b/dtrans/source/inc/DtObjFactory.hxx
index e84d93d34d16..fc217e6d5982 100644
--- a/dtrans/source/inc/DtObjFactory.hxx
+++ b/dtrans/source/inc/DtObjFactory.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: DtObjFactory.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/dtrans/source/inc/MtaOleClipb.hxx b/dtrans/source/inc/MtaOleClipb.hxx
index 19b77e205472..03facb73d18f 100644
--- a/dtrans/source/inc/MtaOleClipb.hxx
+++ b/dtrans/source/inc/MtaOleClipb.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: MtaOleClipb.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/dtrans/source/os2/clipb/OS2Bitmap.cxx b/dtrans/source/os2/clipb/OS2Bitmap.cxx
index 4e57297200e4..53b78c7afaef 100644
--- a/dtrans/source/os2/clipb/OS2Bitmap.cxx
+++ b/dtrans/source/os2/clipb/OS2Bitmap.cxx
@@ -1,11 +1,5 @@
 /*************************************************************************
  *
- *  $RCSfile: OS2Bitmap.cxx,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: obo $ $Date: 2008-07-22 17:53:52 $
- *
  *  This code is property of Serenity Systems Intl
  *  All rights reserverd.
  *
diff --git a/dtrans/source/os2/clipb/Os2Clipboard.cxx b/dtrans/source/os2/clipb/Os2Clipboard.cxx
index 3e3a80e2ab37..494df04b640a 100644
--- a/dtrans/source/os2/clipb/Os2Clipboard.cxx
+++ b/dtrans/source/os2/clipb/Os2Clipboard.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: Os2Clipboard.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/dtrans/source/os2/clipb/Os2Clipboard.hxx b/dtrans/source/os2/clipb/Os2Clipboard.hxx
index b00ecbb18835..0a9f4d117464 100644
--- a/dtrans/source/os2/clipb/Os2Clipboard.hxx
+++ b/dtrans/source/os2/clipb/Os2Clipboard.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: Os2Clipboard.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/dtrans/source/os2/clipb/Os2Service.cxx b/dtrans/source/os2/clipb/Os2Service.cxx
index 8723424fab71..cc3e1e9a9b94 100644
--- a/dtrans/source/os2/clipb/Os2Service.cxx
+++ b/dtrans/source/os2/clipb/Os2Service.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: Os2Service.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/dtrans/source/os2/clipb/Os2Transferable.cxx b/dtrans/source/os2/clipb/Os2Transferable.cxx
index 5cdbdcbace8b..fe8c77105e90 100644
--- a/dtrans/source/os2/clipb/Os2Transferable.cxx
+++ b/dtrans/source/os2/clipb/Os2Transferable.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: Os2Transferable.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/dtrans/source/os2/clipb/Os2Transferable.hxx b/dtrans/source/os2/clipb/Os2Transferable.hxx
index b44d632e8cdd..833aa2680a8a 100644
--- a/dtrans/source/os2/clipb/Os2Transferable.hxx
+++ b/dtrans/source/os2/clipb/Os2Transferable.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: Os2Transferable.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/dtrans/source/os2/clipb/makefile.mk b/dtrans/source/os2/clipb/makefile.mk
index ff6606d7aa85..a1ccc1ae87ec 100644
--- a/dtrans/source/os2/clipb/makefile.mk
+++ b/dtrans/source/os2/clipb/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/test/makefile.mk b/dtrans/source/test/makefile.mk
index c487b7be5bd6..4048797813ab 100644
--- a/dtrans/source/test/makefile.mk
+++ b/dtrans/source/test/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/test/test_dtrans.cxx b/dtrans/source/test/test_dtrans.cxx
index 568f85b67ddf..41d5bfb4f32f 100644
--- a/dtrans/source/test/test_dtrans.cxx
+++ b/dtrans/source/test/test_dtrans.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: test_dtrans.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/dtrans/source/win32/clipb/APNDataObject.hxx b/dtrans/source/win32/clipb/APNDataObject.hxx
index a059046232fe..5a5bf1fa3547 100644
--- a/dtrans/source/win32/clipb/APNDataObject.hxx
+++ b/dtrans/source/win32/clipb/APNDataObject.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: APNDataObject.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/dtrans/source/win32/clipb/WinClipbImpl.cxx b/dtrans/source/win32/clipb/WinClipbImpl.cxx
index a7180ebade34..30b35a48d391 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.cxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.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: WinClipbImpl.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/dtrans/source/win32/clipb/WinClipbImpl.hxx b/dtrans/source/win32/clipb/WinClipbImpl.hxx
index f8a23c76b8e7..c7b0a55a064a 100644
--- a/dtrans/source/win32/clipb/WinClipbImpl.hxx
+++ b/dtrans/source/win32/clipb/WinClipbImpl.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: WinClipbImpl.hxx,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/dtrans/source/win32/clipb/WinClipboard.cxx b/dtrans/source/win32/clipb/WinClipboard.cxx
index 4002ce2b67b3..0454460887e7 100644
--- a/dtrans/source/win32/clipb/WinClipboard.cxx
+++ b/dtrans/source/win32/clipb/WinClipboard.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: WinClipboard.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/dtrans/source/win32/clipb/WinClipboard.hxx b/dtrans/source/win32/clipb/WinClipboard.hxx
index 5b7a0218f605..a8b48a246eb2 100644
--- a/dtrans/source/win32/clipb/WinClipboard.hxx
+++ b/dtrans/source/win32/clipb/WinClipboard.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: WinClipboard.hxx,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/dtrans/source/win32/clipb/makefile.mk b/dtrans/source/win32/clipb/makefile.mk
index 82914b97bd7b..28f426d9296e 100644
--- a/dtrans/source/win32/clipb/makefile.mk
+++ b/dtrans/source/win32/clipb/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/win32/clipb/wcbentry.cxx b/dtrans/source/win32/clipb/wcbentry.cxx
index 2426c2799494..986e7b4c4db7 100644
--- a/dtrans/source/win32/clipb/wcbentry.cxx
+++ b/dtrans/source/win32/clipb/wcbentry.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: wcbentry.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/dtrans/source/win32/dnd/dndentry.cxx b/dtrans/source/win32/dnd/dndentry.cxx
index 5b641f407f20..2ea9b7746def 100644
--- a/dtrans/source/win32/dnd/dndentry.cxx
+++ b/dtrans/source/win32/dnd/dndentry.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: dndentry.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/dtrans/source/win32/dnd/globals.cxx b/dtrans/source/win32/dnd/globals.cxx
index b0685d97a132..9c6bdba5c024 100644
--- a/dtrans/source/win32/dnd/globals.cxx
+++ b/dtrans/source/win32/dnd/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.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/win32/dnd/globals.hxx b/dtrans/source/win32/dnd/globals.hxx
index 1513e642abf6..0f21d00d7371 100644
--- a/dtrans/source/win32/dnd/globals.hxx
+++ b/dtrans/source/win32/dnd/globals.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: globals.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/dtrans/source/win32/dnd/idroptarget.cxx b/dtrans/source/win32/dnd/idroptarget.cxx
index f2ee34426974..702c9a3e567e 100644
--- a/dtrans/source/win32/dnd/idroptarget.cxx
+++ b/dtrans/source/win32/dnd/idroptarget.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: idroptarget.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/dtrans/source/win32/dnd/idroptarget.hxx b/dtrans/source/win32/dnd/idroptarget.hxx
index e486c6c2e215..dd3cbed3d893 100644
--- a/dtrans/source/win32/dnd/idroptarget.hxx
+++ b/dtrans/source/win32/dnd/idroptarget.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: idroptarget.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/dtrans/source/win32/dnd/makefile.mk b/dtrans/source/win32/dnd/makefile.mk
index f70f6888e947..54fd748a0889 100644
--- a/dtrans/source/win32/dnd/makefile.mk
+++ b/dtrans/source/win32/dnd/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.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/win32/dnd/source.cxx b/dtrans/source/win32/dnd/source.cxx
index 2c0b41bd6675..8c05d8806601 100644
--- a/dtrans/source/win32/dnd/source.cxx
+++ b/dtrans/source/win32/dnd/source.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: source.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/dtrans/source/win32/dnd/source.hxx b/dtrans/source/win32/dnd/source.hxx
index b482de162bdc..decf3f61368f 100644
--- a/dtrans/source/win32/dnd/source.hxx
+++ b/dtrans/source/win32/dnd/source.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: source.hxx,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/dtrans/source/win32/dnd/sourcecontext.cxx b/dtrans/source/win32/dnd/sourcecontext.cxx
index d289a1bb2366..da4d5c06eefb 100644
--- a/dtrans/source/win32/dnd/sourcecontext.cxx
+++ b/dtrans/source/win32/dnd/sourcecontext.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: sourcecontext.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/dtrans/source/win32/dnd/sourcecontext.hxx b/dtrans/source/win32/dnd/sourcecontext.hxx
index 024f1a348ac9..db3f093b21a9 100644
--- a/dtrans/source/win32/dnd/sourcecontext.hxx
+++ b/dtrans/source/win32/dnd/sourcecontext.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: sourcecontext.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/dtrans/source/win32/dnd/target.cxx b/dtrans/source/win32/dnd/target.cxx
index 03b772ceb029..6e2e28bcfc39 100644
--- a/dtrans/source/win32/dnd/target.cxx
+++ b/dtrans/source/win32/dnd/target.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: target.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/dtrans/source/win32/dnd/target.hxx b/dtrans/source/win32/dnd/target.hxx
index 4a915adaf790..94982b54818f 100644
--- a/dtrans/source/win32/dnd/target.hxx
+++ b/dtrans/source/win32/dnd/target.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: target.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/dtrans/source/win32/dnd/targetdragcontext.cxx b/dtrans/source/win32/dnd/targetdragcontext.cxx
index 7ef9743bc3bf..15f7ea32a1ef 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.cxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.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: targetdragcontext.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/dtrans/source/win32/dnd/targetdragcontext.hxx b/dtrans/source/win32/dnd/targetdragcontext.hxx
index 5dfea8eab08f..e4b24b95b0a0 100644
--- a/dtrans/source/win32/dnd/targetdragcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdragcontext.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: targetdragcontext.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/dtrans/source/win32/dnd/targetdropcontext.cxx b/dtrans/source/win32/dnd/targetdropcontext.cxx
index 4b491bb0b805..a009b8df7527 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.cxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.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: targetdropcontext.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/dtrans/source/win32/dnd/targetdropcontext.hxx b/dtrans/source/win32/dnd/targetdropcontext.hxx
index 1591960a033f..6ae6f0182a36 100644
--- a/dtrans/source/win32/dnd/targetdropcontext.hxx
+++ b/dtrans/source/win32/dnd/targetdropcontext.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: targetdropcontext.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/dtrans/source/win32/dtobj/APNDataObject.cxx b/dtrans/source/win32/dtobj/APNDataObject.cxx
index 6ca00fa123e1..775e952ac885 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.cxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.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: APNDataObject.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/dtrans/source/win32/dtobj/APNDataObject.hxx b/dtrans/source/win32/dtobj/APNDataObject.hxx
index cd0348fd9130..990e38236e66 100644
--- a/dtrans/source/win32/dtobj/APNDataObject.hxx
+++ b/dtrans/source/win32/dtobj/APNDataObject.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: APNDataObject.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/dtrans/source/win32/dtobj/DOTransferable.cxx b/dtrans/source/win32/dtobj/DOTransferable.cxx
index 4728f14f7798..951c3a69d291 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.cxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.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: DOTransferable.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/win32/dtobj/DOTransferable.hxx b/dtrans/source/win32/dtobj/DOTransferable.hxx
index 279568618aae..dd99e857b908 100644
--- a/dtrans/source/win32/dtobj/DOTransferable.hxx
+++ b/dtrans/source/win32/dtobj/DOTransferable.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: DOTransferable.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/dtrans/source/win32/dtobj/DTransHelper.cxx b/dtrans/source/win32/dtobj/DTransHelper.cxx
index 32670ff3bac6..30370fdaf3c8 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.cxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.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: DTransHelper.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/dtrans/source/win32/dtobj/DTransHelper.hxx b/dtrans/source/win32/dtobj/DTransHelper.hxx
index aebeae9a3c39..7975b84eec57 100644
--- a/dtrans/source/win32/dtobj/DTransHelper.hxx
+++ b/dtrans/source/win32/dtobj/DTransHelper.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: DTransHelper.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/dtrans/source/win32/dtobj/DataFmtTransl.cxx b/dtrans/source/win32/dtobj/DataFmtTransl.cxx
index 92d8511d5c5f..f72e8bb714a7 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.cxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.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: DataFmtTransl.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/dtrans/source/win32/dtobj/DataFmtTransl.hxx b/dtrans/source/win32/dtobj/DataFmtTransl.hxx
index d77adf1ad891..70982ccaf6b9 100644
--- a/dtrans/source/win32/dtobj/DataFmtTransl.hxx
+++ b/dtrans/source/win32/dtobj/DataFmtTransl.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: DataFmtTransl.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/dtrans/source/win32/dtobj/DtObjFactory.cxx b/dtrans/source/win32/dtobj/DtObjFactory.cxx
index f17ecc060c31..e6cadec92983 100644
--- a/dtrans/source/win32/dtobj/DtObjFactory.cxx
+++ b/dtrans/source/win32/dtobj/DtObjFactory.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: DtObjFactory.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/dtrans/source/win32/dtobj/Fetc.cxx b/dtrans/source/win32/dtobj/Fetc.cxx
index c730b0775aca..525bfd58be4d 100644
--- a/dtrans/source/win32/dtobj/Fetc.cxx
+++ b/dtrans/source/win32/dtobj/Fetc.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: Fetc.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/dtrans/source/win32/dtobj/Fetc.hxx b/dtrans/source/win32/dtobj/Fetc.hxx
index bd043e27f510..a0af6dead8c1 100644
--- a/dtrans/source/win32/dtobj/Fetc.hxx
+++ b/dtrans/source/win32/dtobj/Fetc.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: Fetc.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/dtrans/source/win32/dtobj/FetcList.cxx b/dtrans/source/win32/dtobj/FetcList.cxx
index 23a901075ef1..8deb2296ad80 100644
--- a/dtrans/source/win32/dtobj/FetcList.cxx
+++ b/dtrans/source/win32/dtobj/FetcList.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: FetcList.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/dtrans/source/win32/dtobj/FetcList.hxx b/dtrans/source/win32/dtobj/FetcList.hxx
index fa2be49b484e..c5105a8662b6 100644
--- a/dtrans/source/win32/dtobj/FetcList.hxx
+++ b/dtrans/source/win32/dtobj/FetcList.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: FetcList.hxx,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/dtrans/source/win32/dtobj/FmtFilter.cxx b/dtrans/source/win32/dtobj/FmtFilter.cxx
index a3e9357109ea..c8a8743647a9 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.cxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.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: FmtFilter.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/dtrans/source/win32/dtobj/FmtFilter.hxx b/dtrans/source/win32/dtobj/FmtFilter.hxx
index 943a33280800..3f433561a3b1 100644
--- a/dtrans/source/win32/dtobj/FmtFilter.hxx
+++ b/dtrans/source/win32/dtobj/FmtFilter.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: FmtFilter.hxx,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/dtrans/source/win32/dtobj/MimeAttrib.hxx b/dtrans/source/win32/dtobj/MimeAttrib.hxx
index 16a7436a7f00..7bd631cc79d5 100644
--- a/dtrans/source/win32/dtobj/MimeAttrib.hxx
+++ b/dtrans/source/win32/dtobj/MimeAttrib.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: MimeAttrib.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/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
index 461abfeda584..3eecad271567 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.cxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.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: TxtCnvtHlp.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/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx b/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
index ffcad30e9f62..a4d59a69284e 100644
--- a/dtrans/source/win32/dtobj/TxtCnvtHlp.hxx
+++ b/dtrans/source/win32/dtobj/TxtCnvtHlp.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: TxtCnvtHlp.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/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
index 8725a40dc5ed..25e3fab3a702 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.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: XNotifyingDataObject.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/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx b/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
index 3e4f08a2a5f7..394b835c3612 100644
--- a/dtrans/source/win32/dtobj/XNotifyingDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XNotifyingDataObject.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: XNotifyingDataObject.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/dtrans/source/win32/dtobj/XTDataObject.cxx b/dtrans/source/win32/dtobj/XTDataObject.cxx
index 8b76e264eb04..e17a931d7380 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.cxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.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: XTDataObject.cxx,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/dtrans/source/win32/dtobj/XTDataObject.hxx b/dtrans/source/win32/dtobj/XTDataObject.hxx
index 18b0bbaf456d..b7b20af56ac7 100644
--- a/dtrans/source/win32/dtobj/XTDataObject.hxx
+++ b/dtrans/source/win32/dtobj/XTDataObject.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: XTDataObject.hxx,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/dtrans/source/win32/dtobj/makefile.mk b/dtrans/source/win32/dtobj/makefile.mk
index 865de4f2a832..5aea2b133dc1 100644
--- a/dtrans/source/win32/dtobj/makefile.mk
+++ b/dtrans/source/win32/dtobj/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/dtrans/source/win32/ftransl/ftransl.cxx b/dtrans/source/win32/ftransl/ftransl.cxx
index d132f39ed552..c0a8264a71b8 100644
--- a/dtrans/source/win32/ftransl/ftransl.cxx
+++ b/dtrans/source/win32/ftransl/ftransl.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: ftransl.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/dtrans/source/win32/ftransl/ftransl.hxx b/dtrans/source/win32/ftransl/ftransl.hxx
index bcfcbf81287b..631ae89cc388 100644
--- a/dtrans/source/win32/ftransl/ftransl.hxx
+++ b/dtrans/source/win32/ftransl/ftransl.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: ftransl.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/dtrans/source/win32/ftransl/ftranslentry.cxx b/dtrans/source/win32/ftransl/ftranslentry.cxx
index 7a387057f14d..01d1521b15bc 100644
--- a/dtrans/source/win32/ftransl/ftranslentry.cxx
+++ b/dtrans/source/win32/ftransl/ftranslentry.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: ftranslentry.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/dtrans/source/win32/ftransl/makefile.mk b/dtrans/source/win32/ftransl/makefile.mk
index f227fb7c13b4..bc6294a90f93 100644
--- a/dtrans/source/win32/ftransl/makefile.mk
+++ b/dtrans/source/win32/ftransl/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/dtrans/source/win32/misc/ImplHelper.cxx b/dtrans/source/win32/misc/ImplHelper.cxx
index e6284295badb..4bfb7f462fc2 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.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: ImplHelper.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/dtrans/source/win32/misc/ImplHelper.hxx b/dtrans/source/win32/misc/ImplHelper.hxx
index 371e5ef261a8..f410424c947f 100644
--- a/dtrans/source/win32/misc/ImplHelper.hxx
+++ b/dtrans/source/win32/misc/ImplHelper.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: ImplHelper.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/dtrans/source/win32/misc/WinClip.hxx b/dtrans/source/win32/misc/WinClip.hxx
index baec54baef98..670fd70d97d6 100644
--- a/dtrans/source/win32/misc/WinClip.hxx
+++ b/dtrans/source/win32/misc/WinClip.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: WinClip.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/dtrans/source/win32/misc/makefile.mk b/dtrans/source/win32/misc/makefile.mk
index 6bde0258d40b..6e9ebb82ece1 100644
--- a/dtrans/source/win32/misc/makefile.mk
+++ b/dtrans/source/win32/misc/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/win32/mtaole/MtaOleClipb.cxx b/dtrans/source/win32/mtaole/MtaOleClipb.cxx
index 6886ac4b37e1..3d083b9e5735 100644
--- a/dtrans/source/win32/mtaole/MtaOleClipb.cxx
+++ b/dtrans/source/win32/mtaole/MtaOleClipb.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: MtaOleClipb.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/win32/mtaole/makefile.mk b/dtrans/source/win32/mtaole/makefile.mk
index 098b9df89f39..3316f1a190fe 100644
--- a/dtrans/source/win32/mtaole/makefile.mk
+++ b/dtrans/source/win32/mtaole/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/win32/workbench/XTDo.cxx b/dtrans/source/win32/workbench/XTDo.cxx
index c022d9cf1a24..c3209429cf21 100644
--- a/dtrans/source/win32/workbench/XTDo.cxx
+++ b/dtrans/source/win32/workbench/XTDo.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: XTDo.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/dtrans/source/win32/workbench/XTDo.hxx b/dtrans/source/win32/workbench/XTDo.hxx
index 66819b775b24..e34a931380f8 100644
--- a/dtrans/source/win32/workbench/XTDo.hxx
+++ b/dtrans/source/win32/workbench/XTDo.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: XTDo.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/dtrans/source/win32/workbench/makefile.mk b/dtrans/source/win32/workbench/makefile.mk
index 333e41f8a13f..be85525016c9 100644
--- a/dtrans/source/win32/workbench/makefile.mk
+++ b/dtrans/source/win32/workbench/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/source/win32/workbench/test_wincb.cxx b/dtrans/source/win32/workbench/test_wincb.cxx
index 208e25b61167..b3f1a2ef95ee 100644
--- a/dtrans/source/win32/workbench/test_wincb.cxx
+++ b/dtrans/source/win32/workbench/test_wincb.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: test_wincb.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/dtrans/source/win32/workbench/testmarshal.cxx b/dtrans/source/win32/workbench/testmarshal.cxx
index 34fd6bd3da03..3927a1dcf449 100644
--- a/dtrans/source/win32/workbench/testmarshal.cxx
+++ b/dtrans/source/win32/workbench/testmarshal.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: testmarshal.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/dtrans/test/win32/dnd/atlwindow.cxx b/dtrans/test/win32/dnd/atlwindow.cxx
index c216d7cb02be..2ed1b1b956bb 100644
--- a/dtrans/test/win32/dnd/atlwindow.cxx
+++ b/dtrans/test/win32/dnd/atlwindow.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: atlwindow.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/dtrans/test/win32/dnd/atlwindow.hxx b/dtrans/test/win32/dnd/atlwindow.hxx
index f59a9d238c00..7befe05bbb4e 100644
--- a/dtrans/test/win32/dnd/atlwindow.hxx
+++ b/dtrans/test/win32/dnd/atlwindow.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: atlwindow.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/dtrans/test/win32/dnd/dndTest.cxx b/dtrans/test/win32/dnd/dndTest.cxx
index caecd6a6514f..e1a96598da62 100644
--- a/dtrans/test/win32/dnd/dndTest.cxx
+++ b/dtrans/test/win32/dnd/dndTest.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: dndTest.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/dtrans/test/win32/dnd/makefile.mk b/dtrans/test/win32/dnd/makefile.mk
index a76156144191..3744e6135806 100644
--- a/dtrans/test/win32/dnd/makefile.mk
+++ b/dtrans/test/win32/dnd/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.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/dtrans/test/win32/dnd/sourcelistener.cxx b/dtrans/test/win32/dnd/sourcelistener.cxx
index c5dab147e7bf..377157b5512e 100644
--- a/dtrans/test/win32/dnd/sourcelistener.cxx
+++ b/dtrans/test/win32/dnd/sourcelistener.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: sourcelistener.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/dtrans/test/win32/dnd/sourcelistener.hxx b/dtrans/test/win32/dnd/sourcelistener.hxx
index 0b35c45b6df3..0480102d7e00 100644
--- a/dtrans/test/win32/dnd/sourcelistener.hxx
+++ b/dtrans/test/win32/dnd/sourcelistener.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: sourcelistener.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/dtrans/test/win32/dnd/targetlistener.cxx b/dtrans/test/win32/dnd/targetlistener.cxx
index 44cb481da122..cb4a5ac72664 100644
--- a/dtrans/test/win32/dnd/targetlistener.cxx
+++ b/dtrans/test/win32/dnd/targetlistener.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: targetlistener.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/dtrans/test/win32/dnd/targetlistener.hxx b/dtrans/test/win32/dnd/targetlistener.hxx
index 12f79936c39d..9c3402e961da 100644
--- a/dtrans/test/win32/dnd/targetlistener.hxx
+++ b/dtrans/test/win32/dnd/targetlistener.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: targetlistener.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/dtrans/test/win32/dnd/transferable.cxx b/dtrans/test/win32/dnd/transferable.cxx
index e4195a89a482..4c76ec2fee73 100644
--- a/dtrans/test/win32/dnd/transferable.cxx
+++ b/dtrans/test/win32/dnd/transferable.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: transferable.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/dtrans/test/win32/dnd/transferable.hxx b/dtrans/test/win32/dnd/transferable.hxx
index ec8c9ed0199c..a9509f497ab1 100644
--- a/dtrans/test/win32/dnd/transferable.hxx
+++ b/dtrans/test/win32/dnd/transferable.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: transferable.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/dtrans/util/makefile.mk b/dtrans/util/makefile.mk
index 2e9666137619..921f4458b43c 100644
--- a/dtrans/util/makefile.mk
+++ b/dtrans/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.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/goodies/inc/agapidll.hxx b/goodies/inc/agapidll.hxx
deleted file mode 100644
index a8cd14dcc71d..000000000000
--- a/goodies/inc/agapidll.hxx
+++ /dev/null
@@ -1,80 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: agapidll.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _AGAPIDLL_HXX
-#define _AGAPIDLL_HXX
-
-#include "tools/agapi.hxx"
-#include "agsdkdll.hxx"
-
-class ChannelList;
-class ChannelAgentItem;
-class INetURLObject;
-class Library;
-
-class AgentApiDll : public AgentApi
-{
-    Library*                pAgentDll;
-    ChannelApiFncs          aChannelApiFncs;
-
-    FncInitAgent                    fncInitAgent;
-    FncShutDownAgent                fncShutDownAgent;
-    FncNewDataPermission            fncNewDataPermission;
-    FncNewData                      fncNewData;
-    FncNotifyChannelObjFile         fncNotifyChannelObjFile;
-    FncNotifyChannelObjData         fncNotifyChannelObjData;
-    FncRegisterChannels             fncRegisterChannels;
-    FncRegisterUpdateTransmitter    fncRegisterUpdateTransmitter;
-
-protected:
-    friend class ChannelList;
-    virtual BOOL            StartAgent();
-
-public:
-    AgentApiDll(ChannelAgentItem* pAgent);
-    ~AgentApiDll();
-
-    virtual void    InitAgent();
-    virtual void    ShutDownAgent();
-
-    virtual BOOL    NewDataPermission(const String& rChannelName);
-    virtual void    NewData(const String& rChannelName, const INetURLObject& rURL);
-
-    virtual void    NotifyChannelObjFile(const INetURLObject& rURL,
-                        const String& rFileName);
-    virtual void    NotifyChannelObjData(const INetURLObject& rURL,
-                        void* pBuffer, long nOffset, long nLen, long nTotalLen);
-
-    virtual void    RegisterChannels();
-    virtual void    RegisterUpdateTransmitter();
-};
-
-#endif //_AGAPIDLL_HXX
-
diff --git a/goodies/inc/agsdkdll.hxx b/goodies/inc/agsdkdll.hxx
deleted file mode 100644
index 2cd9ef7d1e7f..000000000000
--- a/goodies/inc/agsdkdll.hxx
+++ /dev/null
@@ -1,153 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: agsdkdll.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 _AGSDKDLL_HXX
-#define _AGSDKDLL_HXX
-
-#ifndef _SV_CALL
-#if defined(WIN) || defined(WNT) || ( defined(OS2) && !defined( ICC ))
-#define _SV_CALL    _cdecl
-#elif defined( ICC ) && defined( OS2 )
-#define _SV_CALL    __cdecl
-#else
-#define _SV_CALL
-#endif
-#endif
-
-#define AGSDKDLL_VERSION        2
-
-typedef void* AgentInst;
-
-////////////////////////////////////////////////////////////////////////////////
-//  Channel API Functions
-//
-
-enum AgentStreamType {
-    AS_LOCAL_FILE   = 1,
-    AS_MEMORY       = 2
-};
-
-typedef void (_SV_CALL *FncChShutDownAgent)(AgentInst pAg);
-
-typedef void (_SV_CALL *FncChSetLastSuccUpd)(AgentInst pAg);
-
-typedef void (_SV_CALL *FncChGetChannelObj)(AgentInst pAg, const char* pURL,
-    AgentStreamType eStreamType, const char* pFileName);
-
-typedef void (_SV_CALL *FncChAddChannelItem)(AgentInst pAg, const char* pName,
-    const char* pTransmitter, const char* pChannel, unsigned short nUpdPeriode,
-    const char* pAgentName );
-
-typedef void (_SV_CALL *FncChDelChannelItem)(AgentInst pAg, const char* pChName);
-
-typedef void (_SV_CALL *FncChSetTransmitter)(AgentInst pAg, const char* pChName,
-    const char* pURL);
-
-typedef void (_SV_CALL *FncChSetChannel)(AgentInst pAg, const char* pChName,
-    const char* pRelURL);
-
-typedef void (_SV_CALL *FncChSetChannelName)(AgentInst pAg, const char* pChName,
-    const char* pNewChName);
-
-typedef void (_SV_CALL *FncChSetUpdPeriode)(AgentInst pAg, const char* pChName,
-    unsigned short nUpdPeriode);
-
-typedef void (_SV_CALL *FncChSetChannelAgentName)(AgentInst pAg, const char* pChName,
-    const char* pAgName);
-
-typedef void (_SV_CALL *FncChSetUpdateTransmitter)(AgentInst pAg,
-    const char* pTransmitter);
-
-typedef const char* (_SV_CALL *FncChGetAgentSourceURL)(AgentInst pAg);
-
-struct ChannelApiFncs
-{
-    unsigned short              nVersion;
-    FncChShutDownAgent          fncShutDownAgent;
-    FncChSetLastSuccUpd         fncSetLastSuccUpd;
-    FncChGetChannelObj          fncGetChannelObj;
-    FncChAddChannelItem         fncAddChannelItem;
-    FncChDelChannelItem         fncDelChannelItem;
-    FncChSetTransmitter         fncSetTransmitter;
-    FncChSetChannel             fncSetChannel;
-    FncChSetChannelName         fncSetChannelName;
-    FncChSetUpdPeriode          fncSetUpdPeriode;
-    FncChSetChannelAgentName    fncSetChannelAgentName;
-    FncChSetUpdateTransmitter   fncSetUpdateTransmitter;
-    FncChGetAgentSourceURL      fncGetAgentSourceURL;
-};
-
-////////////////////////////////////////////////////////////////////////////////
-//  Agent API Functions
-//
-
-#if defined(WIN) || defined(WNT) || defined(OS2) || defined(UNX)
-extern "C" {
-#endif
-
-typedef void (_SV_CALL *FncInitAgent)(AgentInst, ChannelApiFncs*);
-void _SV_CALL InitAgent(AgentInst, ChannelApiFncs*);
-
-typedef void (_SV_CALL *FncShutDownAgent)();
-void _SV_CALL ShutDownAgent();
-
-// NewDataPermission
-// ChannelName
-typedef unsigned char (_SV_CALL *FncNewDataPermission)(const char*);
-unsigned char  _SV_CALL NewDataPermission(const char*);
-
-// NewData
-// ChannelName, URL
-typedef void (_SV_CALL *FncNewData)(const char*, const char*);
-void  _SV_CALL NewData(const char*, const char*);
-
-//  NotifyChannelObjFile
-//  URL, abs. Filename
-typedef void (_SV_CALL *FncNotifyChannelObjFile)(const char*, const char*);
-void  _SV_CALL NotifyChannelObjFile(const char*, const char*);
-
-//  NotifyChannelObjData
-//  URL, Buffer, Offset, Len, TotalLen
-typedef void (_SV_CALL *FncNotifyChannelObjData)(const char*, void*, long, long, long);
-void  _SV_CALL NotifyChannelObjData(const char*, void*, long, long, long);
-
-typedef void (_SV_CALL *FncRegisterChannels)(AgentInst, ChannelApiFncs*);
-void  _SV_CALL RegisterChannels(AgentInst, ChannelApiFncs*);
-
-typedef void (_SV_CALL *FncRegisterUpdateTransmitter)(AgentInst, ChannelApiFncs*);
-void  _SV_CALL RegisterUpdateTransmitter(AgentInst, ChannelApiFncs*);
-
-#if defined(WIN) || defined(WNT) || defined(OS2) || defined(UNX)
-}
-#endif
-
-#endif //_AGSDKDLL_HXX
-
-
diff --git a/goodies/inc/chagent.hxx b/goodies/inc/chagent.hxx
deleted file mode 100644
index fcd78184db37..000000000000
--- a/goodies/inc/chagent.hxx
+++ /dev/null
@@ -1,199 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: chagent.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _CHAGENT_HXX
-#define _CHAGENT_HXX
-
-#include <tools/list.hxx>
-#include <tools/urlobj.hxx>
-
-#include <tools/agitem.hxx>
-
-class ChannelAgentItem;
-class ChannelItem;
-
-DECLARE_LIST(ChannelAgentItemList,ChannelAgentItem*)
-
-enum AgentType
-{
-    AG_TYP_DONTKNOW =   0,
-    AG_TYP_DLL      =   1,
-    AG_TYP_BASIC    =   2,
-    AG_TYP_JAVA     =   3
-};
-
-#define     STR_AG_TYP_DLL      "DLL"
-#define     STR_AG_TYP_BASIC    "BASIC"
-#define     STR_AG_TYP_JAVA     "JAVA"
-
-class ChannelAgentItem : public AgentItem
-{
-    AgentType           eAgentType;
-    String              aChAgentName;
-    INetURLObject       aLocation;
-    ULONG               nLastSuccUpdDate;
-    long                nLastSuccUpdTime;
-    INetURLObject       aSource;
-    BOOL                bEnabled;
-    DateTime            aLastCheckDate;
-
-    // runtime
-    BOOL                bIsActive;
-    BOOL                bIsInUpdate;
-    BOOL                bRestartAfterUpdate;
-
-    ULONG               nChObjDate;
-    long                nChObjTime;
-    ChannelItem*        pActChannel;
-    AgentApi*           pAgentApi;
-    ChannelApi*         pChannelApi;
-    INetURLObject       aSourceURL;
-
-    Link                aBTXShutdownCallback;
-
-protected:
-    friend class ChannelApi;
-    void                DeleteApis();
-
-public:
-    ChannelAgentItem();
-    ~ChannelAgentItem();
-
-    // Set / Get AgentType
-    void                    SetChannelAgentType(AgentType eNew)
-                            { eAgentType = eNew; }
-    AgentType               GetChannelAgentType() const
-                            { return eAgentType; }
-
-    // Set / Get ChAgentName
-    void                    SetChAgentName(const String& rNew)
-                            { aChAgentName = rNew; }
-    virtual const String&   GetChAgentName() const
-                            { return aChAgentName; }
-
-    // Set / Get Location
-    void                    SetLocation(const INetURLObject& rNew)
-                            { aLocation = rNew; }
-    virtual const INetURLObject& GetLocation() const
-                            { return aLocation; }
-
-    // Set / Get LastSuccUpdDate
-    void                    SetLastSuccUpdDate(ULONG nNew)
-                            { nLastSuccUpdDate = nNew; }
-    ULONG                   GetLastSuccUpdDate() const
-                            { return nLastSuccUpdDate; }
-
-    // Set / Get LastSuccUpdTime
-    void                    SetLastSuccUpdTime(ULONG nNew)
-                            { nLastSuccUpdTime = nNew; }
-    ULONG                   GetLastSuccUpdTime() const
-                            { return nLastSuccUpdTime; }
-
-    // Set / Get LastCheckDate
-    void                    SetLastCheckDate( const DateTime& rNew )
-                            { aLastCheckDate = rNew; }
-    const DateTime&         GetLastCheckDate()
-                            { return aLastCheckDate; }
-
-    // Set / Get Source
-    void                    SetSource(const INetURLObject& rNew)
-                            { aSource = rNew; }
-    const INetURLObject&    GetSource() const
-                            { return aSource; }
-
-    // Set / Get Enabled
-    virtual void            SetEnabled(BOOL bNew = TRUE)
-                            { bEnabled = bNew; }
-    virtual BOOL            IsEnabled() const
-                            { return bEnabled; }
-
-    // Set / Get IsActive
-    virtual void            SetIsActive(BOOL bNew)
-                            { bIsActive = bNew; }
-    virtual BOOL            IsActive() const
-                            { return bIsActive; }
-
-    // runtime ////////////////////////////////////////////////////////////////
-
-    const INetURLObject&    GetAgentSourceURL() const
-                            { return aSourceURL; }
-    void                    SetAgentSourceURL(const INetURLObject& rNew)
-                            { aSourceURL = rNew; }
-
-    // Set / Get ActiveChannel
-    void                    SetActiveChannel(ChannelItem* pChItem)
-                            { pActChannel = pChItem; }
-    ChannelItem*            GetActiveChannel() const
-                            { return pActChannel; }
-
-    // Set / Get IsInUpdate
-    void                    SetIsInUpdate( BOOL bNew )
-                            { bIsInUpdate = bNew; }
-    BOOL                    IsInUpdate() const
-                            { return bIsInUpdate; }
-
-    // Set / Get RestartAfterUpdate
-    void                    SetRestartAfterUpdate( BOOL bNew )
-                            { bRestartAfterUpdate = bNew; }
-    BOOL                    RestartAfterUpdate() const
-                            { return bRestartAfterUpdate; }
-
-    // AgentAPI
-    void                    SetApi(AgentApi* pNew )
-                            { pAgentApi = pNew; }
-    virtual AgentApi*       GetApi() const
-                            { return pAgentApi; }
-
-    // ChannelAPI
-    void                    SetChApi(ChannelApi* pNew )
-                            { pChannelApi = pNew; }
-    virtual ChApi*          GetChApi() const
-                            { return (ChApi*)pChannelApi; }
-
-    // Set / Get ChObjDate
-    void                    SetChObjDate(ULONG nNew)
-                            { nChObjDate = nNew; }
-    ULONG                   GetChObjDate() const
-                            { return nChObjDate; }
-
-    // Set / Get ChObjTime
-    void                    SetChObjTime(long nNew)
-                            { nChObjTime = nNew; }
-    long                    GetChObjTime() const
-                            { return nChObjTime; }
-
-    void                    SetBTXShutDownCallBack(const Link& rLnk )
-                            { aBTXShutdownCallback = rLnk; }
-    const Link&             GetBTXShutDownCallBack()
-                            { return aBTXShutdownCallback; }
-
-};
-
-#endif // _CHAGENT_HXX
diff --git a/goodies/inc/chanapi.hxx b/goodies/inc/chanapi.hxx
deleted file mode 100644
index abbb272ef22f..000000000000
--- a/goodies/inc/chanapi.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: chanapi.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _CHANAPI_HXX
-#define _CHANAPI_HXX
-
-
-#include <tools/list.hxx>
-#include <tools/chapi.hxx>
-
-#ifndef _INETSES_HXX //autogen
-#include <inet/inetsess.hxx>
-#endif
-
-class ChannelAgentItem;
-class ChannelList;
-class INetURLObject;
-class GetChannelObj;
-
-DECLARE_LIST(GetChObjList, GetChannelObj*);
-
-class ChannelApi : public ChApi
-{
-    INetSessionRef          xINetSession;
-
-    ChannelAgentItem*       pChAgent;
-    ChannelList*            pChannelList;
-
-    GetChObjList*           pGetChObjList;
-
-    DECL_LINK(CloseAgentEvt, void*);
-    DECL_LINK(CloseChannelObjEvt, void*);
-    DECL_LINK(GetChannelObjNotify, GetChannelObj*);
-public:
-    ChannelApi( ChannelAgentItem* pAgent, INetSession* pISess,
-                ChannelList* pChLst );
-    ~ChannelApi();
-
-    void    ShutDownAgent();
-    void    SetLastSuccUpd();
-
-    void    GetChannelObject( const INetURLObject& rURL, RequestType eStreamType,
-                            const String& rFileName );
-    void    AddChannelItem( const String& aChName, const INetURLObject& aTransmitter,
-                            const String& aChannel, USHORT nUpdPeriode,
-                            const String& rChAgentName );
-    void    DelChannelItem( const String& aChName );
-    void    SetChTransmitter( const String& aChName, const String& rNewVal );
-    void    SetChannel( const String& aChName, const String& rNewVal );
-    void    SetChannelName( const String& aChName, const String& rNewVal );
-    void    SetChUpdPeriode( const String& aChName, USHORT nUpdPeriode );
-    void    SetChannelAgentName( const String& aChName, const String& rNewVal );
-
-    void    SetUpdateTransmitter(ChannelAgentItem* pAgent, const INetURLObject& rTransmitter);
-};
-
-#endif //_CHANAPI_HXX
diff --git a/goodies/inc/channel.hxx b/goodies/inc/channel.hxx
deleted file mode 100644
index bd609bb8d544..000000000000
--- a/goodies/inc/channel.hxx
+++ /dev/null
@@ -1,113 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: channel.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _CHANNEL_HXX
-#define _CHANNEL_HXX
-
-#include <tools/list.hxx>
-#include <tools/urlobj.hxx>
-
-class ChannelItem;
-DECLARE_LIST(ChannelItemList,ChannelItem*)
-
-class ChannelItem
-{
-    INetURLObject       aTransmitter;
-    String              aChannel;
-    String              aChannelName;
-    String              aChannelAgentName;
-    ULONG               nUpdatePeriode;
-    ULONG               nLastTimerTick;
-    ULONG               nLastSuccUpdDate;
-    long                nLastSuccUpdTime;
-
-    BOOL                bAgentUpdChannel;
-
-public:
-    ChannelItem();
-    ~ChannelItem();
-
-    // Set / Get Transmitter
-    void                    SetTransmitter(const INetURLObject& rNew)
-                            { aTransmitter = rNew; }
-    const INetURLObject&    GetTransmitter() const
-                            { return aTransmitter; }
-
-    // Set / Get Channel
-    void                    SetChannel(const String& rNew)
-                            { aChannel = rNew; }
-    const String&           GetChannel() const
-                            { return aChannel; }
-
-    // Set / Get ChannelName
-    void                    SetChannelName(const String& rNew)
-                            { aChannelName = rNew; }
-    const String&           GetChannelName() const
-                            { return aChannelName; }
-
-    // Set / Get ChannelAgentName
-    void                    SetChannelAgentName(const String& rNew)
-                            { aChannelAgentName = rNew; }
-    const String&           GetChannelAgentName() const
-                            { return aChannelAgentName; }
-
-    // Set / Get UpdatePeriode
-    void                    SetUpdatePeriode(ULONG nNew)
-                            { nUpdatePeriode = nNew; }
-    ULONG                   GetUpdatePeriode() const
-                            { return nUpdatePeriode; }
-
-    // Set / Get LastTimerTick
-    void                    SetLastTimerTick(ULONG nNew)
-                            { nLastTimerTick = nNew; }
-    ULONG                   GetLastTimerTick() const
-                            { return nLastTimerTick; }
-
-    // Set / Get LastSuccUpdDate
-    void                    SetLastSuccUpdDate(ULONG nNew)
-                            { nLastSuccUpdDate = nNew; }
-    ULONG                   GetLastSuccUpdDate() const
-                            { return nLastSuccUpdDate; }
-
-    // Set / Get LastSuccUpdTime
-    void                    SetLastSuccUpdTime(long nNew)
-                            { nLastSuccUpdTime = nNew; }
-    long                    GetLastSuccUpdTime() const
-                            { return nLastSuccUpdTime; }
-
-    // Set / Get AgentUpdChannel
-    void                    SetAgentUpdChannel(BOOL bNew)
-                            { bAgentUpdChannel = bNew; }
-    BOOL                    GetAgentUpdChannel() const
-                            { return bAgentUpdChannel; }
-};
-
-#endif // _CHANNEL_HXX
-
diff --git a/goodies/inc/chlist.hxx b/goodies/inc/chlist.hxx
deleted file mode 100644
index cabf4f381576..000000000000
--- a/goodies/inc/chlist.hxx
+++ /dev/null
@@ -1,219 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: chlist.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 _CHLIST_HXX
-#define _CHLIST_HXX
-
-#include <tools/urlobj.hxx>
-#include <tools/datetime.hxx>
-#include <tools/string.hxx>
-#include <vcl/timer.hxx>
-#include <tools/list.hxx>
-#ifndef _INETSES_HXX //autogen
-#include <inet/inetsess.hxx>
-#endif
-
-class Downloader;
-class ChannelAgentItem;
-class ChannelItem;
-class ChannelItemList;
-class ChannelAgentItemList;
-class ChannelTuner;
-class ChannelApi;
-class GetChannelObj;
-class GetChObjList;
-class NotifyItem;
-class Date;
-class Time;
-class ResMgr;
-
-struct UiAgentItem
-{
-    String      aName;
-    ULONG       aUpdPeriode;
-    DateTime    aLastDataDate;
-    DateTime    aLastUpdDate;
-    BOOL        bUnregister;
-    BOOL        bIsEnabled;
-};
-
-DECLARE_LIST(UiAgentList, UiAgentItem*)
-DECLARE_LIST(NotifyList, NotifyItem*)
-
-#ifndef STRING_LIST
-#define STRING_LIST
-#define _TOOLS_STRINGLIST
-#include <tools/sstring.hxx>
-#endif
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//
-#define JOBID_DOWNLOAD_AGENT        1
-#define JOBID_UPDATE_AGENT          2
-#define JOBID_CHECK_TRANSMITTER     3
-
-struct BTXResponse
-{
-    USHORT  nJobId;
-    BOOL    bFinish;
-    ULONG   nTransferStatus;
-    String  aLocalFileName;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//
-class ChannelList
-{
-    ResMgr*                     pResMgr;
-    ChannelAgentItemList*       pAgentList;
-    ChannelItemList*            pChannelList;
-    NotifyList*                 pNotifyList;
-    GetChObjList*               pGetChObjList;
-    UiAgentList*                pUiAgentList;
-
-    ChannelTuner*               pChannelTuner;
-
-    String                      aAgentPath;
-    AutoTimer                   aTimer;
-    INetSessionRef              xINetSession;
-
-    Link                        aNotifyPermissionHdl;
-    Link                        aCheckFinishHdl;
-    // wird von der ChannelList gehandelt; sollte ausgebaut werden; auch im SFX
-    Link                        aAgentUpdateHdl;
-    Downloader*                 pBTXDecoder;
-
-    void                        MakeGodChannel(ChannelAgentItem* pAgent);
-    void                        DeleteUiAgentList();
-
-    BOOL                        StartAgent(ChannelAgentItem* pAgent);
-
-    void                        DoNotifyAgents();
-    void                        NotifyAgent(ChannelAgentItem* pAgent, ULONG nNotifyItemIdx);
-
-    void                        UpdateAgent(ChannelAgentItem* pAgent, ULONG nNotifyItemIdx);
-    void                        SendItemToTuner(ChannelItem* pItem);
-
-    BOOL                        ParseDateTime(const String& rSrc, Date& rDate, Time& rTime);
-
-    void                        UnZipAgent(ChannelAgentItem* pAgent);
-    static void                 EnumFilesCallBack(char *pFile, void *pObject);
-
-    DECL_LINK(CheckChannels, void*);
-    DECL_LINK(CloseChannelObjEvt, void*);
-    DECL_LINK(GetChannelObjNotify, GetChannelObj*);
-protected:
-    friend class ChannelApi;
-    friend class ChannelTuner;
-
-    ChannelItem*                GetChannelItemByName(const String& rName);
-    ChannelAgentItem*           GetAgentItemByName(const String& rName);
-
-    void                        ReadChannelList();
-    void                        ReadAgentList();
-    void                        WriteChannelItem(ChannelItem* pItem);
-    void                        WriteAgentItem(ChannelAgentItem* pChAgent);
-    void                        SetLastSuccUpdChannel(ChannelAgentItem* pChAgent);
-    void                        SetLastSuccUpdAgent(ChannelAgentItem* pChAgent);
-    void                        SetEnabledAgent(ChannelAgentItem* pChAgent);
-
-    void                        DeleteAgentItem(ChannelAgentItem* pItem);
-    void                        DeleteChannelItem(ChannelItem* pItem);
-    void                        RegisterNewChannelItem(ChannelItem* pItem);
-
-    void                        CancelBTX();
-    Downloader*                 GetBTXDecoder() const { return pBTXDecoder; }
-    ResMgr*                     GetResMgr() const { return pResMgr; }
-
-    DECL_LINK(CheckBTXFinishHdl, void*);
-
-    void                        NotifyTransmitterMsg(const String& rStr);
-
-public:
-    ChannelList(const String& rAgentPath);
-    ~ChannelList();
-
-    void                SubscribeNewAgent(const INetURLObject& rURL);
-
-    void                SetINetSession(INetSession* pNewSess);
-    void                SetBTXDecoder(Downloader* pDecoder);
-
-    void                SetNotifyPermissionHdl(const Link& rHdl) { aNotifyPermissionHdl = rHdl; }
-    void                SetAgentUpdateHdl(const Link& rHdl) { aAgentUpdateHdl = rHdl; }
-
-    void                SetTimerInterval(ULONG nNew);
-    void                StartCheckChannels();
-    void                StopCheckChannels();
-
-    void                CheckAgentNow(const String& rAgName, BOOL bCheckGOD = FALSE);
-    void                SetCheckFinishHdl(const Link& rHdl) { aCheckFinishHdl = rHdl; }
-    const Link&         GetCheckFinishHdl() const { return aCheckFinishHdl;};
-
-    UiAgentList*        GetUiAgentList();
-    void                JoinUiAgentList();
-};
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//
-class NotifyItem
-{
-    ChannelItem*    pChItem;
-
-    USHORT          nGMTOffset;
-    ULONG           nDateLastUpd;
-    long            nTimeLastUpd;
-    INetURLObject   aChObjURL;
-    String          aChName;
-public:
-    NotifyItem( ChannelItem* pItem, short nGMTOff, ULONG nLastDate,
-                ULONG nLastTime, const INetURLObject& rChObjURL,
-                const String& rChName);
-    ~NotifyItem();
-
-    ChannelItem*        GetChannelItem() const          { return pChItem;       }
-
-    const String&       GetChannelName() const          { return aChName;       }
-    const INetURLObject GetChannelObjURL() const        { return aChObjURL;     }
-
-    void                SetDateLastUpd(ULONG nNew)      { nDateLastUpd = nNew;  }
-    ULONG               GetDateLastUpd() const          { return nDateLastUpd;  }
-
-    void                SetTimeLastUpd(long nNew)       { nTimeLastUpd = nNew;  }
-    long                GetTimeLastUpd() const          { return nTimeLastUpd;  }
-
-    const String&       GetChAgentName() const;
-
-};
-
-#endif // _CHLIST_HXX
-
diff --git a/goodies/inc/chtuner.hxx b/goodies/inc/chtuner.hxx
deleted file mode 100644
index 7a54c1e05a41..000000000000
--- a/goodies/inc/chtuner.hxx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: chtuner.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _CHTUNER_HXX
-#define _CHTUNER_HXX
-
-#include <vcl/timer.hxx>
-#include <tools/list.hxx>
-#ifndef _INETSESS_HXX
-#include <inet/inetsess.hxx>
-#endif
-
-
-#include <svl/lstner.hxx>
-
-class ChannelItem;
-class ChannelList;
-class INetRequest;
-class Downloader;
-class StringList;
-
-struct RetryInformation
-{
-    String  aURL;
-    Time    aErrorTime;
-};
-
-DECLARE_LIST(ReqList,INetRequest*)
-DECLARE_LIST(RetryList,RetryInformation*)
-
-class ChannelTuner : public SfxListener
-{
-    ChannelList*        pChannelList;
-    INetSessionRef      xINetSession;
-    ReqList*            pReqList;
-
-    Link                aBTXCallBack;
-    Downloader*         pBTXDecoder;
-    String              aBTXFileName;
-
-    AutoTimer           aRetryTimer;
-    RetryList*          pRetryList;
-
-    void                SendHttpReq(const INetURLObject& rURL);
-    void                SendFtpReq(const INetURLObject& rURL);
-    void                SendBTXReq(const INetURLObject& rURL);
-    void                GetFileTrans(const INetURLObject& rURL);
-
-    void                RemoveRequest(INetRequest* pReq);
-    void                NotifyChannelList(String& rStr);
-
-    virtual void        SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType,
-                                const SfxHint& rHint, const TypeId& rHintType);
-
-    DECL_LINK(RetryCallBack, void*);
-    DECL_LINK(BTXCallBack, void*);
-public:
-    ChannelTuner(INetSession* pSess, ChannelList* pChList);
-    ~ChannelTuner();
-
-    BOOL RequestChannel(ChannelItem* pItem, const Link& rBTXCallBack);
-
-    void SetINetSession(INetSession* pNewSess);
-    void SetBTXDecoder(Downloader* pDecoder);
-};
-
-#endif // _CHTUNER_HXX
diff --git a/goodies/inc/crypt.hxx b/goodies/inc/crypt.hxx
deleted file mode 100644
index 24e4215a3fda..000000000000
--- a/goodies/inc/crypt.hxx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: crypt.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.
- *
- ************************************************************************/
-
-// include ---------------------------------------------------------------
-#include <tools/gen.hxx>
-
-// define ----------------------------------------------------------------
-
-#define     nInOfs      0x00010000UL
-#define     nOutOfs     0x00020000UL
-
-// cryptit ---------------------------------------------------------------
-
-extern "C"
-{
-//ULONG testdll(const String& ,const String& , const String&, BOOL DoCrypt );
-//ULONG __EXPORT testdll(const char* pCrInName, const char* pCrOutName,
-//    const char* pCrKey, BOOL DoCrypt=1);
-#if defined (UNX)
-extern ULONG cryptit(const char* pCrInName, const char* pCrOutName,
-#else
-#ifdef WNT
-extern ULONG __stdcall cryptit(const char* pCrInName, const char* pCrOutName,
-#else
-#if defined( MTW ) || defined( ICC )
-extern ULONG cryptit(const char* pCrInName, const char* pCrOutName,
-#else
-extern ULONG __pascal cryptit(const char* pCrInName, const char* pCrOutName,
-#endif
-#endif
-#endif
-                const char* pCrKey, USHORT DoCrypt);
-}
-
-
diff --git a/goodies/inc/goodies.hrc b/goodies/inc/goodies.hrc
deleted file mode 100644
index 139987c4f6ee..000000000000
--- a/goodies/inc/goodies.hrc
+++ /dev/null
@@ -1,60 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: goodies.hrc,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.
- *
- ************************************************************************/
-#ifndef _GOODIES_HRC
-#define _GOODIES_HRC
-
-#ifndef _SOLAR_HRC
-#include <svl/solar.hrc>
-#endif
-
-// Dialoge ---------------------------------------------------------------
-
-#define DLG_EXPORT_EPCT                 (RID_GOODIES_START+ 0)
-#define DLG_EXPORT_GIF                  (RID_GOODIES_START+ 1)
-#define DLG_EXPORT_EMET                 (RID_GOODIES_START+ 2)
-#define DLG_EXPORT_JPG                  (RID_GOODIES_START+ 3)
-#define DLG_IMPORT_PCD                  (RID_GOODIES_START+ 4)
-#define DLG_EXPORT_EPNG                 (RID_GOODIES_START+ 5)
-#define DLG_EXPORT_EPS                  (RID_GOODIES_START+ 8)
-#define DLG_EXPORT_EPBM                 (RID_GOODIES_START+ 9)
-#define DLG_EXPORT_EPGM                 (RID_GOODIES_START+ 10)
-#define DLG_EXPORT_EPPM                 (RID_GOODIES_START+ 11)
-#define DLG_SSL_NEWCERT                 (RID_GOODIES_START+ 12)
-#define DLG_SSL_INFCERT                 (RID_GOODIES_START+ 13)
-#define PAGE_SSL_NEWCERT_OPEN           (RID_GOODIES_START+ 14)
-#define PAGE_SSL_NEWCERT_SHOWCERT       (RID_GOODIES_START+ 15)
-#define PAGE_SSL_NEWCERT_ACCEPTCERT     (RID_GOODIES_START+ 16)
-#define PAGE_SSL_NEWCERT_WARNCERT       (RID_GOODIES_START+ 17)
-#define PAGE_SSL_NEWCERT_READYCERT      (RID_GOODIES_START+ 18)
-#define WIN_SSL_INFCERT                 (RID_GOODIES_START+ 19)
-#define WIN_SSL_INFCERT_EDIT            (RID_GOODIES_START+ 20)
-
-#endif
-
diff --git a/goodies/inc/pch/precompiled_goodies.cxx b/goodies/inc/pch/precompiled_goodies.cxx
deleted file mode 100644
index 663a76ec3160..000000000000
--- a/goodies/inc/pch/precompiled_goodies.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: precompiled_goodies.cxx,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.
- *
- ************************************************************************/
-
-#include "precompiled_goodies.hxx"
-
diff --git a/goodies/inc/pch/precompiled_goodies.hxx b/goodies/inc/pch/precompiled_goodies.hxx
deleted file mode 100644
index fe6f2ec433e5..000000000000
--- a/goodies/inc/pch/precompiled_goodies.hxx
+++ /dev/null
@@ -1,174 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: precompiled_goodies.hxx,v $
- * $Revision: 1.4.42.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): Generated on 2006-09-01 17:49:44.889563
-
-#ifdef PRECOMPILED_HEADERS
-
-//---MARKER---
-#include "sal/types.h"
-
-#include "com/sun/star/awt/FontDescriptor.hpp"
-#include "com/sun/star/awt/FontUnderline.hpp"
-#include "com/sun/star/awt/FontWeight.hpp"
-#include "com/sun/star/awt/Gradient.hpp"
-#include "com/sun/star/awt/Rectangle.hpp"
-#include "com/sun/star/awt/Size.hpp"
-#include "com/sun/star/awt/XBitmap.hpp"
-#include "com/sun/star/awt/XDevice.hpp"
-#include "com/sun/star/beans/PropertyAttribute.hpp"
-#include "com/sun/star/beans/PropertyState.hpp"
-#include "com/sun/star/beans/XPropertySet.hpp"
-#include "com/sun/star/drawing/CircleKind.hpp"
-#include "com/sun/star/drawing/FillStyle.hpp"
-#include "com/sun/star/drawing/FlagSequence.hpp"
-#include "com/sun/star/drawing/Hatch.hpp"
-#include "com/sun/star/drawing/LineDash.hpp"
-#include "com/sun/star/drawing/LineStyle.hpp"
-#include "com/sun/star/drawing/PointSequence.hpp"
-#include "com/sun/star/drawing/PointSequenceSequence.hpp"
-#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
-#include "com/sun/star/drawing/TextAdjust.hpp"
-#include "com/sun/star/drawing/XDrawPage.hpp"
-#include "com/sun/star/drawing/XDrawPages.hpp"
-#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
-#include "com/sun/star/drawing/XShape.hpp"
-#include "com/sun/star/drawing/XShapeGrouper.hpp"
-#include "com/sun/star/frame/XModel.hpp"
-#include "com/sun/star/graphic/GraphicType.hpp"
-#include "com/sun/star/graphic/XGraphic.hpp"
-#include "com/sun/star/graphic/XGraphicProvider.hpp"
-#include "com/sun/star/graphic/XGraphicRenderer.hpp"
-#include "com/sun/star/io/XStream.hpp"
-#include "com/sun/star/lang/XMultiServiceFactory.hpp"
-#include "com/sun/star/lang/XServiceInfo.hpp"
-#include "com/sun/star/lang/XUnoTunnel.hpp"
-#include "com/sun/star/registry/XRegistryKey.hpp"
-#include "com/sun/star/style/HorizontalAlignment.hpp"
-#include "com/sun/star/task/XStatusIndicator.hpp"
-#include "com/sun/star/text/XText.hpp"
-#include "com/sun/star/text/XTextRange.hpp"
-
-#include "comphelper/processfactory.hxx"
-#include "comphelper/propertysethelper.hxx"
-#include "comphelper/propertysetinfo.hxx"
-
-#include "cppuhelper/factory.hxx"
-#include "cppuhelper/implbase1.hxx"
-#include "cppuhelper/servicefactory.hxx"
-
-
-#include "osl/diagnose.h"
-#include "osl/endian.h"
-#include "osl/file.hxx"
-#include "osl/process.h"
-
-#include "rtl/alloc.h"
-#include "rtl/math.hxx"
-#include "rtl/ustring.hxx"
-#include "rtl/uuid.h"
-
-#include "svtools/FilterConfigItem.hxx"
-#include "unotools/cacheoptions.hxx"
-#include "svtools/fltcall.hxx"
-#include "svl/itemprop.hxx"
-#include "svl/lstner.hxx"
-#include "svl/solar.hrc"
-#include "svtools/stdctrl.hxx"
-#include "svl/svarray.hxx"
-
-#include "toolkit/helper/vclunohelper.hxx"
-
-#include "tools/agapi.hxx"
-#include "tools/agitem.hxx"
-#include "tools/bigint.hxx"
-#include "tools/chapi.hxx"
-#include "tools/color.hxx"
-#include "tools/datetime.hxx"
-#include "tools/debug.hxx"
-#include "tools/gen.hxx"
-#include "tools/list.hxx"
-#include "tools/poly.hxx"
-#include "tools/rcid.h"
-#include "tools/ref.hxx"
-#include "tools/resid.hxx"
-#include "tools/resmgr.hxx"
-#include "tools/rtti.hxx"
-#include "tools/shl.hxx"
-#include "tools/solar.h"
-#include "tools/string.hxx"
-#include "tools/table.hxx"
-#include "tools/tempfile.hxx"
-#include "tools/time.hxx"
-#include "tools/urlobj.hxx"
-#include "tools/vcompat.hxx"
-#include "tools/vector2d.hxx"
-
-#include "uno/mapping.hxx"
-
-#include "unotools/localfilehelper.hxx"
-#include "unotools/processfactory.hxx"
-
-#include "vcl/alpha.hxx"
-#include "vcl/animate.hxx"
-#include "vcl/bitmap.hxx"
-#include "vcl/bitmapex.hxx"
-#include "vcl/bmpacc.hxx"
-#include "vcl/button.hxx"
-#include "vcl/dialog.hxx"
-#include "vcl/field.hxx"
-#include "vcl/fixed.hxx"
-#include "vcl/floatwin.hxx"
-#include "vcl/font.hxx"
-#include "vcl/gdimtf.hxx"
-#include "vcl/gradient.hxx"
-#include "vcl/graph.h"
-#include "vcl/hatch.hxx"
-#include "vcl/image.hxx"
-#include "vcl/imagerepository.hxx"
-#include "vcl/lineinfo.hxx"
-#include "vcl/lstbox.hxx"
-#include "vcl/metric.hxx"
-#include "vcl/msgbox.hxx"
-#include "vcl/outdev.hxx"
-#include "vcl/region.hxx"
-#include "vcl/salbtype.hxx"
-#include "vcl/sv.h"
-#include "vcl/svapp.hxx"
-#include "vcl/timer.hxx"
-#include "vcl/virdev.hxx"
-#include "vcl/window.hxx"
-
-#include "vos/macros.hxx"
-#include "vos/mutex.hxx"
-#include "vos/timer.hxx"
-//---MARKER---
-
-#endif
diff --git a/goodies/prj/build.lst b/goodies/prj/build.lst
deleted file mode 100644
index f8edce86c4f8..000000000000
--- a/goodies/prj/build.lst
+++ /dev/null
@@ -1,31 +0,0 @@
-go      goodies :    l10n svtools NULL
-go	goodies									usr1	-	all	g_mkout NULL
-go	goodies\inc								nmake	-	all	g_inc NULL
-go	goodies\prj								get		-	all	g_prj NULL
-go	goodies\source\base3d					nmake	-	all	g_base3d g_inc NULL
-go	goodies\source\inv					nmake	-	all	g_inv g_inc NULL
-go	goodies\source\graphic					nmake	-	all	g_graph g_inc NULL
-go	goodies\source\filter.vcl\eos2met		nmake	-	all	g_vfeom g_inc NULL
-go	goodies\source\filter.vcl\ios2met		nmake	-	all	g_vfiom g_inc NULL
-go	goodies\source\filter.vcl\epict			nmake	-	all	g_vfept g_inc NULL
-go	goodies\source\filter.vcl\egif			nmake	-	all	g_vfegf g_inc NULL
-go	goodies\source\filter.vcl\ipcd			nmake	-	all	g_vfipc g_inc NULL
-go	goodies\source\filter.vcl\ipcx			nmake	-	all	g_vfipx g_inc NULL
-go	goodies\source\filter.vcl\ipict			nmake	-	all	g_vfipt g_inc NULL
-go	goodies\source\filter.vcl\idxf			nmake	-	all	g_vfidx g_inc NULL
-go	goodies\source\filter.vcl\itiff			nmake	-	all	g_vfitf g_inc NULL
-go	goodies\source\filter.vcl\ipbm			nmake	-	all	g_vfpbm g_inc NULL
-go	goodies\source\filter.vcl\epbm			nmake	-	all	g_epbm g_inc NULL
-go	goodies\source\filter.vcl\epgm			nmake	-	all	g_epgm g_inc NULL
-go	goodies\source\filter.vcl\eppm			nmake	-	all	g_eppm g_inc NULL
-go	goodies\source\filter.vcl\iras			nmake	-	all	g_iras g_inc NULL
-go	goodies\source\filter.vcl\expm			nmake	-	all	g_expm g_inc NULL
-go	goodies\source\filter.vcl\eras			nmake	-	all	g_eras g_inc NULL
-go	goodies\source\filter.vcl\etiff			nmake	-	all	g_etiff g_inc NULL
-go	goodies\source\filter.vcl\eps			nmake	-	all	g_eps g_inc NULL
-go	goodies\source\filter.vcl\itga			nmake	-	all	g_itga g_inc NULL
-go	goodies\source\filter.vcl\ipsd			nmake	-	all	g_ipsd g_inc NULL
-go	goodies\source\filter.vcl\ieps			nmake	-	all	g_ieps g_inc NULL
-go	goodies\source\filter.vcl\icgm			nmake	-	all	g_icgm g_inc NULL
-go	goodies\source\unographic				nmake	-	all	g_unographic g_inc NULL
-go	goodies\util							nmake	-	all	g_util g_base3d g_inv g_graph g_unographic NULL
diff --git a/goodies/prj/d.lst b/goodies/prj/d.lst
deleted file mode 100644
index f30ca516b5da..000000000000
--- a/goodies/prj/d.lst
+++ /dev/null
@@ -1,82 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\lib\mail.lib %_DEST%\lib%_EXT%\mail.lib
-..\%__SRC%\lib\crypt.lib %_DEST%\lib%_EXT%\crypt.lib
-..\%__SRC%\lib\icrp.lib %_DEST%\lib%_EXT%\icrp.lib
-..\%__SRC%\lib\igo.lib %_DEST%\lib%_EXT%\go.lib
-..\%__SRC%\lib\igo.lib %_DEST%\lib%_EXT%\igo.lib
-..\%__SRC%\lib\itfu.lib %_DEST%\lib%_EXT%\itfu.lib
-..\%__SRC%\slb\go.lib %_DEST%\lib%_EXT%\xgo.lib
-..\%__SRC%\slb\gol.lib %_DEST%\lib%_EXT%\gol.lib
-..\%__SRC%\bin\ma?????.* %_DEST%\bin%_EXT%\ma?????.*
-..\%__SRC%\bin\tfu?????.dll %_DEST%\bin%_EXT%\tfu?????.dll
-..\%__SRC%\bin\tfu?????.sym %_DEST%\bin%_EXT%\tfu?????.sym
-..\%__SRC%\bin\crp?????.dll %_DEST%\bin%_EXT%\crp?????.dll
-..\%__SRC%\bin\crp?????.sym %_DEST%\bin%_EXT%\crp?????.sym
-..\%__SRC%\bin\solarvim.dll %_DEST%\bin%_EXT%\solarvim.dll
-..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map
-..\%__SRC%\bin\ept?????.dll %_DEST%\bin%_EXT%\ept?????.dll
-..\%__SRC%\bin\ept?????.sym %_DEST%\bin%_EXT%\ept?????.sym
-..\%__SRC%\bin\eme?????.dll %_DEST%\bin%_EXT%\eme?????.dll
-..\%__SRC%\bin\eme?????.sym %_DEST%\bin%_EXT%\eme?????.sym
-..\%__SRC%\bin\egi?????.dll %_DEST%\bin%_EXT%\egi?????.dll
-..\%__SRC%\bin\egi?????.sym %_DEST%\bin%_EXT%\egi?????.sym
-..\%__SRC%\bin\eti?????.dll %_DEST%\bin%_EXT%\eti?????.dll
-..\%__SRC%\bin\eti?????.sym %_DEST%\bin%_EXT%\eti?????.sym
-..\%__SRC%\bin\era?????.dll %_DEST%\bin%_EXT%\era?????.dll
-..\%__SRC%\bin\era?????.sym %_DEST%\bin%_EXT%\era?????.sym
-..\%__SRC%\bin\eps?????.dll %_DEST%\bin%_EXT%\eps?????.dll
-..\%__SRC%\bin\eps?????.sym %_DEST%\bin%_EXT%\eps?????.sym
-..\%__SRC%\bin\exp?????.dll %_DEST%\bin%_EXT%\exp?????.dll
-..\%__SRC%\bin\exp?????.sym %_DEST%\bin%_EXT%\exp?????.sym
-..\%__SRC%\bin\epb?????.dll %_DEST%\bin%_EXT%\epb?????.dll
-..\%__SRC%\bin\epb?????.sym %_DEST%\bin%_EXT%\epb?????.sym
-..\%__SRC%\bin\epg?????.dll %_DEST%\bin%_EXT%\epg?????.dll
-..\%__SRC%\bin\epg?????.sym %_DEST%\bin%_EXT%\epg?????.sym
-..\%__SRC%\bin\epp?????.dll %_DEST%\bin%_EXT%\epp?????.dll
-..\%__SRC%\bin\epp?????.sym %_DEST%\bin%_EXT%\epp?????.sym
-..\%__SRC%\bin\ime?????.dll %_DEST%\bin%_EXT%\ime?????.dll
-..\%__SRC%\bin\ime?????.sym %_DEST%\bin%_EXT%\ime?????.sym
-..\%__SRC%\bin\ipt?????.dll %_DEST%\bin%_EXT%\ipt?????.dll
-..\%__SRC%\bin\ipt?????.sym %_DEST%\bin%_EXT%\ipt?????.sym
-..\%__SRC%\bin\icd?????.dll %_DEST%\bin%_EXT%\icd?????.dll
-..\%__SRC%\bin\icd?????.sym %_DEST%\bin%_EXT%\icd?????.sym
-..\%__SRC%\bin\ipx?????.dll %_DEST%\bin%_EXT%\ipx?????.dll
-..\%__SRC%\bin\ipx?????.sym %_DEST%\bin%_EXT%\ipx?????.sym
-..\%__SRC%\bin\icg?????.dll %_DEST%\bin%_EXT%\icg?????.dll
-..\%__SRC%\bin\icg?????.sym %_DEST%\bin%_EXT%\icg?????.sym
-..\%__SRC%\bin\ira?????.dll %_DEST%\bin%_EXT%\ira?????.dll
-..\%__SRC%\bin\ira?????.sym %_DEST%\bin%_EXT%\ira?????.sym
-..\%__SRC%\bin\itg?????.dll %_DEST%\bin%_EXT%\itg?????.dll
-..\%__SRC%\bin\itg?????.sym %_DEST%\bin%_EXT%\itg?????.sym
-..\%__SRC%\bin\ipd?????.dll %_DEST%\bin%_EXT%\ipd?????.dll
-..\%__SRC%\bin\ipd?????.sym %_DEST%\bin%_EXT%\ipd?????.sym
-..\%__SRC%\bin\ips?????.dll %_DEST%\bin%_EXT%\ips?????.dll
-..\%__SRC%\bin\ips?????.sym %_DEST%\bin%_EXT%\ips?????.sym
-..\%__SRC%\bin\ipb?????.dll %_DEST%\bin%_EXT%\ipb?????.dll
-..\%__SRC%\bin\ipb?????.sym %_DEST%\bin%_EXT%\ipb?????.sym
-..\%__SRC%\bin\iti?????.dll %_DEST%\bin%_EXT%\iti?????.dll
-..\%__SRC%\bin\iti?????.sym %_DEST%\bin%_EXT%\iti?????.sym
-..\%__SRC%\bin\igi?????.dll %_DEST%\bin%_EXT%\igi?????.dll
-..\%__SRC%\bin\igi?????.sym %_DEST%\bin%_EXT%\igi?????.sym
-..\%__SRC%\bin\idx?????.dll %_DEST%\bin%_EXT%\idx?????.dll
-..\%__SRC%\bin\idx?????.sym %_DEST%\bin%_EXT%\idx?????.sym
-..\%__SRC%\bin\ixb?????.dll %_DEST%\bin%_EXT%\ixb?????.dll
-..\%__SRC%\bin\ixb?????.sym %_DEST%\bin%_EXT%\ixb?????.sym
-..\%__SRC%\bin\jpg?????.dll %_DEST%\bin%_EXT%\jpg?????.dll
-..\%__SRC%\bin\jpg?????.sym %_DEST%\bin%_EXT%\jpg?????.sym
-..\%__SRC%\bin\go?????.dll %_DEST%\bin%_EXT%\go?????.dll
-..\%__SRC%\bin\go?????.sym %_DEST%\bin%_EXT%\go?????.sym
-..\%__SRC%\bin\gol?????.dll %_DEST%\bin%_EXT%\gol?????.dll
-..\%__SRC%\bin\gol?????.sym %_DEST%\bin%_EXT%\gol?????.sym
-
-..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
-..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-mkdir: %_DEST%\inc%_EXT%\goodies
-..\inc\grfmgr.hxx %_DEST%\inc%_EXT%\goodies\grfmgr.hxx
-..\inc\mailenum.hxx %_DEST%\inc%_EXT%\goodies\mailenum.hxx
-..\inc\b3dtrans.hxx %_DEST%\inc%_EXT%\goodies\b3dtrans.hxx
-..\inc\agsdkdll.hxx %_DEST%\inc%_EXT%\goodies\agsdkdll.hxx
diff --git a/goodies/source/base3d/makefile.mk b/goodies/source/base3d/makefile.mk
deleted file mode 100644
index 0203f7e1d3d4..000000000000
--- a/goodies/source/base3d/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.6.42.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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=goodies
-TARGET=base3d
-AUTOSEG=true
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-SLOFILES = $(SLO)$/b3dtrans.obj
-
-.INCLUDE :  target.mk
-
diff --git a/goodies/source/filter.vcl/egif/dlgegif.cxx b/goodies/source/filter.vcl/egif/dlgegif.cxx
deleted file mode 100644
index d0aa11d3238f..000000000000
--- a/goodies/source/filter.vcl/egif/dlgegif.cxx
+++ /dev/null
@@ -1,111 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgegif.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#ifndef GCC
-#endif
-#include <tools/ref.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include <vcl/msgbox.hxx>
-#include "dlgegif.hxx"
-#include "dlgegif.hrc"
-#include "strings.hrc"
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportEGIF::DlgExportEGIF( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_GIF, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aCbxInterlaced      ( this, ResId( CBX_INTERLACED, *rPara.pResMgr ) ),
-                aCbxTranslucent     ( this, ResId( CBX_TRANSLUCENT, *rPara.pResMgr ) ),
-                aGrpMode            ( this, ResId( GRP_MODE, *rPara.pResMgr ) ),
-                aGrpDraw            ( this, ResId( GRP_DRAW, *rPara.pResMgr ) ),
-                aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr )
-{
-    FreeResource();
-
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/GIF" ) );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-
-    String aInterlaceStr( ResId( KEY_INTER, *pMgr ) );
-    String aTranslucentStr( ResId( KEY_TRANS, *pMgr ) );
-    // Config-Parameter lesen
-    sal_Bool bInterlaced = pConfigItem->ReadInt32( aInterlaceStr, 1 ) != 0;
-    sal_Bool bTranslucent = pConfigItem->ReadInt32( aTranslucentStr, 1 ) != 0;
-
-    aCbxInterlaced.Check( bInterlaced );
-    aCbxTranslucent.Check( bTranslucent );
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportEGIF, OK ) );
-}
-
-DlgExportEGIF::~DlgExportEGIF()
-{
-    delete pConfigItem;
-}
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEGIF, OK, void *, EMPTYARG )
-{
-
-    // Config-Parameter schreiben
-    String aInterlaceStr( ResId( KEY_INTER, *pMgr ) );
-    String aTranslucentStr( ResId( KEY_TRANS, *pMgr ) );
-
-    sal_Int32 nValue = 0;
-    if ( aCbxInterlaced.IsChecked() )
-        nValue++;
-    pConfigItem->WriteInt32( aInterlaceStr, nValue );
-
-    nValue = 0;
-    if ( aCbxTranslucent.IsChecked() )
-        nValue++;
-    pConfigItem->WriteInt32( aTranslucentStr, nValue );
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
-
-
-
diff --git a/goodies/source/filter.vcl/egif/dlgegif.hrc b/goodies/source/filter.vcl/egif/dlgegif.hrc
deleted file mode 100644
index 72196101f288..000000000000
--- a/goodies/source/filter.vcl/egif/dlgegif.hrc
+++ /dev/null
@@ -1,39 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgegif.hrc,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.
- *
- ************************************************************************/
-#include "goodies.hrc"
-
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define FI_DESCR 1
-#define GRP_MODE 1
-#define GRP_DRAW 2
-#define CBX_INTERLACED 1
-#define CBX_TRANSLUCENT 2
diff --git a/goodies/source/filter.vcl/egif/dlgegif.hxx b/goodies/source/filter.vcl/egif/dlgegif.hxx
deleted file mode 100644
index d6c93ba862b4..000000000000
--- a/goodies/source/filter.vcl/egif/dlgegif.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgegif.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.
- *
- ************************************************************************/
-
-
-#ifndef _DLGEGIF_HXX_
-#define _DLGEGIF_HXX_
-
-#include <svtools/fltcall.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen
-|*
-\************************************************************************/
-
-class FilterConfigItem;
-class ResMgr;
-
-class DlgExportEGIF : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    CheckBox            aCbxInterlaced;
-    CheckBox            aCbxTranslucent;
-    FixedLine           aGrpMode;
-    FixedLine           aGrpDraw;
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
-
-    DECL_LINK( OK, void * );
-
-public:
-            DlgExportEGIF( FltCallDialogParameter& rPara );
-            ~DlgExportEGIF();
-};
-
-#endif // _DLGEGIF_HXX_
-
diff --git a/goodies/source/filter.vcl/egif/dlgegif.src b/goodies/source/filter.vcl/egif/dlgegif.src
deleted file mode 100644
index c9e1bdbf6a1a..000000000000
--- a/goodies/source/filter.vcl/egif/dlgegif.src
+++ /dev/null
@@ -1,121 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgegif.src,v $
- * $Revision: 1.30 $
- *
- * 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 "dlgegif.hrc"
-ModalDialog DLG_EXPORT_GIF
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 169 , 70 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Text [ en-US ] = "GIF Options" ;
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 113 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 113 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 113 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine GRP_MODE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
-        Text [ en-US ] = "Mode" ;
-    };
-    CheckBox CBX_INTERLACED
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 86 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Interlaced" ;
-    };
-    FixedLine GRP_DRAW
-    {
-        Pos = MAP_APPFONT ( 6 , 32 ) ;
-        Size = MAP_APPFONT ( 100 , 8 ) ;
-        Text [ en-US ] = "Drawing objects" ;
-    };
-    CheckBox CBX_TRANSLUCENT
-    {
-        Pos = MAP_APPFONT ( 12 , 43 ) ;
-        Size = MAP_APPFONT ( 86 , 12 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Save ~transparency" ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/goodies/source/filter.vcl/egif/egif.cxx b/goodies/source/filter.vcl/egif/egif.cxx
deleted file mode 100644
index 9f2aeaddd686..000000000000
--- a/goodies/source/filter.vcl/egif/egif.cxx
+++ /dev/null
@@ -1,632 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: egif.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/window.hxx>
-#include <svl/solar.hrc>
-#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include "giflzwc.hxx"
-#include "strings.hrc"
-#include "dlgegif.hrc"
-#include "dlgegif.hxx"
-
-// -------------
-// - GIFWriter -
-// -------------
-
-class GIFWriter
-{
-    Bitmap              aAccBmp;
-    BitmapReadAccess*   pAcc;
-    SvStream*           pGIF;
-    ULONG               nMinPercent;
-    ULONG               nMaxPercent;
-    ULONG               nLastPercent;
-    long                nActX;
-    long                nActY;
-    sal_Int32           nInterlaced;
-    BOOL                bStatus;
-    BOOL                bTransparent;
-
-    void                MayCallback( ULONG nPercent );
-    void                WriteSignature( BOOL bGIF89a );
-    void                WriteGlobalHeader( const Size& rSize );
-    void                WriteLoopExtension( const Animation& rAnimation );
-    void                WriteLogSizeExtension( const Size& rSize100 );
-    void                WriteImageExtension( long nTimer, Disposal eDisposal );
-    void                WriteLocalHeader();
-    void                WritePalette();
-    void                WriteAccess();
-    void                WriteTerminator();
-
-    BOOL                CreateAccess( const BitmapEx& rBmpEx );
-    void                DestroyAccess();
-
-    void                WriteAnimation( const Animation& rAnimation );
-    void                WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint, BOOL bExtended,
-                                       long nTimer = 0, Disposal eDisposal = DISPOSE_NOT );
-
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-public:
-
-                        GIFWriter() {}
-                        ~GIFWriter() {}
-
-    BOOL                WriteGIF( const Graphic& rGraphic, SvStream& rGIF,
-                                        FilterConfigItem* pConfigItem );
-};
-
-// ------------------------------------------------------------------------
-
-BOOL GIFWriter::WriteGIF( const Graphic& rGraphic, SvStream& rGIF,
-                                FilterConfigItem* pFilterConfigItem )
-{
-    if ( pFilterConfigItem )
-    {
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    Size            aSize100;
-    const MapMode   aMap( rGraphic.GetPrefMapMode() );
-    BOOL            bLogSize = ( aMap.GetMapUnit() != MAP_PIXEL );
-
-    if( bLogSize )
-        aSize100 = Application::GetDefaultDevice()->LogicToLogic( rGraphic.GetPrefSize(), aMap, MAP_100TH_MM );
-
-    pGIF = &rGIF;
-    bStatus = TRUE;
-    nLastPercent = 0;
-    nInterlaced = 0;
-    pAcc = NULL;
-
-    if ( pFilterConfigItem )
-        nInterlaced = pFilterConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Interlaced" ) ), 0 );
-
-    pGIF->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-
-    if( rGraphic.IsAnimated() )
-    {
-        const Animation& rAnimation = rGraphic.GetAnimation();
-
-        WriteSignature( TRUE );
-
-        if ( bStatus )
-        {
-            WriteGlobalHeader( rAnimation.GetDisplaySizePixel() );
-
-            if( bStatus )
-            {
-                WriteLoopExtension( rAnimation );
-
-                if( bStatus )
-                    WriteAnimation( rAnimation );
-            }
-        }
-    }
-    else
-    {
-        const BOOL bGrafTrans = rGraphic.IsTransparent();
-
-        BitmapEx aBmpEx;
-
-        if( bGrafTrans )
-            aBmpEx = rGraphic.GetBitmapEx();
-        else
-            aBmpEx = BitmapEx( rGraphic.GetBitmap() );
-
-        nMinPercent = 0;
-        nMaxPercent = 100;
-
-        WriteSignature( bGrafTrans || bLogSize );
-
-        if( bStatus )
-        {
-            WriteGlobalHeader( aBmpEx.GetSizePixel() );
-
-            if( bStatus )
-                WriteBitmapEx( aBmpEx, Point(), bGrafTrans );
-        }
-    }
-
-    if( bStatus )
-    {
-        if( bLogSize )
-            WriteLogSizeExtension( aSize100 );
-
-        WriteTerminator();
-    }
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return bStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteBitmapEx( const BitmapEx& rBmpEx, const Point& rPoint,
-                               BOOL bExtended, long nTimer, Disposal eDisposal )
-{
-    if( CreateAccess( rBmpEx ) )
-    {
-        nActX = rPoint.X();
-        nActY = rPoint.Y();
-
-        if( bExtended )
-            WriteImageExtension( nTimer, eDisposal );
-
-        if( bStatus )
-        {
-            WriteLocalHeader();
-
-            if( bStatus )
-            {
-                WritePalette();
-
-                if( bStatus )
-                    WriteAccess();
-            }
-        }
-
-        DestroyAccess();
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteAnimation( const Animation& rAnimation )
-{
-    const USHORT    nCount = rAnimation.Count();
-
-    if( nCount )
-    {
-        const double fStep = 100. / nCount;
-
-        nMinPercent = 0L;
-        nMaxPercent = (ULONG) fStep;
-
-        for( USHORT i = 0; i < nCount; i++ )
-        {
-            const AnimationBitmap& rAnimBmp = rAnimation.Get( i );
-
-            WriteBitmapEx( rAnimBmp.aBmpEx, rAnimBmp.aPosPix, TRUE,
-                           rAnimBmp.nWait, rAnimBmp.eDisposal );
-            nMinPercent = nMaxPercent;
-            nMaxPercent = (ULONG) ( nMaxPercent + fStep );
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::MayCallback( ULONG nPercent )
-{
-    if ( xStatusIndicator.is() )
-    {
-        if( nPercent >= nLastPercent + 3 )
-        {
-            nLastPercent = nPercent;
-            if ( nPercent <= 100 )
-                xStatusIndicator->setValue( nPercent );
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-
-BOOL GIFWriter::CreateAccess( const BitmapEx& rBmpEx )
-{
-    if( bStatus )
-    {
-        Bitmap aMask( rBmpEx.GetMask() );
-
-        aAccBmp = rBmpEx.GetBitmap();
-        bTransparent = FALSE;
-
-        if( !!aMask )
-        {
-            if( aAccBmp.Convert( BMP_CONVERSION_8BIT_TRANS ) )
-            {
-                aMask.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
-                aAccBmp.Replace( aMask, BMP_COL_TRANS );
-                bTransparent = TRUE;
-            }
-            else
-                aAccBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-        }
-        else
-            aAccBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-
-        pAcc = aAccBmp.AcquireReadAccess();
-
-        if( !pAcc )
-            bStatus = FALSE;
-    }
-
-    return bStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::DestroyAccess()
-{
-    aAccBmp.ReleaseAccess( pAcc );
-    pAcc = NULL;
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteSignature( BOOL bGIF89a )
-{
-    if( bStatus )
-    {
-        pGIF->Write( bGIF89a ? "GIF89a" : "GIF87a" , 6 );
-
-        if( pGIF->GetError() )
-            bStatus = FALSE;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteGlobalHeader( const Size& rSize )
-{
-    if( bStatus )
-    {
-        // 256 Farben
-        const UINT16    nWidth = (UINT16) rSize.Width();
-        const UINT16    nHeight = (UINT16) rSize.Height();
-        const BYTE      cFlags = 128 | ( 7 << 4 );
-
-        // Werte rausschreiben
-        *pGIF << nWidth;
-        *pGIF << nHeight;
-        *pGIF << cFlags;
-        *pGIF << (BYTE) 0x00;
-        *pGIF << (BYTE) 0x00;
-
-        // Dummy-Palette mit zwei Eintraegen (Schwarz/Weiss) schreiben;
-        // dieses nur wegen Photoshop-Bug, da die keine Bilder ohne
-        // globale Farbpalette lesen koennen
-        *pGIF << (UINT16) 0;
-        *pGIF << (UINT16) 255;
-        *pGIF << (UINT16) 65535;
-
-        if( pGIF->GetError() )
-            bStatus = FALSE;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteLoopExtension( const Animation& rAnimation )
-{
-    DBG_ASSERT( rAnimation.Count() > 0, "Animation has no bitmaps!" );
-
-    USHORT nLoopCount = (USHORT) rAnimation.GetLoopCount();
-
-    // falls nur ein Durchlauf stattfinden soll,
-    // wird keine LoopExtension geschrieben;
-    // Default ist dann immer ein Durchlauf
-    if( nLoopCount != 1 )
-    {
-        // Netscape interpretiert den LoopCount
-        // als reine Anzahl der _Wiederholungen_
-        if( nLoopCount )
-            nLoopCount--;
-
-        const BYTE cLoByte = (const BYTE) nLoopCount;
-        const BYTE cHiByte = (const BYTE) ( nLoopCount >> 8 );
-
-        *pGIF << (BYTE) 0x21;
-        *pGIF << (BYTE) 0xff;
-        *pGIF << (BYTE) 0x0b;
-        pGIF->Write( "NETSCAPE2.0", 11 );
-        *pGIF << (BYTE) 0x03;
-        *pGIF << (BYTE) 0x01;
-        *pGIF << cLoByte;
-        *pGIF << cHiByte;
-        *pGIF << (BYTE) 0x00;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteLogSizeExtension( const Size& rSize100 )
-{
-    // PrefSize in 100th-mm als ApplicationExtension schreiben
-    if( rSize100.Width() && rSize100.Height() )
-    {
-        *pGIF << (BYTE) 0x21;
-        *pGIF << (BYTE) 0xff;
-        *pGIF << (BYTE) 0x0b;
-        pGIF->Write( "STARDIV 5.0", 11 );
-        *pGIF << (BYTE) 0x09;
-        *pGIF << (BYTE) 0x01;
-        *pGIF << (UINT32) rSize100.Width();
-        *pGIF << (UINT32) rSize100.Height();
-        *pGIF << (BYTE) 0x00;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteImageExtension( long nTimer, Disposal eDisposal )
-{
-    if( bStatus )
-    {
-        const UINT16    nDelay = (UINT16) nTimer;
-        BYTE            cFlags = 0;
-
-        // Transparent-Flag setzen
-        if( bTransparent )
-            cFlags |= 1;
-
-        // Disposal-Wert setzen
-        if( eDisposal == DISPOSE_BACK )
-            cFlags |= ( 2 << 2 );
-        else if( eDisposal == DISPOSE_PREVIOUS )
-            cFlags |= ( 3 << 2 );
-
-        *pGIF << (BYTE) 0x21;
-        *pGIF << (BYTE) 0xf9;
-        *pGIF << (BYTE) 0x04;
-        *pGIF << cFlags;
-        *pGIF << nDelay;
-        *pGIF << (BYTE) pAcc->GetBestPaletteIndex( BMP_COL_TRANS );
-        *pGIF << (BYTE) 0x00;
-
-        if( pGIF->GetError() )
-            bStatus = FALSE;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteLocalHeader()
-{
-    if( bStatus )
-    {
-        const UINT16    nPosX = (UINT16) nActX;
-        const UINT16    nPosY = (UINT16) nActY;
-        const UINT16    nWidth = (UINT16) pAcc->Width();
-        const UINT16    nHeight = (UINT16) pAcc->Height();
-        BYTE            cFlags = (BYTE) ( pAcc->GetBitCount() - 1 );
-
-        // Interlaced-Flag setzen
-        if( nInterlaced )
-            cFlags |= 0x40;
-
-        // Flag fuer lokale Farbpalette setzen
-        cFlags |= 0x80;
-
-        // alles rausschreiben
-        *pGIF << (BYTE) 0x2c;
-        *pGIF << nPosX;
-        *pGIF << nPosY;
-        *pGIF << nWidth;
-        *pGIF << nHeight;
-        *pGIF << cFlags;
-
-        if( pGIF->GetError() )
-            bStatus = FALSE;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WritePalette()
-{
-    if( bStatus && pAcc->HasPalette() )
-    {
-        const USHORT nCount = pAcc->GetPaletteEntryCount();
-        const USHORT nMaxCount = ( 1 << pAcc->GetBitCount() );
-
-        for ( USHORT i = 0; i < nCount; i++ )
-        {
-            const BitmapColor& rColor = pAcc->GetPaletteColor( i );
-
-            *pGIF << rColor.GetRed();
-            *pGIF << rColor.GetGreen();
-            *pGIF << rColor.GetBlue();
-        }
-
-        // Rest mit 0 auffuellen
-        if( nCount < nMaxCount )
-            pGIF->SeekRel( ( nMaxCount - nCount ) * 3 );
-
-        if( pGIF->GetError() )
-            bStatus = FALSE;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteAccess()
-{
-    GIFLZWCompressor    aCompressor;
-    const long          nWidth = pAcc->Width();
-    const long          nHeight = pAcc->Height();
-    BYTE*               pBuffer = NULL;
-    const ULONG         nFormat = pAcc->GetScanlineFormat();
-    long                nY;
-    long                nT;
-    long                i;
-    BOOL                bNative = ( BMP_FORMAT_8BIT_PAL == nFormat );
-
-    if( !bNative )
-        pBuffer = new BYTE[ nWidth ];
-
-    if( bStatus && ( 8 == pAcc->GetBitCount() ) && pAcc->HasPalette() )
-    {
-        aCompressor.StartCompression( *pGIF, pAcc->GetBitCount() );
-
-        for( i = 0; i < nHeight; i++ )
-        {
-            if( nInterlaced )
-            {
-                nY = i << 3;
-
-                if( nY >= nHeight )
-                {
-                    nT = i - ( ( nHeight + 7 ) >> 3 );
-                    nY= ( nT << 3 ) + 4;
-
-                    if( nY >= nHeight )
-                    {
-                        nT -= ( nHeight + 3 ) >> 3;
-                        nY = ( nT << 2 ) + 2;
-
-                        if ( nY >= nHeight )
-                        {
-                            nT -= ( ( nHeight + 1 ) >> 2 );
-                            nY = ( nT << 1 ) + 1;
-                        }
-                    }
-                }
-            }
-            else
-                nY = i;
-
-            if( bNative )
-                aCompressor.Compress( pAcc->GetScanline( nY ), nWidth );
-            else
-            {
-                for( long nX = 0L; nX < nWidth; nX++ )
-                    pBuffer[ nX ] = (BYTE) pAcc->GetPixel( nY, nX );
-
-                aCompressor.Compress( pBuffer, nWidth );
-            }
-
-            if ( pGIF->GetError() )
-                bStatus = FALSE;
-
-            MayCallback( nMinPercent + ( nMaxPercent - nMinPercent ) * i / nHeight );
-
-            if( !bStatus )
-                break;
-        }
-
-        aCompressor.EndCompression();
-
-        if ( pGIF->GetError() )
-            bStatus = FALSE;
-    }
-
-    delete[] pBuffer;
-}
-
-// ------------------------------------------------------------------------
-
-void GIFWriter::WriteTerminator()
-{
-    if( bStatus )
-    {
-        *pGIF << (BYTE) 0x3b;
-
-        if( pGIF->GetError() )
-            bStatus = FALSE;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic,
-                                               FilterConfigItem* pConfigItem, BOOL )
-{
-    return GIFWriter().WriteGIF( rGraphic, rStream, pConfigItem );
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" BOOL __LOADONCALLAPI DoExportDialog( FltCallDialogParameter& rPara )
-{
-    BOOL bRet = FALSE;
-
-    if ( rPara.pWindow )
-    {
-        ByteString  aResMgrName( "egi" );
-        ResMgr*     pResMgr;
-
-        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
-        if( pResMgr )
-        {
-            rPara.pResMgr = pResMgr;
-            bRet = ( DlgExportEGIF( rPara ).Execute() == RET_OK );
-            delete pResMgr;
-        }
-        else
-            bRet = TRUE;
-    }
-
-    return bRet;
-}
-
-// ------------------------------------------------------------------------
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/egif/egifstr.src b/goodies/source/filter.vcl/egif/egifstr.src
deleted file mode 100644
index b9d63708e5d9..000000000000
--- a/goodies/source/filter.vcl/egif/egifstr.src
+++ /dev/null
@@ -1,42 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: egifstr.src,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.
- *
- ************************************************************************/
-
-
-#include "strings.hrc"
-
-// Key fuer den Dialog
-String KEY_INTER
-{
-    Text = "Interlaced";
-};
-String KEY_TRANS
-{
-    Text = "Translucent";
-};
diff --git a/goodies/source/filter.vcl/egif/exports.map b/goodies/source/filter.vcl/egif/exports.map
deleted file mode 100644
index 10820132c0ce..000000000000
--- a/goodies/source/filter.vcl/egif/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-GIFEXPORTER_1_0 {
-        global:
-                GraphicExport;
-                DoExportDialog;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/egif/giflzwc.cxx b/goodies/source/filter.vcl/egif/giflzwc.cxx
deleted file mode 100644
index a542cff8b7fa..000000000000
--- a/goodies/source/filter.vcl/egif/giflzwc.cxx
+++ /dev/null
@@ -1,259 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: giflzwc.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <tools/stream.hxx>
-#include "giflzwc.hxx"
-
-// ----------------------------
-// - GIFImageDataOutputStream -
-// ----------------------------
-
-class GIFImageDataOutputStream
-{
-private:
-
-    void        FlushBlockBuf();
-    inline void FlushBitsBufsFullBytes();
-
-    SvStream&   rStream;
-    BYTE*       pBlockBuf;
-    BYTE        nBlockBufSize;
-    ULONG       nBitsBuf;
-    USHORT      nBitsBufSize;
-
-public:
-
-                GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize );
-                ~GIFImageDataOutputStream();
-
-    inline void WriteBits( USHORT nCode, USHORT nCodeLen );
-};
-
-// ------------------------------------------------------------------------
-
-inline void GIFImageDataOutputStream::FlushBitsBufsFullBytes()
-{
-    while (nBitsBufSize>=8)
-    {
-        if( nBlockBufSize==255 )
-            FlushBlockBuf();
-
-        pBlockBuf[nBlockBufSize++] = (BYTE) nBitsBuf;
-        nBitsBuf >>= 8;
-        nBitsBufSize -= 8;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-inline void GIFImageDataOutputStream::WriteBits( USHORT nCode, USHORT nCodeLen )
-{
-    if( nBitsBufSize+nCodeLen>32 )
-        FlushBitsBufsFullBytes();
-
-    nBitsBuf |= (ULONG) nCode << nBitsBufSize;
-    nBitsBufSize = nBitsBufSize + nCodeLen;
-}
-
-// ------------------------------------------------------------------------
-
-GIFImageDataOutputStream::GIFImageDataOutputStream( SvStream & rGIF, BYTE nLZWDataSize ) :
-        rStream(rGIF)
-{
-    pBlockBuf = new BYTE[ 255 ];
-    nBlockBufSize = 0;
-    nBitsBufSize = 0;
-    nBitsBuf = 0;
-    rStream << nLZWDataSize;
-}
-
-// ------------------------------------------------------------------------
-
-
-GIFImageDataOutputStream::~GIFImageDataOutputStream()
-{
-    WriteBits(0,7);
-    FlushBitsBufsFullBytes();
-    FlushBlockBuf();
-    rStream << (BYTE)0;
-    delete[] pBlockBuf;
-}
-
-// ------------------------------------------------------------------------
-
-void GIFImageDataOutputStream::FlushBlockBuf()
-{
-    if( nBlockBufSize )
-    {
-        rStream << (BYTE) nBlockBufSize;
-        rStream.Write( pBlockBuf,nBlockBufSize );
-        nBlockBufSize = 0;
-    }
-}
-
-// -------------------
-// - GIFLZWCTreeNode -
-// -------------------
-
-struct GIFLZWCTreeNode
-{
-
-    GIFLZWCTreeNode*    pBrother;       // naechster Knoten, der den selben Vater hat
-    GIFLZWCTreeNode*    pFirstChild;    // erster Sohn
-    USHORT              nCode;          // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
-    USHORT              nValue;         // Der Pixelwert
-};
-
-// --------------------
-// - GIFLZWCompressor -
-// --------------------
-
-GIFLZWCompressor::GIFLZWCompressor()
-{
-    pIDOS=NULL;
-}
-
-// ------------------------------------------------------------------------
-
-GIFLZWCompressor::~GIFLZWCompressor()
-{
-    if (pIDOS!=NULL) EndCompression();
-}
-
-// ------------------------------------------------------------------------
-
-void GIFLZWCompressor::StartCompression( SvStream& rGIF, USHORT nPixelSize )
-{
-    if( !pIDOS )
-    {
-        USHORT i;
-
-        nDataSize = nPixelSize;
-
-        if( nDataSize < 2 )
-            nDataSize=2;
-
-        nClearCode=1<<nDataSize;
-        nEOICode=nClearCode+1;
-        nTableSize=nEOICode+1;
-        nCodeSize=nDataSize+1;
-
-        pIDOS=new GIFImageDataOutputStream(rGIF,(BYTE)nDataSize);
-        pTable=new GIFLZWCTreeNode[4096];
-
-        for (i=0; i<4096; i++)
-        {
-            pTable[i].pBrother = pTable[i].pFirstChild = NULL;
-            pTable[i].nValue = (BYTE) ( pTable[i].nCode = i );
-        }
-
-        pPrefix = NULL;
-        pIDOS->WriteBits( nClearCode,nCodeSize );
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFLZWCompressor::Compress( HPBYTE pSrc, ULONG nSize )
-{
-    if( pIDOS )
-    {
-        GIFLZWCTreeNode*    p;
-        USHORT              i;
-        BYTE                nV;
-
-        if( !pPrefix && nSize )
-        {
-            pPrefix=pTable+(*pSrc++);
-            nSize--;
-        }
-
-        while( nSize )
-        {
-            nSize--;
-            nV=*pSrc++;
-            for( p=pPrefix->pFirstChild; p!=NULL; p=p->pBrother )
-            {
-                if (p->nValue==nV)
-                    break;
-            }
-
-            if( p)
-                pPrefix=p;
-            else
-            {
-                pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-
-                if (nTableSize==4096)
-                {
-                    pIDOS->WriteBits(nClearCode,nCodeSize);
-
-                    for (i=0; i<nClearCode; i++)
-                        pTable[i].pFirstChild=NULL;
-
-                    nCodeSize=nDataSize+1;
-                    nTableSize=nEOICode+1;
-                }
-                else
-                {
-                    if(nTableSize==(USHORT)(1<<nCodeSize))
-                        nCodeSize++;
-
-                    p=pTable+(nTableSize++);
-                    p->pBrother=pPrefix->pFirstChild;
-                    pPrefix->pFirstChild=p;
-                    p->nValue=nV;
-                    p->pFirstChild=NULL;
-                }
-
-                pPrefix=pTable+nV;
-            }
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void GIFLZWCompressor::EndCompression()
-{
-    if( pIDOS )
-    {
-        if( pPrefix )
-            pIDOS->WriteBits(pPrefix->nCode,nCodeSize);
-
-        pIDOS->WriteBits( nEOICode,nCodeSize );
-        delete[] pTable;
-        delete pIDOS;
-        pIDOS=NULL;
-    }
-}
diff --git a/goodies/source/filter.vcl/egif/giflzwc.hxx b/goodies/source/filter.vcl/egif/giflzwc.hxx
deleted file mode 100644
index 51d7842a59db..000000000000
--- a/goodies/source/filter.vcl/egif/giflzwc.hxx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: giflzwc.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _GIFLZWC_HXX
-#define _GIFLZWC_HXX
-
-#ifndef _BMPACC_HXX
-#include <vcl/bmpacc.hxx>
-#endif
-
-// --------------------
-// - GIFLZWCompressor -
-// --------------------
-
-class   GIFImageDataOutputStream;
-struct  GIFLZWCTreeNode;
-
-class GIFLZWCompressor
-{
-private:
-
-    GIFImageDataOutputStream*   pIDOS;
-    GIFLZWCTreeNode*            pTable;
-    GIFLZWCTreeNode*            pPrefix;
-    USHORT                      nDataSize;
-    USHORT                      nClearCode;
-    USHORT                      nEOICode;
-    USHORT                      nTableSize;
-    USHORT                      nCodeSize;
-
-public:
-
-                                GIFLZWCompressor();
-                                ~GIFLZWCompressor();
-
-    void                        StartCompression( SvStream& rGIF, USHORT nPixelSize );
-    void                        Compress( HPBYTE pSrc, ULONG nSize );
-    void                        EndCompression();
-};
-
-#endif // _GIFLZWC_HXX
diff --git a/goodies/source/filter.vcl/egif/makefile.mk b/goodies/source/filter.vcl/egif/makefile.mk
deleted file mode 100644
index 418af69c7bf8..000000000000
--- a/goodies/source/filter.vcl/egif/makefile.mk
+++ /dev/null
@@ -1,82 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=egif
-TARGET2=egi
-DEPTARGET=vegif
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	dlgegif.src		\
-        egifstr.src
-.IF "$(L10N_framework)"==""
-SLOFILES= 	$(SLO)$/egif.obj		\
-        $(SLO)$/dlgegif.obj	\
-        $(SLO)$/giflzwc.obj
-.ENDIF
-
-# ==========================================================================
-
-RESLIB1NAME=$(TARGET2)
-RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
-
-.IF "$(L10N_framework)"==""
-SHL1TARGET=     egi$(DLLPOSTFIX)
-SHL1IMPLIB=     egif
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS=       $(SLB)$/egif.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/egif.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/goodies/source/filter.vcl/egif/strings.hrc b/goodies/source/filter.vcl/egif/strings.hrc
deleted file mode 100644
index 8d1231753f49..000000000000
--- a/goodies/source/filter.vcl/egif/strings.hrc
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: strings.hrc,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.
- *
- ************************************************************************/
-#define KEY_INTER   256
-#define KEY_TRANS   257
diff --git a/goodies/source/filter.vcl/eos2met/dlgeos2.cxx b/goodies/source/filter.vcl/eos2met/dlgeos2.cxx
deleted file mode 100644
index c42c04aa86ed..000000000000
--- a/goodies/source/filter.vcl/eos2met/dlgeos2.cxx
+++ /dev/null
@@ -1,182 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeos2.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#ifndef GCC
-#endif
-#include <com/sun/star/awt/Size.hpp>
-#include <vcl/msgbox.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include "dlgeos2.hxx"
-#include "dlgeos2.hrc"
-#include "strings.hrc"
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportEMET::DlgExportEMET( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_EMET, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                aRbOriginal         ( this, ResId( RB_ORIGINAL, *rPara.pResMgr ) ),
-                aRbSize             ( this, ResId( RB_SIZE, *rPara.pResMgr ) ),
-                aGrpMode            ( this, ResId( GRP_MODE, *rPara.pResMgr ) ),
-                aFtSizeX            ( this, ResId( FT_SIZEX, *rPara.pResMgr ) ),
-                aMtfSizeX           ( this, ResId( MTF_SIZEX, *rPara.pResMgr ) ),
-                aFtSizeY            ( this, ResId( FT_SIZEY, *rPara.pResMgr ) ),
-                aMtfSizeY           ( this, ResId( MTF_SIZEY, *rPara.pResMgr ) ),
-                aGrpSize            ( this, ResId( GRP_SIZE, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr )
-{
-    FreeResource();
-
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/MET" ) );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportEMET, OK ) );
-    aRbOriginal.SetClickHdl( LINK( this, DlgExportEMET, ClickRbOriginal ) );
-    aRbSize.SetClickHdl( LINK( this, DlgExportEMET, ClickRbSize ) );
-
-    // Config-Parameter lesen
-    sal_Int32 nMode = pConfigItem->ReadInt32( String( ResId( KEY_MODE, *pMgr ) ), 0 );
-    ::com::sun::star::awt::Size aDefault( 10000, 10000 );
-    ::com::sun::star::awt::Size aSize;
-    aSize = pConfigItem->ReadSize( String( ResId( KEY_SIZE, *pMgr ) ), aDefault );
-
-    aMtfSizeX.SetDefaultUnit( FUNIT_MM );
-    aMtfSizeY.SetDefaultUnit( FUNIT_MM );
-
-    aMtfSizeX.SetValue( aSize.Width );
-    aMtfSizeY.SetValue( aSize.Height );
-
-    switch ( rPara.eFieldUnit )
-    {
-//      case FUNIT_NONE :
-//      case FUNIT_KM :
-//      case FUNIT_PERCENT :
-//      case FUNIT_CUSTOM :
-//      case FUNIT_MILE :
-//      case FUNIT_FOOT :
-//      case FUNIT_M :
-        case FUNIT_MM :
-        case FUNIT_CM :
-        case FUNIT_TWIP :
-        case FUNIT_POINT :
-        case FUNIT_PICA :
-        case FUNIT_INCH :
-        case FUNIT_100TH_MM :
-        {
-            aMtfSizeX.SetUnit( rPara.eFieldUnit );
-            aMtfSizeY.SetUnit( rPara.eFieldUnit );
-        }
-        break;
-        default:
-            break;  // multiple other value not handled -Wall
-    }
-    if ( nMode == 1 )
-    {
-        aRbSize.Check( TRUE );
-        ClickRbSize( NULL );
-    }
-    else
-    {
-        aRbOriginal.Check( TRUE );
-        ClickRbOriginal( NULL );
-    }
-}
-
-DlgExportEMET::~DlgExportEMET()
-{
-    delete pConfigItem;
-}
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEMET, OK, void *, EMPTYARG )
-{
-    // Config-Parameter schreiben
-    ::com::sun::star::awt::Size aSize(
-        (sal_Int32)MetricField::ConvertDoubleValue( aMtfSizeX.GetValue(), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM ),
-            (sal_Int32)MetricField::ConvertDoubleValue( aMtfSizeY.GetValue(), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM ) );
-    sal_Int32 nStrMode = ( aRbSize.IsChecked() ) ? 1 : 0;
-
-    pConfigItem->WriteInt32( String( ResId( KEY_MODE, *pMgr ) ), nStrMode );
-    pConfigItem->WriteSize( String( ResId( KEY_SIZE, *pMgr ) ), aSize );
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEMET, ClickRbOriginal, void*, EMPTYARG )
-{
-    aGrpSize.Disable();
-    aFtSizeX.Disable();
-    aMtfSizeX.Disable();
-    aFtSizeY.Disable();
-    aMtfSizeY.Disable();
-
-    return 0;
-}
-
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEMET, ClickRbSize, void*, EMPTYARG )
-{
-    aGrpSize.Enable();
-    aFtSizeX.Enable();
-    aMtfSizeX.Enable();
-    aFtSizeY.Enable();
-    aMtfSizeY.Enable();
-
-    return 0;
-}
-
diff --git a/goodies/source/filter.vcl/eos2met/dlgeos2.hrc b/goodies/source/filter.vcl/eos2met/dlgeos2.hrc
deleted file mode 100644
index 11c159632cc2..000000000000
--- a/goodies/source/filter.vcl/eos2met/dlgeos2.hrc
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeos2.hrc,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.
- *
- ************************************************************************/
-#include "goodies.hrc"
-
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define CBX_SIZE 2
-#define MTF_SIZEX 1
-#define MTF_SIZEY 2
-#define FT_SIZEX 1
-#define FT_SIZEY 2
-#define GRP_SIZE 1
-#define GRP_MODE 2
-#define RB_ORIGINAL 1
-#define RB_SIZE 2
-
diff --git a/goodies/source/filter.vcl/eos2met/dlgeos2.hxx b/goodies/source/filter.vcl/eos2met/dlgeos2.hxx
deleted file mode 100644
index c0820e6ba2bf..000000000000
--- a/goodies/source/filter.vcl/eos2met/dlgeos2.hxx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeos2.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.
- *
- ************************************************************************/
-
-
-#ifndef _DLGEOS2_HXX_
-#define _DLGEOS2_HXX_
-#include <svtools/fltcall.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen bei Vektorformaten
-|*
-\************************************************************************/
-
-class FilterConfigItem;
-class ResMgr;
-
-class DlgExportEMET : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-    RadioButton         aRbOriginal;
-    RadioButton         aRbSize;
-    FixedLine           aGrpMode;
-
-    FixedText           aFtSizeX;
-    MetricField         aMtfSizeX;
-    FixedText           aFtSizeY;
-    MetricField         aMtfSizeY;
-    FixedLine           aGrpSize;
-
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
-
-    DECL_LINK( OK, void* p );
-    DECL_LINK( ClickRbOriginal,void* p );
-    DECL_LINK( ClickRbSize,void* p );
-
-public:
-            DlgExportEMET( FltCallDialogParameter& rPara );
-            ~DlgExportEMET();
-};
-
-
-#endif // _DLGEMET_HXX_
-
diff --git a/goodies/source/filter.vcl/eos2met/dlgeos2.src b/goodies/source/filter.vcl/eos2met/dlgeos2.src
deleted file mode 100644
index 9a311d565c3b..000000000000
--- a/goodies/source/filter.vcl/eos2met/dlgeos2.src
+++ /dev/null
@@ -1,165 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeos2.src,v $
- * $Revision: 1.20 $
- *
- * 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 "dlgeos2.hrc"
-
-ModalDialog DLG_EXPORT_EMET
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 178 , 89 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Text [ en-US ] = "MET Options" ;
-    MetricField MTF_SIZEX
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 55 ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 100 ;
-        Maximum = 99999 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_MM ;
-        First = 100 ;
-        Last = 99999 ;
-        SpinSize = 100 ;
-    };
-    MetricField MTF_SIZEY
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 71 ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 100 ;
-        Maximum = 99999 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_MM ;
-        First = 100 ;
-        Last = 99999 ;
-        SpinSize = 100 ;
-    };
-    FixedLine GRP_SIZE
-    {
-        Pos = MAP_APPFONT ( 6 , 44 ) ;
-        Size = MAP_APPFONT ( 110 , 8 ) ;
-        Text [ en-US ] = "Size" ;
-    };
-    FixedText FT_SIZEX
-    {
-        Pos = MAP_APPFONT ( 12 , 56 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Text [ en-US ] = "Width" ;
-    };
-    FixedText FT_SIZEY
-    {
-        Pos = MAP_APPFONT ( 12 , 72 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        Text [ en-US ] = "Height" ;
-    };
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 122 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 122 , 24 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 122 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    RadioButton RB_ORIGINAL
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 98 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Original" ;
-    };
-    RadioButton RB_SIZE
-    {
-        Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 98 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Size" ;
-    };
-    FixedLine GRP_MODE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 110 , 8 ) ;
-        Text [ en-US ] = "Mode" ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/goodies/source/filter.vcl/eos2met/eos2met.cxx b/goodies/source/filter.vcl/eos2met/eos2met.cxx
deleted file mode 100644
index b818e9cd26ba..000000000000
--- a/goodies/source/filter.vcl/eos2met/eos2met.cxx
+++ /dev/null
@@ -1,2651 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: eos2met.cxx,v $
- * $Revision: 1.21 $
- *
- * 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_goodies.hxx"
-
-#include <svtools/fltcall.hxx>
-
-#include <math.h>
-#include <tools/stream.hxx>
-#include <tools/bigint.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/salbtype.hxx>
-#include <tools/poly.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/hatch.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/font.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
-#include <svl/solar.hrc>
-#include "strings.hrc"
-#include "dlgeos2.hxx"
-
-// -----------------------------Feld-Typen-------------------------------
-
-#define BegDocumnMagic 0xA8A8 /* Begin Document */
-#define EndDocumnMagic 0xA8A9 /* End Document   */
-
-#define BegResGrpMagic 0xC6A8 /* Begin Resource Group */
-#define EndResGrpMagic 0xC6A9 /* End Resource Group   */
-
-#define BegColAtrMagic 0x77A8 /* Begin Color Attribute Table */
-#define EndColAtrMagic 0x77A9 /* End Color Attribute Table   */
-#define BlkColAtrMagic 0x77B0 /* Color Attribute Table       */
-#define MapColAtrMagic 0x77AB /* Map Color Attribute Table   */
-
-#define BegImgObjMagic 0xFBA8 /* Begin Image Object    */
-#define EndImgObjMagic 0xFBA9 /* End Image Object      */
-#define DscImgObjMagic 0xFBA6 /* Image Data Descriptor */
-#define DatImgObjMagic 0xFBEE /* Image Picture Data    */
-
-#define BegObjEnvMagic 0xC7A8 /* Begin Object Environment Group */
-#define EndObjEnvMagic 0xC7A9 /* End Object Environment Group   */
-
-#define BegGrfObjMagic 0xBBA8 /* Begin Graphics Object   */
-#define EndGrfObjMagic 0xBBA9 /* End Graphics Object     */
-#define DscGrfObjMagic 0xBBA6 /* Graphics Data Descritor */
-#define DatGrfObjMagic 0xBBEE /* Graphics Data           */
-
-#define MapCodFntMagic 0x8AAB /* Map Coded Font    */
-#define MapDatResMagic 0xC3AB /* Map Data Resource */
-
-// Struktur des Metafiles
-// BegDocumn
-//   BegResGrp
-//     BegColAtr
-//       BlkColAtr
-//     EndColAtr
-//     BegImgObj[0..n]
-//       BegResGrp[]
-//         BegColAtr[]
-//           BlkColAtr
-//         EndColAtr
-//       EndResGrp
-//       BegObjEnv[]
-//         MapColAtr
-//       EndObjEnv
-//       DscImgObj
-//       DatImgOb1
-//       DatImgOb2[1..n]
-//     EndImgObj
-//     BegGrfObj
-//       BegObjEnv[]
-//         MapColAtr
-//         MapCodFnt1
-//         MapCodFnt2[0..n]
-//         MapDatRes[0..n]
-//       EndObjEnv
-//       DscGrfObj
-//       DatGrfObj[0..n]
-//     EndGrfObj
-//   EndResGrp
-// EndDocumn
-
-//============================== METWriter ===================================
-
-struct METChrSet
-{
-    struct METChrSet * pSucc;
-    BYTE nSet;
-    String aName;
-    FontWeight eWeight;
-};
-
-struct METGDIStackMember
-{
-    struct METGDIStackMember *  pSucc;
-    Color                       aLineColor;
-    Color                       aFillColor;
-    RasterOp                    eRasterOp;
-    Font                        aFont;
-    MapMode                     aMapMode;
-    Rectangle                   aClipRect;
-};
-
-class METWriter
-{
-private:
-
-    BOOL                bStatus;
-    ULONG               nLastPercent; // Mit welcher Zahl pCallback zuletzt aufgerufen wurde.
-    SvStream*           pMET;
-    Rectangle           aPictureRect;
-    MapMode             aPictureMapMode;
-    MapMode             aTargetMapMode;
-    ULONG               nActualFieldStartPos;     // Anfangs-Position des aktuellen 'Field'
-    ULONG               nNumberOfDataFields;  // Anzahl der angefangenen 'Graphcis Data Fields'
-    Color               aGDILineColor;
-    Color               aGDIFillColor;
-    RasterOp            eGDIRasterOp;
-    Font                aGDIFont;
-    MapMode             aGDIMapMode;   // derzeit unbenutzt!
-    Rectangle           aGDIClipRect; // derzeit unbenutzt!
-    METGDIStackMember*  pGDIStack;
-    Color               aMETColor;
-    Color               aMETBackgroundColor;
-    Color               aMETPatternSymbol;
-    RasterOp            eMETMix ;
-    long                nMETStrokeLineWidth;
-    Size                aMETChrCellSize;
-    short               nMETChrAngle;
-    BYTE                nMETChrSet;
-    METChrSet*          pChrSetList; // Liste der Character-Sets
-    BYTE                nNextChrSetId; // die erste unbenutzte ChrSet-Id
-    ULONG               nActBitmapId; // Field-Id der naechsten Bitmap
-    ULONG               nNumberOfActions; // Anzahl der Actions im GDIMetafile
-    ULONG               nNumberOfBitmaps; // Anzahl der Bitmaps
-    ULONG               nWrittenActions;  // Anzahl der bereits verarbeiteten Actions beim Schreiben der Orders
-    ULONG               nWrittenBitmaps;  // Anzahl der bereits geschriebenen Bitmaps
-    ULONG               nActBitmapPercent; // Wieviel Prozent die naechste Bitmap schon geschrieben ist.
-
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-    void MayCallback();
-        // Berechnet anhand der obigen 5 Parameter eine Prozentzahl
-        // und macht dann ggf. einen Callback. Setzt bStatus auf FALSE wenn User abbrechen
-        // moechte.
-
-    void CountActionsAndBitmaps(const GDIMetaFile * pMTF);
-        // Zaehlt die Bitmaps und Actions (nNumberOfActions und nNumberOfBitmaps muessen
-        // zu Anfang auf 0 gesetzt werden, weil diese Methode rekursiv ist)
-
-    void WriteBigEndianShort(USHORT nWord);
-    void WriteBigEndianLong(ULONG nLong);
-
-    void WritePoint(Point aPt);
-    void WriteClipRect( const Rectangle& rRect );
-    void WriteFieldIntroducer(USHORT nFieldSize, USHORT nFieldType,
-                              BYTE nFlags, USHORT nSegSeqNum);
-    void UpdateFieldSize();
-
-    void WriteFieldId(ULONG nId);
-
-    void CreateChrSets(const GDIMetaFile * pMTF);
-    void CreateChrSet(const Font & rFont);
-    void WriteChrSets();
-    BYTE FindChrSet(const Font & rFont);
-
-    void WriteColorAttributeTable(ULONG nFieldId=4, BitmapPalette* pPalette=NULL,
-                                  BYTE nBasePartFlags=0x40, BYTE nBasePartLCTID=0);
-
-    void WriteImageObject(const Bitmap & rBitmap);
-    void WriteImageObjects(const GDIMetaFile * pMTF);
-
-    void WriteDataDescriptor(const GDIMetaFile * pMTF);
-
-    void WillWriteOrder(ULONG nNextOrderMaximumLength);
-
-    void METSetAndPushLineInfo( const LineInfo& rLineInfo );
-    void METPopLineInfo( const LineInfo& rLineInfo );
-    void METBitBlt(Point aPt, Size aSize, const Bitmap & rBitmap);
-    void METBeginArea(BOOL bBoundaryLine);
-    void METEndArea();
-    void METBeginPath(sal_uInt32 nPathId);
-    void METEndPath();
-    void METFillPath(sal_uInt32 nPathId);
-    void METOutlinePath(sal_uInt32 nPathId);
-    void METCloseFigure();
-    void METMove(Point aPt);
-    void METLine(Point aPt1, Point aPt2);
-    void METLine(const Polygon & rPolygon);
-    void METLine(const PolyPolygon & rPolyPolygon);
-    void METLineAtCurPos(Point aPt);
-    void METBox(BOOL bFill, BOOL bBoundary,
-                Rectangle aRect, sal_uInt32 nHAxis, sal_uInt32 nVAxis);
-    void METFullArc(Point aCenter, double fMultiplier);
-    void METPartialArcAtCurPos(Point aCenter, double fMultiplier,
-                               double fStartAngle, double fSweepAngle);
-    void METChrStr(Point aPt, String aStr);
-    void METSetArcParams(long nP, long nQ, long nR, long nS);
-    void METSetColor(Color aColor);
-    void METSetBackgroundColor(Color aColor);
-    void METSetMix(RasterOp eROP);
-    void METSetChrCellSize(Size aSize);
-    void METSetChrAngle(short nAngle);
-    void METSetChrSet(BYTE nSet);
-
-    void WriteOrders(const GDIMetaFile * pMTF);
-
-    void WriteObjectEnvironmentGroup(const GDIMetaFile * pMTF);
-
-    void WriteGraphicsObject(const GDIMetaFile * pMTF);
-
-    void WriteResourceGroup(const GDIMetaFile * pMTF);
-
-    void WriteDocument(const GDIMetaFile * pMTF);
-
-public:
-
-    METWriter() {}
-
-    BOOL WriteMET( const GDIMetaFile & rMTF, SvStream & rTargetStream,
-                        FilterConfigItem* pConfigItem );
-};
-
-
-//========================== Methoden von METWriter ==========================
-
-void METWriter::MayCallback()
-{
-    if ( xStatusIndicator.is() )
-    {
-        ULONG nPercent;
-        nPercent=((nWrittenBitmaps<<14)+(nActBitmapPercent<<14)/100+nWrittenActions)
-                *100/((nNumberOfBitmaps<<14)+nNumberOfActions);
-
-        if (nPercent>=nLastPercent+3)
-        {
-            nLastPercent = nPercent;
-            if ( nPercent <= 100 )
-                xStatusIndicator->setValue( nPercent );
-        }
-    }
-}
-
-void METWriter::WriteClipRect( const Rectangle& rRect )
-{
-    aGDIClipRect = rRect;
-    sal_uInt32 nPathId = ( rRect.IsEmpty() ) ? 0 : 1;
-    if ( nPathId )
-    {
-        Polygon aPoly( rRect );
-        METBeginPath( nPathId );
-        METLine( aPoly );
-        METEndPath();
-    }
-    WillWriteOrder(8);
-    *pMET << (BYTE)0xb4 << (BYTE)6
-          << (BYTE)0x00 << (BYTE)0 << nPathId;
-}
-
-void METWriter::CountActionsAndBitmaps(const GDIMetaFile * pMTF)
-{
-    const MetaAction* pMA;
-
-    for( ULONG nAction = 0, nActionCount=pMTF->GetActionCount(); nAction < nActionCount; nAction++ )
-    {
-        pMA =  pMTF->GetAction(nAction);
-
-        switch (pMA->GetType())
-        {
-            case META_EPS_ACTION :
-            {
-                const GDIMetaFile aGDIMetaFile( ((const MetaEPSAction*)pMA)->GetSubstitute() );
-                INT32 nCount = aGDIMetaFile.GetActionCount();
-                INT32 i;
-                for ( i = 0; i < nCount; i++ )
-                    if ( ((const MetaAction*)aGDIMetaFile.GetAction( i ))->GetType() == META_BMPSCALE_ACTION )
-                        break;
-                if ( i == nCount)
-                    break;
-            }
-            case META_BMP_ACTION:
-            case META_BMPSCALE_ACTION:
-            case META_BMPSCALEPART_ACTION:
-            case META_BMPEX_ACTION:
-            case META_BMPEXSCALE_ACTION:
-            case META_BMPEXSCALEPART_ACTION:
-                nNumberOfBitmaps++;
-            break;
-        }
-        nNumberOfActions++;
-    }
-}
-
-
-void METWriter::WriteBigEndianShort(USHORT nWord)
-{
-    *pMET << ((BYTE)(nWord>>8)) << ((BYTE)(nWord&0x00ff));
-}
-
-
-void METWriter::WriteBigEndianLong(ULONG nLong)
-{
-    WriteBigEndianShort((USHORT)(nLong>>16));
-    WriteBigEndianShort((USHORT)(nLong&0x0000ffff));
-}
-
-
-void METWriter::WritePoint(Point aPt)
-{
-    Point aNewPt = OutputDevice::LogicToLogic( aPt, aPictureMapMode, aTargetMapMode );
-
-    *pMET << (long) ( aNewPt.X() - aPictureRect.Left() )
-          << (long) ( aPictureRect.Bottom() - aNewPt.Y() );
-}
-
-
-void METWriter::WriteFieldIntroducer(USHORT nFieldSize, USHORT nFieldType,
-                                     BYTE nFlags, USHORT nSegSeqNum)
-{
-    nActualFieldStartPos=pMET->Tell();
-    WriteBigEndianShort(nFieldSize);
-    *pMET << (BYTE)0xd3 << nFieldType << nFlags << nSegSeqNum;
-}
-
-
-void METWriter::UpdateFieldSize()
-{
-    ULONG nPos;
-
-    nPos=pMET->Tell();
-    pMET->Seek(nActualFieldStartPos);
-    WriteBigEndianShort((USHORT)(nPos-nActualFieldStartPos));
-    pMET->Seek(nPos);
-}
-
-
-void METWriter::WriteFieldId(ULONG nId)
-{
-    BYTE nbyte;
-    short i;
-
-    for (i=1; i<=8; i++) {
-        nbyte= '0' + (BYTE)((nId >> (32-i*4)) & 0x0f);
-        *pMET << nbyte;
-    }
-}
-
-
-void METWriter::CreateChrSets(const GDIMetaFile * pMTF)
-{
-    ULONG nAction, nActionCount;
-    const MetaAction * pMA;
-
-    if (bStatus==FALSE)
-        return;
-
-    nActionCount=pMTF->GetActionCount();
-
-    for (nAction=0; nAction<nActionCount; nAction++)
-    {
-        pMA = pMTF->GetAction(nAction);
-
-        switch (pMA->GetType())
-        {
-            case META_FONT_ACTION:
-            {
-                const MetaFontAction* pA = (const MetaFontAction*) pMA;
-                CreateChrSet( pA->GetFont() );
-            }
-            break;
-        }
-    }
-}
-
-
-void METWriter::CreateChrSet(const Font & rFont)
-{
-    METChrSet * pCS;
-
-    if ( FindChrSet( rFont ) == 0 )
-    {
-        pCS = new METChrSet;
-        pCS->pSucc = pChrSetList; pChrSetList=pCS;
-        pCS->nSet = nNextChrSetId++;
-        pCS->aName = rFont.GetName();
-        pCS->eWeight = rFont.GetWeight();
-    }
-}
-
-
-BYTE METWriter::FindChrSet(const Font & rFont)
-{
-    METChrSet* pCS;
-
-    for (pCS=pChrSetList; pCS!=NULL; pCS=pCS->pSucc)
-    {
-        if (pCS->aName==rFont.GetName() && pCS->eWeight==rFont.GetWeight() )
-            return pCS->nSet;
-    }
-
-    return 0;
-}
-
-
-void METWriter::WriteChrSets()
-{
-    USHORT i;
-    char c = 0;
-    METChrSet * pCS;
-    BYTE nbyte;
-
-    for (pCS=pChrSetList; pCS!=NULL; pCS=pCS->pSucc)
-    {
-
-        WriteFieldIntroducer(0x58,MapCodFntMagic,0,0);
-
-        WriteBigEndianShort(0x0050);
-
-        *pMET << (BYTE)0x0c << (BYTE)0x02 << (BYTE)0x84 << (BYTE)0x00;
-        *pMET << (BYTE)0xa4 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x01;
-        *pMET << (BYTE)0x01 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00;
-
-        *pMET << (BYTE)0x04 << (BYTE)0x24 << (BYTE)0x05 << (BYTE)pCS->nSet;
-
-        *pMET << (BYTE)0x14 << (BYTE)0x1f;
-        switch (pCS->eWeight)
-        {
-            case WEIGHT_THIN:       nbyte=1; break;
-            case WEIGHT_ULTRALIGHT: nbyte=2; break;
-            case WEIGHT_LIGHT:      nbyte=3; break;
-            case WEIGHT_SEMILIGHT:  nbyte=4; break;
-            case WEIGHT_NORMAL:     nbyte=5; break;
-            case WEIGHT_SEMIBOLD:   nbyte=6; break;
-            case WEIGHT_BOLD:       nbyte=7; break;
-            case WEIGHT_ULTRABOLD:  nbyte=8; break;
-            case WEIGHT_BLACK:      nbyte=9; break;
-            default:                nbyte=5;
-        }
-        *pMET << nbyte;
-        *pMET << (BYTE)0x05;
-        *pMET << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00;
-        *pMET << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00;
-        *pMET << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00;
-        *pMET << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x0c;
-
-        *pMET << (BYTE)0x06 << (BYTE)0x20 << (BYTE)0x03 << (BYTE)0xd4;
-        *pMET << (BYTE)0x03 << (BYTE)0x52;
-
-        *pMET << (BYTE)0x24 << (BYTE)0x02 << (BYTE)0x08 << (BYTE)0x00;
-        ByteString n(pCS->aName, gsl_getSystemTextEncoding());
-        for (i=0; i<32; i++)
-        {
-            if ( i == 0 || c != 0 )
-                c = n.GetChar( i );
-            *pMET << c;
-        }
-    }
-}
-
-
-void METWriter::WriteColorAttributeTable(ULONG nFieldId, BitmapPalette* pPalette, BYTE nBasePartFlags, BYTE nBasePartLCTID)
-{
-    USHORT nIndex,nNumI,i;
-
-    if (bStatus==FALSE) return;
-
-    //--- Das Feld 'Begin Color Attribute Table':
-    WriteFieldIntroducer(16,BegColAtrMagic,0,0);
-    WriteFieldId(nFieldId);
-
-    //--- Das Feld 'Color Attribute Table':
-    WriteFieldIntroducer(0,BlkColAtrMagic,0,0);
-    *pMET << nBasePartFlags << (BYTE)0x00 << nBasePartLCTID; // 'Base Part'
-    if (pPalette!=NULL)
-    {
-        nIndex=0;
-        while (nIndex<pPalette->GetEntryCount())
-        {
-            nNumI=pPalette->GetEntryCount()-nIndex;
-            if (nNumI>81) nNumI=81;
-            *pMET << (BYTE)(11+nNumI*3);                   // Laenge des Parameters
-            *pMET << (BYTE)1 << (BYTE)0 << (BYTE)1;        // typ: element list, Reserved, Format: RGB
-            *pMET << (BYTE)0; WriteBigEndianShort(nIndex); // Start-Index (3 Bytes)
-            *pMET << (BYTE)8 << (BYTE)8 << (BYTE)8;        // Bits je Komponente R,G,B
-            *pMET << (BYTE)3;                              // Anzahl Bytes je Eintrag
-            for (i=0; i<nNumI; i++)
-            {
-                const BitmapColor& rCol = (*pPalette)[ nIndex ];
-
-                *pMET << (BYTE) rCol.GetRed();
-                *pMET << (BYTE) rCol.GetGreen();
-                *pMET << (BYTE) rCol.GetBlue();
-                nIndex++;
-            }
-        }
-    }
-    else
-    {
-        // 'Trible Generating'
-        *pMET << (BYTE)0x0a << (BYTE)0x02 << (BYTE)0x00 << (BYTE)0x01 << (BYTE)0x00;
-        *pMET << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x08 << (BYTE)0x08 << (BYTE)0x08;
-    }
-    UpdateFieldSize();
-
-    //--- Das Feld 'End Color Attribute Table':
-    WriteFieldIntroducer(16,EndColAtrMagic,0,0);
-    WriteFieldId(nFieldId);
-
-    if (pMET->GetError())
-        bStatus=FALSE;
-}
-
-
-void METWriter::WriteImageObject(const Bitmap & rBitmap)
-{
-    SvMemoryStream aTemp(0x00010000,0x00010000);
-    sal_uInt32 nWidth,nHeight,nResX,nResY;
-    ULONG nBytesPerLine,i,j,nNumColors,ny,nLines;
-    ULONG nActColMapId;
-    USHORT nBitsPerPixel;
-    BYTE nbyte, * pBuf;
-
-    if (bStatus==FALSE)
-        return;
-
-    nActColMapId=((nActBitmapId>>24)&0x000000ff) | ((nActBitmapId>> 8)&0x0000ff00) |
-                 ((nActBitmapId<< 8)&0x00ff0000) | ((nActBitmapId<<24)&0xff000000);
-
-    //--- Das Feld 'Begin Image Object':
-    WriteFieldIntroducer(16,BegImgObjMagic,0,0);
-    WriteFieldId(nActBitmapId);
-
-    // Windows-BMP-Datei erzeugen:
-    aTemp << rBitmap;
-
-    // Header der Windows-BMP-Datei einlesen:
-    aTemp.SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
-    aTemp.Seek(18);
-    aTemp >> nWidth >> nHeight;
-    aTemp.SeekRel(2);
-    aTemp >> nBitsPerPixel;
-    aTemp.SeekRel(8);
-    aTemp >> nResX >> nResY;
-    aTemp.SeekRel(8);
-
-    nNumColors=1<<nBitsPerPixel;
-    nBytesPerLine=((nWidth*nBitsPerPixel+0x0000001f) & 0xffffffe0 ) >> 3;
-
-    // ggf. Farbpalette einlesen und in die MET-Datei schreiben:
-    if (nBitsPerPixel<=8)
-    {
-        BitmapPalette   aPal( (USHORT) nNumColors );
-        BYTE            nr,ng,nb;
-
-        for (i=0; i<nNumColors; i++)
-        {
-            aTemp >> nb >> ng >> nr; aTemp.SeekRel(1);
-            aPal[ (USHORT) i ] = BitmapColor( nr, ng, nb );
-        }
-
-        //--- Das Feld 'Begin Resource Group':
-        WriteFieldIntroducer(16,BegResGrpMagic,0,0);
-        WriteFieldId(nActColMapId);
-
-        //--- Farbtabelle schreiben:
-        WriteColorAttributeTable(nActColMapId,&aPal,0,1);
-
-        //--- Das Feld 'End Resource Group':
-        WriteFieldIntroducer(16,EndResGrpMagic,0,0);
-        WriteFieldId(nActColMapId);
-
-        //--- Das Feld 'Begin Object Environment Group':
-        WriteFieldIntroducer(16,BegObjEnvMagic,0,0);
-        WriteFieldId(nActBitmapId);
-
-        //--- Das Feld 'Map Color Attribute Table':
-        WriteFieldIntroducer(26,MapColAtrMagic,0,0);
-        WriteBigEndianShort(0x0012);
-        *pMET << (BYTE)0x0c << (BYTE)0x02 << (BYTE)0x84 << (BYTE)0x00;
-        WriteFieldId(nActColMapId);
-        *pMET << (BYTE)0x04 << (BYTE)0x24 << (BYTE)0x07 << (BYTE)0x01;
-
-        //--- Das Feld 'End Object Environment Group':
-        WriteFieldIntroducer(16,EndObjEnvMagic,0,0);
-        WriteFieldId(nActBitmapId);
-    }
-
-    //--- Das Feld 'Image Data Descriptor':
-    WriteFieldIntroducer(17,DscImgObjMagic,0,0);
-    *pMET << (BYTE)0x01; // Unit of measure: tens of centimeters
-    WriteBigEndianShort((USHORT)nResX);
-    WriteBigEndianShort((USHORT)nResY);
-    WriteBigEndianShort((USHORT)nWidth);
-    WriteBigEndianShort((USHORT)nHeight);
-
-    //--- Das erste Feld 'Image Picture Data':
-    WriteFieldIntroducer(0,DatImgObjMagic,0,0);
-
-    // Begin Segment:
-    *pMET << (BYTE)0x70 << (BYTE)0x00;
-
-    // Begin Image Content:
-    *pMET << (BYTE)0x91 << (BYTE)0x01 << (BYTE)0xff;
-
-    // Image Size:
-    *pMET << (BYTE)0x94 << (BYTE)0x09 << (BYTE)0x02;
-    *pMET << (USHORT) 0 << (USHORT) 0;
-    WriteBigEndianShort((USHORT)nHeight);
-    WriteBigEndianShort((USHORT)nWidth);
-
-    // Image Encoding:
-    *pMET << (BYTE)0x95 << (BYTE)0x02 << (BYTE)0x03 << (BYTE)0x03;
-
-    // Image IDE-Size:
-    *pMET << (BYTE)0x96 << (BYTE)0x01 << (BYTE)nBitsPerPixel;
-
-    if (nBitsPerPixel<=8) {
-        // Image LUT-ID
-        *pMET << (BYTE)0x97 << (BYTE)0x01 << (BYTE)0x01;
-    }
-    else {
-        // IDE Structure
-        *pMET << (BYTE)0x9b << (BYTE)0x08 << (BYTE)0x00 << (BYTE)0x01;
-        *pMET << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x08;
-        *pMET << (BYTE)0x08 << (BYTE)0x08;
-    }
-
-    pBuf=new BYTE[nBytesPerLine];
-    ny=0;
-    while (ny<nHeight) {
-
-        // Abschliessen des vorherigen Feldes 'Image Picture Data':
-        UpdateFieldSize();
-
-        // Und ein neues Feld 'Image Picture Data' anfangen:
-        WriteFieldIntroducer(0,DatImgObjMagic,0,0);
-
-        // Einige Scanlines lesen und schreiben:
-        nLines=nHeight-ny;
-        if (nLines*nBytesPerLine>30000) nLines=30000/nBytesPerLine;
-        if (nLines<1) nLines=1;
-        WriteBigEndianShort(0xfe92);
-        WriteBigEndianShort((USHORT)(nLines*nBytesPerLine));
-        for (i=0; i<nLines; i++) {
-            aTemp.Read(pBuf,nBytesPerLine);
-            if (nBitsPerPixel==24) {
-                for (j=2; j<nBytesPerLine; j+=3) {
-                    nbyte=pBuf[j]; pBuf[j]=pBuf[j-2]; pBuf[j-2]=nbyte;
-                }
-            }
-            pMET->Write(pBuf,nBytesPerLine);
-            ny++;
-        }
-        if (aTemp.GetError() || pMET->GetError()) bStatus=FALSE;
-        nActBitmapPercent=(ny+1)*100/nHeight;
-        MayCallback();
-        if (bStatus==FALSE) { delete[] pBuf; return; }
-    }
-    delete[] pBuf;
-
-    // End Image Content:
-    *pMET << (BYTE)0x93 << (BYTE)0x00;
-
-    // End Segment:
-    *pMET << (BYTE)0x71 << (BYTE)0x00;
-
-    // Abschliessen des letzten Feldes 'Image Picture Data':
-    UpdateFieldSize();
-
-    //--- Das Feld 'End Image Object':
-    WriteFieldIntroducer(16,EndImgObjMagic,0,0);
-    WriteFieldId(nActBitmapId);
-
-    // Ids erhoehen:
-    nActBitmapId++;
-
-    // Bitmaps zaehlen:
-    nWrittenBitmaps++;
-    nActBitmapPercent=0;
-
-    if (pMET->GetError()) bStatus=FALSE;
-}
-
-
-void METWriter::WriteImageObjects(const GDIMetaFile * pMTF)
-{
-    const MetaAction*   pMA;
-
-    if (bStatus==FALSE)
-        return;
-
-    for ( ULONG nAction = 0, nActionCount = pMTF->GetActionCount(); nAction < nActionCount; nAction++)
-    {
-        pMA = pMTF->GetAction(nAction);
-
-        switch (pMA->GetType())
-        {
-            case META_BMP_ACTION:
-            {
-                METSetMix( eGDIRasterOp );
-                WriteImageObject( ( (MetaBmpAction*) pMA )->GetBitmap() );
-            }
-            break;
-
-            case META_BMPSCALE_ACTION:
-            {
-                METSetMix( eGDIRasterOp );
-                WriteImageObject( ( (MetaBmpScaleAction*) pMA )->GetBitmap() );
-            }
-            break;
-
-            case META_BMPSCALEPART_ACTION:
-            {
-                METSetMix( eGDIRasterOp );
-                WriteImageObject( ( (MetaBmpScalePartAction*) pMA )->GetBitmap() );
-            }
-            break;
-
-            case META_BMPEX_ACTION:
-            {
-                METSetMix( eGDIRasterOp );
-                WriteImageObject( Graphic( ( (MetaBmpExAction*) pMA )->GetBitmapEx() ).GetBitmap() );
-            }
-            break;
-
-            case META_BMPEXSCALE_ACTION:
-            {
-                METSetMix( eGDIRasterOp );
-                WriteImageObject( Graphic( ( (MetaBmpExScaleAction*) pMA )->GetBitmapEx() ).GetBitmap() );
-            }
-            break;
-
-            case META_BMPEXSCALEPART_ACTION:
-            {
-                METSetMix( eGDIRasterOp );
-                WriteImageObject( Graphic( ( (MetaBmpExScalePartAction*) pMA )->GetBitmapEx() ).GetBitmap() );
-            }
-            break;
-
-            case META_EPS_ACTION :
-            {
-                const MetaEPSAction* pA = (const MetaEPSAction*)pMA;
-                const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
-
-                INT32 nCount = aGDIMetaFile.GetActionCount();
-                for ( INT32 i = 0; i < nCount; i++ )
-                {
-                    const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
-                    if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
-                    {
-                        const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*)pMetaAct;
-                        METSetMix( eGDIRasterOp );
-                        WriteImageObject( pBmpScaleAction->GetBitmap() );
-                        break;
-                    }
-                }
-            }
-            break;
-        }
-
-        if (bStatus==FALSE)
-            break;
-    }
-
-    if (pMET->GetError())
-        bStatus=FALSE;
-}
-
-void METWriter::WriteDataDescriptor(const GDIMetaFile *)
-{
-    if (bStatus==FALSE)
-        return;
-
-    WriteFieldIntroducer(0,DscGrfObjMagic,0,0);
-
-    //------------------------------------------------------------------------------
-    // Im Folgenden die OS2-Orginal-Dokumentation und die Implementation dazu (uff)
-    //------------------------------------------------------------------------------
-
-    //  Parameters (all required and in this order)
-
-    //  0         0xF7 Specify GVM Subset
-    //  1         Length of following data 0x07
-    //  2         0xB0 drawing order subset
-    //  3-4       0x0000
-    //  5         0x23 Level 3.2
-    //  6         0x01 Version 1
-    //  7         Length of following field 0x01
-    //  8         Coordinate types in data
-    //       0x04Intel16
-    //       0x05Intel32
-    *pMET << (BYTE)0xf7 << (BYTE)0x07 << (BYTE)0xb0 << (BYTE)0x00
-          << (BYTE)0x00 << (BYTE)0x23 << (BYTE)0x01 << (BYTE)0x01
-          << (BYTE)0x05;
-
-    //  0         0xF6 Set Picture Descriptor
-    //  1         Length of following data
-    //  2         Flags
-    //       0    B'0' Picture in 2D
-    //       1    Picture Dimensions
-    //            B'0'  Not absolute (PU_ARBITRARY PS)
-    //            B'1'  Absolute (example: PU_TWIPS PS)
-    //       2    Picture Elements
-    //            B'0'  Not pels
-    //            B'1'  Pels (PU_PELS PS)
-    //                  (Bit 1 must also be set)
-    //       3-7  B'00000'
-    //  3         0x00 Reserved
-    //  4         Picture frame size coordinate type
-    //       0x04  Intel16
-    //       0x05  Intel32
-    //  5         UnitsOfMeasure
-    //       0x00  Ten inches
-    //       0x01  Decimeter
-    //  6-11 or 6-17(2 or 4 bytes) Resolution.
-    //       GPS Units / UOM on x axis
-    //       GPS Units / UOM on y axis
-    //       GPS Units / UOM on z axis
-    //  12-23 or 18-41(2 or 4 bytes) Window Size.
-    //       GPS X left, X right
-    //       GPS Y bottom, Y top
-    //       GPS Z near, Z far
-    Size aUnitsPerDecimeter=OutputDevice::LogicToLogic(Size(10,10),MapMode(MAP_CM),aPictureMapMode);
-    *pMET << (BYTE)0xf6 << (BYTE)0x28 << (BYTE)0x40 << (BYTE)0x00
-          << (BYTE)0x05 << (BYTE)0x01
-          << (sal_uInt32)(aUnitsPerDecimeter.Width())
-          << (sal_uInt32)(aUnitsPerDecimeter.Height())
-          << (sal_uInt32)0
-          << (sal_uInt32)0 << (sal_uInt32)aPictureRect.GetWidth()
-          << (sal_uInt32)0 << (sal_uInt32)aPictureRect.GetHeight()
-          << (sal_uInt32)0 << (sal_uInt32)0;
-
-    //  0         0x21 Set Current Defaults
-    //  1         Length of following data
-    //  2         Set Default Parameter Format 0x08
-    //  3-4       Mask 0xE000
-    //  5         Names 0x8F
-    //  6         Coordinates
-    //       0x00  Picture in 2D
-    //  7         Transforms
-    //       0x04  Intel16
-    //       0x05  Intel32
-    //  8         Geometrics
-    //       0x04  Intel16
-    //       0x05  Intel32
-    *pMET << (BYTE)0x21 << (BYTE)0x07 << (BYTE)0x08 << (BYTE)0xe0
-          << (BYTE)0x00 << (BYTE)0x8f << (BYTE)0x00 << (BYTE)0x05
-          << (BYTE)0x05;
-
-    //  0         0x21 Set Current Defaults
-    //  1         Length of following data
-    //  2         Set default viewing transform 0x07
-    //  3-4       Mask 0xCC0C
-    //  5         Names 0x8F
-    //  6-n       M11, M12, M21, M22, M41, M42   Matrix elements
-    *pMET << (BYTE)0x21 << (BYTE)0x1c << (BYTE)0x07 << (BYTE)0xcc
-          << (BYTE)0x0c << (BYTE)0x8f
-          << (sal_uInt32)0x00010000 << (sal_uInt32)0x00000000 << (sal_uInt32)0x00000000
-          << (sal_uInt32)0x00010000 << (sal_uInt32)0x00000000 << (sal_uInt32)0x00000000;
-
-    //  0         0x21 Set Current Defaults
-    //  1         Length of following data
-    //  2         Set default line attributes 0x01
-    //  3-4       Mask - OR of as many of the following bits as are required:
-    //       0x8000  Line type
-    //       0x4000  Line width
-    //       0x2000  Line end
-    //       0x1000  Line join
-    //       0x0800  Stroke width
-    //       0x0008  Line color
-    //       0x0002  Line mix
-    //  5         Flags
-    //
-    //       0x0F Set indicated default attributes to initial values. (Data field is not present in this
-    //             instance).
-    //       0x8F Set indicated default attributes to specified values.
-    //  6-n       Data - data values as required, in the following order if present.
-    //            No space is reserved for attributes for which the corresponding mask flag was not
-    //            set.
-    //
-    //       (1 byte)  - Line type
-    //       (1 byte)  - Line width
-    //       (1 byte)  - Line end
-    //       (1 byte)  - Line join
-    //       (G bytes) - Stroke width
-    //       (4 bytes) - Line color
-    //       (1 byte)  - Line mix (G=2 or 4 depending on the Geometrics parameter of Set Default
-    //            Parameter Format)
-    // Nanu! witziger-weise fehlt obiger Abschnitt in den Metadateien. Also lassen wir ihn auch weg
-
-    //  0         0x21 Set Current Defaults
-    //  1         Length of following data
-    //  2         Set Default Character Attributes 0x02
-    //  3-4       Mask - OR of as many of the following bits as are required:
-    //
-    //       0x8000  Character angle
-    //       0x4000  Character box
-    //       0x2000  Character direction
-    //       0x1000  Character precision
-    //       0x0800  Character set
-    //       0x0400  Character shear
-    //       0x0040  Character break extra
-    //       0x0020  Character extra
-    //       0x0008  Character color
-    //       0x0004  Character background color
-    //       0x0002  Character mix
-    //       0x0001  Character background mix
-    //  5         Flags
-    //       0x0FSet indicated default attributes to initial values.  (Data field is not present in this
-    //            case).
-    //       0x8FSet indicated default attributes to specified values.
-    //  6-n       Data - data values as required, in the following order if present.
-    //            No space is reserved for attributes for which the corresponding Mask flag was not
-    //            set.
-    //       (2*G bytes)     - Character angle
-    //       (2*G + 4 bytes)- Character box
-    //       (1 byte)        - Character direction
-    //       (1 byte)        - Character precision
-    //       (1 byte)        - Character set
-    //       (2*G bytes)     - Character shear
-    //       (4 bytes)       - Character break extra
-    //       (4 bytes)       - Character extra
-    //       (4 bytes)       - Character color
-    //       (4 bytes)       - Character background color
-    //       (1 byte)        - Character mix
-    //       (1 byte)        - Character background mix (G=2 or 4 depending on the Geometrics
-    //            parameter of Set Default Parameter Format)
-    *pMET << (BYTE)0x21 << (BYTE)0x10 << (BYTE)0x02 << (BYTE)0x40
-          << (BYTE)0x00 << (BYTE)0x8f
-          << (BYTE)0xaa << (BYTE)0x02 << (BYTE)0x00 << (BYTE)0x00
-          << (BYTE)0x44 << (BYTE)0x04 << (BYTE)0x00 << (BYTE)0x00
-          << (BYTE)0xa8 << (BYTE)0xaa << (BYTE)0x40 << (BYTE)0x44;
-
-    //  0         0x21 Set Current Defaults
-    //  1         Length of following data
-    //  2         Set Default Marker Attributes 0x03
-    //  3-4       Mask - OR of as many of the following bits as are required:
-    //       0x4000  Marker box
-    //       0x1000  Marker precision
-    //       0x0800  Marker set
-    //       0x0100  Marker symbol
-    //       0x0008  Marker color
-    //       0x0004  Marker background color
-    //       0x0002  Marker mix
-    //       0x0001  Marker background mix
-    //  5         Flags
-    //       0x0F  Set indicated default attributes to initial values.
-    //             (Data field is not present in this instance)
-    //       0x8F  Set indicated default attributes to specified values.
-    //  6-n       Data - data values as required, in this order if present.
-    //            No space is reserved for attributes for which the corresponding Mask flag was not
-    //            set.
-    //       (2*G bytes)    - Marker box
-    //       (1 byte)       - Marker precision
-    //       (1 byte)       - Marker set
-    //       (1 byte)       - Marker symbol
-    //       (4 bytes)      - Marker color
-    //       (4 bytes)      - Marker background color
-    //       (1 byte)       - Marker mix
-    //       (1 byte)       - Marker background mix (G=2 or 4 depending on the Geometrics
-    //            parameter of Set Default Parameter Format)
-    *pMET << (BYTE)0x21 << (BYTE)0x0c << (BYTE)0x03 << (BYTE)0x40
-          << (BYTE)0x00 << (BYTE)0x8f
-          << (BYTE)0x66 << (BYTE)0x02 << (BYTE)0x00 << (BYTE)0x00
-          << (BYTE)0x66 << (BYTE)0x02 << (BYTE)0x00 << (BYTE)0x00;
-
-    //  0         0x21 Set Current Defaults
-    //  1         Length of following data
-    //  2         Set Default Pattern Attributes 0x04
-    //  3-4       Mask - OR of as many of the following bits as are required:
-    //       0x0800  Pattern set
-    //       0x0100  Pattern symbol
-    //       0x0080  Pattern reference point
-    //       0x0008  Pattern color
-    //       0x0004  Pattern background color
-    //       0x0002  Pattern mix
-    //       0x0001  Pattern background mix
-    //       5       Flags
-    //
-    //            0x0F Set indicated default attributes to initial values.
-    //                  (Data field is not present in this instance)
-    //            0x8F Set indicated default attributes to specified values.
-    //       6-n     Data - data values as required, in this order if present.
-    //               No space is reserved for attributes for which the corresponding Mask flag was
-    //               not set.
-    //
-    //            (1 byte)     - Pattern set
-    //            (1 byte)     - Pattern symbol
-    //            (2*G bytes)  - Pattern reference point
-    //            (4 bytes)    - Pattern color
-    //            (4 bytes)    - Pattern background color
-    //            (1 byte)     - Pattern mix
-    //            (1 byte)     - Pattern background mix (G=2 or 4 depending on the Geometrics
-    //               parameter of Set Default Parameter Format)
-    //       0       0x21 Set Current Defaults
-    //       1       Length of following data
-    //       2       Set Default Image Attributes 0x06
-    //       3-4     Mask - OR of as many of these bits as are required:
-    //            0x0008  Image color
-    //            0x0004  Image background color
-    //            0x0002  Image mix
-    //            0x0001  Image background mix
-    //       5       Flags
-    //            0x0F Set indicated default attributes to initial values. (Data field is not present in
-    //                  this instance)
-    //            0x8F Set indicated default attributes to specified values.
-    //       6-n     Data - data values as required, in this order if present.
-    //               No space is reserved for attributes for which the corresponding Mask flag was
-    //               not set.
-    //            (4 bytes)  - Image color
-    //            (4 bytes)  - Image background color
-    //            (1 byte)   - Image mix
-    //            (1 byte)   - Image background mix
-    //       0       0x21 Set Current Defaults
-    //       1       Length of following data
-    //       2       Set Default Viewing Window 0x05
-    //       3-4     Mask - OR of as many of the following bits as are required:
-    //            0x8000  x left limit
-    //            0x4000  x right limit
-    //            0x2000  y bottom limit
-    //            0x1000  y top limit
-    //       5       Flags
-    //            0x0F Set indicated default attributes to initial values.
-    //                  (Data field is not present in this case).
-    //            0x8F Set indicated default attributes to specified values.
-    //       6-n     Data - data values as required, in the following order if present.
-    //               No space is reserved for attributes for which the corresponding Mask flag was
-    //               not set.
-    //            (2*G bytes)  - x left limit
-    //            (2*G bytes)  - x right limit
-    //            (2*G bytes)  - y bottom limit
-    //            (2*G bytes)  - y top limit (G=2 or 4 depending on the Geometrics parameter of Set
-    //               Default Parameter Format)
-    //       0       0x21 Set Current Defaults
-    //       1       Length of following data
-    //       2       Set Default Arc Parameters 0x0B
-    //       3-4     Mask - OR of as many of the following bits as are required:
-    //            0x8000  P value
-    //            0x4000  Q value
-    //            0x2000  R value
-    //            0x1000  S value
-    //       5       Flags
-    //            0x0F Set indicated default attributes to initial values.
-    //                  (Data field is not present in this case).
-    //            0x8F Set indicated default attributes to specified values.
-    //       6-n     Data - data values as required, in the following order if present.
-    //               No space is reserved for attributes for which the corresponding Mask flag was
-    //               not set.
-    //            (G bytes)  - P value
-    //            (G bytes)  - Q value
-    //            (G bytes)  - R value
-    //            (G bytes)  - S value (G=2 or 4 depending on the Geometrics parameter of Set
-    //               Default Parameter Format)
-    //       0       0x21 Set Current Defaults
-    //       1       Length of following data
-    //       2       Set Default Pick Identifier 0x0C
-    //       3-4     Mask - OR of as many of the following bits as are required:
-    //            0x8000  Pick identifier
-    //       5       Flags
-    //            0x0F Set indicated default attributes to initial values.
-    //                  (Data field is not present in this case).
-    //            0x8F Set indicated default attributes to specified values.
-    //       6-n     Data - data values as required, in the following order if present.
-    //               No space is reserved for attributes for which the corresponding Mask flag was
-    //               not set.
-    //            (4 bytes)  - Pick identifier
-
-    //       0       0xE7 Set Bit-map Identifier
-    //       1       Length of following data 0x07
-    //       2-3     Usage Flags 0x8000
-    //       4-7     Bit-map handle
-    //       8       Lcid
-    if (nNumberOfBitmaps>0) {
-        *pMET << (BYTE)0xe7 << (BYTE)0x07 << (BYTE)0x80 << (BYTE)0x00;
-        WriteBigEndianLong(nActBitmapId);
-        *pMET << (BYTE)0xfe;
-    }
-
-    UpdateFieldSize();
-
-    if (pMET->GetError()) bStatus=FALSE;
-}
-
-
-void METWriter::WillWriteOrder(ULONG nNextOrderMaximumLength)
-{
-    // Die Parameter eines 'Graphics Data Fields' duerfen (laut OS2-Doku)
-    // hoechstens 32759 Bytes umfassen. Gemeint ist die Laenge des Feldes minus
-    // dem 'Structured Field Introducer' (groesse: 8). Also darf die Groesse
-    // des ganzen Fields hoechstens 8+32759=32767=0x7fff sein.
-    // Zur Sicherheit nehmen wir lieber 30000 als Grenze.
-
-    if (pMET->Tell()-nActualFieldStartPos+nNextOrderMaximumLength>30000)
-    {
-        UpdateFieldSize();
-        WriteFieldIntroducer(0,DatGrfObjMagic,0,0);
-        nNumberOfDataFields++;
-    }
-}
-
-
-
-void METWriter::METBitBlt(Point aPt, Size aSize, const Bitmap & rBitmap)
-{
-    WillWriteOrder(46);
-    *pMET << (BYTE)0xd6 << (BYTE)44 << (USHORT)0 << (USHORT) 0x00cc;
-    WriteBigEndianLong(nActBitmapId++);
-    *pMET << (BYTE)0x02 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00;
-    WritePoint(Point(aPt.X(),aPt.Y()+aSize.Height()));
-    WritePoint(Point(aPt.X()+aSize.Width(),aPt.Y()));
-    *pMET << (sal_uInt32)0 << (sal_uInt32)0
-          << (sal_uInt32)(rBitmap.GetSizePixel().Width())
-          << (sal_uInt32)(rBitmap.GetSizePixel().Height());
-}
-
-void METWriter::METSetAndPushLineInfo( const LineInfo& rLineInfo )
-{
-    INT32 nWidth = OutputDevice::LogicToLogic( Size( rLineInfo.GetWidth(),0 ), aPictureMapMode, aTargetMapMode ).Width();
-
-    WillWriteOrder( 8 );            // set stroke linewidth
-    *pMET   << (BYTE)0x15
-            << (BYTE)6
-            << (BYTE)0              // Flags
-            << (BYTE)0
-            << nWidth;
-
-    if ( rLineInfo.GetStyle() != LINE_SOLID )
-    {
-        BYTE nStyle = 0;            // LineDefault;
-
-        switch ( rLineInfo.GetStyle() )
-        {
-            case LINE_NONE :
-                nStyle = 8;
-            break;
-
-            case LINE_DASH :
-            {
-                if ( rLineInfo.GetDotCount() )
-                {
-                    if ( !rLineInfo.GetDashCount() )
-                        nStyle = 1; // LINE_DOT
-                    else
-                        nStyle = 3; // LINE_DASH_DOT
-                }
-                else
-                    nStyle = 2;     // LINE_DASH
-            }
-            break;
-            case LineStyle_SOLID:
-            case LineStyle_FORCE_EQUAL_SIZE:
-                break;  // not handled -Wall
-        }
-        WillWriteOrder( 2 );
-        *pMET << (BYTE)0x18 << nStyle;      // set LineType
-    }
-}
-
-void METWriter::METPopLineInfo( const LineInfo& rLineInfo )
-{
-    WillWriteOrder( 8 );            // set stroke linewidth
-    *pMET   << (BYTE)0x15
-            << (BYTE)6
-            << (BYTE)0              // Flags
-            << (BYTE)0
-            << (UINT32)1;
-
-    if ( rLineInfo.GetStyle() != LINE_SOLID )
-    {
-        WillWriteOrder( 2 );
-        *pMET << (BYTE)0x18 << (BYTE)0;     // set LineType
-    }
-}
-
-void METWriter::METBeginArea(BOOL bBoundaryLine)
-{
-    WillWriteOrder(2);
-    *pMET << (BYTE)0x68;
-    if (bBoundaryLine) *pMET << (BYTE)0xc0;
-    else               *pMET << (BYTE)0x80;
-}
-
-
-void METWriter::METEndArea()
-{
-    WillWriteOrder(2);
-    *pMET << (BYTE)0x60 << (BYTE)0;
-}
-
-
-void METWriter::METBeginPath(sal_uInt32 nPathId)
-{
-    WillWriteOrder(8);
-    *pMET << (BYTE)0xd0 << (BYTE)6 << (USHORT) 0 << nPathId;
-}
-
-
-void METWriter::METEndPath()
-{
-    WillWriteOrder(2);
-    *pMET << (BYTE)0x7f << (BYTE)0;
-}
-
-
-void METWriter::METFillPath(sal_uInt32 nPathId)
-{
-    WillWriteOrder(8);
-    *pMET << (BYTE)0xd7 << (BYTE)6
-          << (BYTE)0x00 << (BYTE)0 << nPathId;
-}
-
-
-void METWriter::METOutlinePath(sal_uInt32 nPathId)
-{
-    WillWriteOrder(8);
-    *pMET << (BYTE)0xd4 << (BYTE)6
-          << (BYTE)0 << (BYTE)0 << nPathId;
-}
-
-
-void METWriter::METCloseFigure()
-{
-    WillWriteOrder(2);
-    *pMET << (BYTE)0x7d << (BYTE)0;
-}
-
-
-void METWriter::METMove(Point aPt)
-{
-    WillWriteOrder(10);
-    *pMET << (BYTE)0x21 << (BYTE)8;
-    WritePoint(aPt);
-}
-
-
-void METWriter::METLine(Point aPt1, Point aPt2)
-{
-    WillWriteOrder(18);
-    *pMET << (BYTE)0xc1 << (BYTE)16;
-    WritePoint(aPt1); WritePoint(aPt2);
-}
-
-
-void METWriter::METLine(const Polygon & rPolygon)
-{
-    USHORT nNumPoints,i,j,nOrderPoints;
-    BOOL bFirstOrder;
-
-    bFirstOrder=TRUE;
-    i=0; nNumPoints=rPolygon.GetSize();
-    while (i<nNumPoints) {
-        nOrderPoints=nNumPoints-i;
-        if (nOrderPoints>30) nOrderPoints=30;
-        WillWriteOrder(nOrderPoints*8+2);
-        if (bFirstOrder==TRUE) {
-            *pMET << (BYTE)0xc1; // Line at given pos
-            bFirstOrder=FALSE;
-        }
-        else {
-            *pMET << (BYTE)0x81; // Line at current pos
-        }
-        *pMET << (BYTE)(nOrderPoints*8);
-        for (j=0; j<nOrderPoints; j++) WritePoint(rPolygon.GetPoint(i++));
-    }
-}
-
-
-void METWriter::METLine(const PolyPolygon & rPolyPolygon)
-{
-    USHORT i,nCount;
-    nCount=rPolyPolygon.Count();
-    for (i=0; i<nCount; i++) {
-        METLine(rPolyPolygon.GetObject(i));
-        METCloseFigure();
-    }
-}
-
-
-void METWriter::METLineAtCurPos(Point aPt)
-{
-    WillWriteOrder(10);
-    *pMET << (BYTE)0x81 << (BYTE)8;
-    WritePoint(aPt);
-}
-
-
-void METWriter::METBox(BOOL bFill, BOOL bBoundary,
-                       Rectangle aRect, sal_uInt32 nHAxis, sal_uInt32 nVAxis)
-{
-    BYTE nFlags=0;
-    if (bFill)     nFlags|=0x40;
-    if (bBoundary) nFlags|=0x20;
-
-    WillWriteOrder(28);
-    *pMET << (BYTE)0xc0 << (BYTE)26 << nFlags << (BYTE)0;
-    WritePoint(aRect.BottomLeft());
-    WritePoint(aRect.TopRight());
-    *pMET << nHAxis << nVAxis;
-}
-
-
-void METWriter::METFullArc(Point aCenter, double fMultiplier)
-{
-    WillWriteOrder(14);
-    *pMET << (BYTE)0xc7 << (BYTE)12;
-    WritePoint(aCenter);
-    *pMET << (long)(fMultiplier*65536.0+0.5);
-}
-
-
-void METWriter::METPartialArcAtCurPos(Point aCenter, double fMultiplier,
-                                      double fStartAngle, double fSweepAngle)
-{
-    fStartAngle*=180.0/3.14159265359;
-    while (fStartAngle>360.0) fStartAngle-=360.0;
-    while (fStartAngle<0.0) fStartAngle+=360.0;
-    fSweepAngle*=180.0/3.14159265359;
-    while (fSweepAngle>360.0) fSweepAngle-=360.0;
-    while (fSweepAngle<.00) fSweepAngle+=360.0;
-    WillWriteOrder(22);
-    *pMET << (BYTE)0xa3 << (BYTE)20;
-    WritePoint(aCenter);
-    *pMET << (long)(fMultiplier*65536.0+0.5);
-    *pMET << (long)(fStartAngle*65536.0+0.5);
-    *pMET << (long)(fSweepAngle*65536.0+0.5);
-}
-
-
-void METWriter::METChrStr( Point aPt, String aUniStr )
-{
-    USHORT nLen,i;
-    ByteString aStr( aUniStr, gsl_getSystemTextEncoding() );
-    nLen = aStr.Len();
-    WillWriteOrder( 11 + nLen );
-    *pMET << (BYTE)0xc3 << (BYTE)( 9 + nLen );
-    WritePoint(aPt);
-    for ( i = 0; i < nLen; i++ )
-        *pMET << aStr.GetChar( i );
-    *pMET << (BYTE)0;
-}
-
-
-void METWriter::METSetArcParams(long nP, long nQ, long nR, long nS)
-{
-    WillWriteOrder(18);
-    *pMET << (BYTE)0x22 << (BYTE)16 << nP << nQ << nR << nS;
-}
-
-
-void METWriter::METSetColor(Color aColor)
-{
-    if (aColor==aMETColor) return;
-    aMETColor=aColor;
-
-    WillWriteOrder(6);
-    *pMET << (BYTE)0xa6 << (BYTE)4 << (BYTE)0
-          << (BYTE)(aColor.GetBlue())
-          << (BYTE)(aColor.GetGreen())
-          << (BYTE)(aColor.GetRed());
-}
-
-
-void METWriter::METSetBackgroundColor(Color aColor)
-{
-    if (aColor==aMETBackgroundColor) return;
-    aMETBackgroundColor=aColor;
-
-    WillWriteOrder(6);
-    *pMET << (BYTE)0xa7 << (BYTE)4 << (BYTE)0
-          << (BYTE)(aColor.GetBlue())
-          << (BYTE)(aColor.GetGreen())
-          << (BYTE)(aColor.GetRed());
-}
-
-void METWriter::METSetMix(RasterOp eROP)
-{
-    BYTE nMix;
-
-    if (eMETMix==eROP)
-        return;
-
-    eMETMix=eROP;
-
-    switch (eROP)
-    {
-        case ROP_INVERT: nMix=0x0c; break;
-        case ROP_XOR:    nMix=0x04; break;
-        default:         nMix=0x02;
-    }
-
-    WillWriteOrder(2);
-    *pMET << (BYTE)0x0c << nMix;
-}
-
-
-void METWriter::METSetChrCellSize(Size aSize)
-{
-    if (aMETChrCellSize==aSize)
-        return;
-
-    aMETChrCellSize=aSize;
-    WillWriteOrder(10);
-    if (aSize.Width()==0) aSize.Width()=aSize.Height();
-    *pMET << (BYTE)0x33 << (BYTE)8 << (long)aSize.Width() << (long)aSize.Height();
-}
-
-
-void METWriter::METSetChrAngle(short nAngle)
-{
-    double fa;
-    long nax,nay;
-
-    if (nMETChrAngle==nAngle) return;
-    nMETChrAngle=nAngle;
-
-    if (nAngle==0)
-    {
-        nax=256;
-        nay=0;
-    }
-    else
-    {
-        fa=((double)nAngle)/1800.0*3.14159265359;
-        nax=(long)(256.0*cos(fa)+0.5);
-        nay=(long)(256.0*sin(fa)+0.5);
-    }
-
-    WillWriteOrder(10);
-    *pMET << (BYTE)0x34 << (BYTE)8 << nax << nay;
-}
-
-
-void METWriter::METSetChrSet(BYTE nSet)
-{
-    if (nMETChrSet==nSet)
-        return;
-
-    nMETChrSet=nSet;
-    WillWriteOrder(2);
-    *pMET << (BYTE)0x38 << nSet;
-}
-
-
-void METWriter::WriteOrders( const GDIMetaFile* pMTF )
-{
-    if(bStatus==FALSE)
-        return;
-
-    for( ULONG nA = 0, nACount = pMTF->GetActionCount(); nA < nACount; nA++ )
-    {
-        const MetaAction* pMA = pMTF->GetAction( nA );
-
-        switch (pMA->GetType())
-        {
-            case META_PIXEL_ACTION:
-            {
-                const MetaPixelAction* pA = (const MetaPixelAction*) pMA;
-                METSetMix( eGDIRasterOp );
-                METSetColor( pA->GetColor() );
-                METLine( pA->GetPoint(),pA->GetPoint() );
-            }
-            break;
-
-            case META_POINT_ACTION:
-            {
-                const MetaPointAction* pA = (const MetaPointAction*) pMA;
-
-                METSetArcParams(1,1,0,0);
-                METSetMix(eGDIRasterOp);
-                METSetColor(aGDILineColor);
-                METBeginArea(FALSE);
-                METFullArc(pA->GetPoint(),0.5);
-                METEndArea();
-            }
-            break;
-
-            case META_LINE_ACTION:
-            {
-                const MetaLineAction* pA = (const MetaLineAction*) pMA;
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    LineInfo aLineInfo( pA->GetLineInfo() );
-                    if ( ! ( aLineInfo.IsDefault() ) )
-                        METSetAndPushLineInfo( aLineInfo );
-
-                    METSetMix( eGDIRasterOp );
-                    METSetColor(aGDILineColor);
-                    METBeginPath( 1 );
-                    METLine( pA->GetStartPoint(), pA->GetEndPoint() );
-                    METEndPath();
-                    METOutlinePath( 1 );
-
-                    if ( ! ( aLineInfo.IsDefault() ) )
-                        METPopLineInfo( aLineInfo );
-                }
-            }
-            break;
-
-            case META_RECT_ACTION:
-            {
-                const MetaRectAction* pA = (const MetaRectAction*) pMA;
-
-                if( aGDIFillColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDIFillColor );
-                    METSetBackgroundColor( aGDIFillColor );
-                    METBox( TRUE, FALSE, pA->GetRect(), 0, 0 );
-                }
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDILineColor );
-                    METBox( FALSE, TRUE, pA->GetRect(), 0, 0 );
-                }
-            }
-            break;
-
-            case META_ROUNDRECT_ACTION:
-            {
-                const MetaRoundRectAction* pA = (const MetaRoundRectAction*) pMA;
-
-                if( aGDIFillColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDIFillColor );
-                    METSetBackgroundColor( aGDIFillColor );
-                    METBox( TRUE, FALSE, pA->GetRect(), pA->GetHorzRound(), pA->GetVertRound() );
-                }
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDILineColor );
-                    METBox( FALSE, TRUE, pA->GetRect(), pA->GetHorzRound(), pA->GetVertRound() );
-                }
-            }
-            break;
-
-            case META_ELLIPSE_ACTION:
-            {
-                const MetaEllipseAction*    pA = (const MetaEllipseAction*) pMA;
-                Point                       aCenter;
-
-                aCenter.X()=(pA->GetRect().Left()+pA->GetRect().Right())/2;
-                aCenter.Y()=(pA->GetRect().Top()+pA->GetRect().Bottom())/2;
-
-                METSetArcParams(pA->GetRect().GetWidth(), pA->GetRect().GetHeight(),0,0);
-
-                if( aGDIFillColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDIFillColor );
-                    METSetBackgroundColor( aGDIFillColor );
-                    METBeginArea(FALSE);
-                    METFullArc(aCenter,0.5);
-                    METEndArea();
-                }
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDILineColor );
-                    METFullArc( aCenter,0.5 );
-                }
-            }
-            break;
-
-            case META_ARC_ACTION:
-            {
-                const MetaArcAction*    pA = (const MetaArcAction*) pMA;
-                Point                   aStartPos,aCenter;
-                double                  fdx,fdy,fa1,fa2;
-
-                aCenter.X()=(pA->GetRect().Left()+pA->GetRect().Right())/2;
-                aCenter.Y()=(pA->GetRect().Top()+pA->GetRect().Bottom())/2;
-                fdx=(double)(pA->GetStartPoint().X()-aCenter.X());
-                fdy=(double)(pA->GetStartPoint().Y()-aCenter.Y());
-                fdx*=(double)pA->GetRect().GetHeight();
-                fdy*=(double)pA->GetRect().GetWidth();
-                if (fdx==0.0 && fdy==0.0) fdx=1.0;
-                fa1=atan2(-fdy,fdx);
-                fdx=(double)(pA->GetEndPoint().X()-aCenter.X());
-                fdy=(double)(pA->GetEndPoint().Y()-aCenter.Y());
-                fdx*=(double)pA->GetRect().GetHeight();
-                fdy*=(double)pA->GetRect().GetWidth();
-                if (fdx==0.0 && fdy==0.0) fdx=1.0;
-                fa2=atan2(-fdy,fdx);
-                aStartPos.X()=aCenter.X()+(long)(((double)pA->GetRect().GetWidth())*cos(fa1)/2.0+0.5);
-                aStartPos.Y()=aCenter.Y()-(long)(((double)pA->GetRect().GetHeight())*sin(fa1)/2.0+0.5);
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDILineColor );
-                    METSetArcParams(pA->GetRect().GetWidth(), pA->GetRect().GetHeight(),0,0);
-                    METBeginPath(1);
-                    METMove(aStartPos);
-                    METPartialArcAtCurPos(aCenter,0.5,fa1,fa2-fa1);
-                    METEndPath();
-                    METOutlinePath(1);
-                }
-            }
-            break;
-
-            case META_PIE_ACTION:
-            {
-                const MetaPieAction*    pA = (const MetaPieAction*) pMA;
-                Point                   aCenter;
-                double                  fdx,fdy,fa1,fa2;
-
-                aCenter.X()=(pA->GetRect().Left()+pA->GetRect().Right())/2;
-                aCenter.Y()=(pA->GetRect().Top()+pA->GetRect().Bottom())/2;
-                fdx=(double)(pA->GetStartPoint().X()-aCenter.X());
-                fdy=(double)(pA->GetStartPoint().Y()-aCenter.Y());
-                fdx*=(double)pA->GetRect().GetHeight();
-                fdy*=(double)pA->GetRect().GetWidth();
-                if (fdx==0.0 && fdy==0.0) fdx=1.0;
-                fa1=atan2(-fdy,fdx);
-                fdx=(double)(pA->GetEndPoint().X()-aCenter.X());
-                fdy=(double)(pA->GetEndPoint().Y()-aCenter.Y());
-                fdx*=(double)pA->GetRect().GetHeight();
-                fdy*=(double)pA->GetRect().GetWidth();
-                if (fdx==0.0 && fdy==0.0) fdx=1.0;
-                fa2=atan2(-fdy,fdx);
-
-                METSetArcParams(pA->GetRect().GetWidth(), pA->GetRect().GetHeight(),0,0);
-
-                if( aGDIFillColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDIFillColor );
-                    METSetBackgroundColor( aGDIFillColor );
-                    METBeginPath(1);
-                    METMove(aCenter);
-                    METPartialArcAtCurPos(aCenter,0.5,fa1,fa2-fa1);
-                    METLineAtCurPos(aCenter);
-                    METEndPath();
-                    METFillPath(1);
-                }
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDILineColor );
-                    METBeginPath(1);
-                    METMove(aCenter);
-                    METPartialArcAtCurPos(aCenter,0.5,fa1,fa2-fa1);
-                    METLineAtCurPos(aCenter);
-                    METEndPath();
-                    METOutlinePath(1);
-                }
-            }
-            break;
-
-            case META_CHORD_ACTION:
-            {
-                const MetaChordAction*  pA = (const MetaChordAction*) pMA;
-                Point                   aStartPos,aCenter;
-                double                  fdx,fdy,fa1,fa2;
-
-                aCenter.X()=(pA->GetRect().Left()+pA->GetRect().Right())/2;
-                aCenter.Y()=(pA->GetRect().Top()+pA->GetRect().Bottom())/2;
-                fdx=(double)(pA->GetStartPoint().X()-aCenter.X());
-                fdy=(double)(pA->GetStartPoint().Y()-aCenter.Y());
-                fdx*=(double)pA->GetRect().GetHeight();
-                fdy*=(double)pA->GetRect().GetWidth();
-                if (fdx==0.0 && fdy==0.0) fdx=1.0;
-                fa1=atan2(-fdy,fdx);
-                fdx=(double)(pA->GetEndPoint().X()-aCenter.X());
-                fdy=(double)(pA->GetEndPoint().Y()-aCenter.Y());
-                fdx*=(double)pA->GetRect().GetHeight();
-                fdy*=(double)pA->GetRect().GetWidth();
-                if (fdx==0.0 && fdy==0.0) fdx=1.0;
-                fa2=atan2(-fdy,fdx);
-                aStartPos.X()=aCenter.X()+(long)(((double)pA->GetRect().GetWidth())*cos(fa1)/2.0+0.5);
-                aStartPos.Y()=aCenter.Y()-(long)(((double)pA->GetRect().GetHeight())*sin(fa1)/2.0+0.5);
-
-                if( aGDIFillColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDIFillColor );
-                    METSetBackgroundColor( aGDIFillColor );
-                    METBeginPath(1);
-                    METMove(aStartPos);
-                    METPartialArcAtCurPos(aCenter,0.5,fa1,fa2-fa1);
-                    METLineAtCurPos(aStartPos);
-                    METEndPath();
-                    METFillPath(1);
-                }
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix( eGDIRasterOp );
-                    METSetColor( aGDILineColor );
-                    METBeginPath(1);
-                    METMove(aStartPos);
-                    METPartialArcAtCurPos(aCenter,0.5,fa1,fa2-fa1);
-                    METLineAtCurPos(aStartPos);
-                    METEndPath();
-                    METOutlinePath(1);
-                }
-            }
-            break;
-
-            case META_POLYLINE_ACTION:
-            {
-                const MetaPolyLineAction* pA = (const MetaPolyLineAction*) pMA;
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    LineInfo aLineInfo( pA->GetLineInfo() );
-                    if ( ! ( aLineInfo.IsDefault() ) )
-                        METSetAndPushLineInfo( aLineInfo );
-
-                    METSetMix(eGDIRasterOp);
-                    METSetColor(aGDILineColor);
-                    METBeginPath(1);
-                    Polygon aSimplePoly;
-                    const Polygon& rPoly = pA->GetPolygon();
-                    if ( rPoly.HasFlags() )
-                        rPoly.AdaptiveSubdivide( aSimplePoly );
-                    else
-                        aSimplePoly = rPoly;
-                    METLine( aSimplePoly );
-                    METEndPath();
-                    METOutlinePath(1);
-
-                    if ( ! ( aLineInfo.IsDefault() ) )
-                        METPopLineInfo( aLineInfo );
-                }
-            }
-            break;
-
-            case META_POLYGON_ACTION:
-            {
-                const MetaPolygonAction* pA = (const MetaPolygonAction*) pMA;
-                Polygon aSimplePoly;
-                const Polygon& rPoly = pA->GetPolygon();
-                if ( rPoly.HasFlags() )
-                    rPoly.AdaptiveSubdivide( aSimplePoly );
-                else
-                    aSimplePoly = rPoly;
-                if( aGDIFillColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix(eGDIRasterOp);
-                    METSetColor(aGDIFillColor );
-                    METSetBackgroundColor(aGDIFillColor );
-                    METBeginPath(1);
-                    METLine( aSimplePoly );
-                    METEndPath();
-                    METFillPath(1);
-                }
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix(eGDIRasterOp);
-                    METSetColor(aGDILineColor );
-                    METBeginPath(1);
-                    METLine( aSimplePoly );
-                    METEndPath();
-                    METOutlinePath(1);
-                }
-            }
-            break;
-
-            case META_POLYPOLYGON_ACTION:
-            {
-                const MetaPolyPolygonAction* pA = (const MetaPolyPolygonAction*) pMA;
-
-                PolyPolygon aSimplePolyPoly( pA->GetPolyPolygon() );
-                sal_uInt16 i, nCount = aSimplePolyPoly.Count();
-                for ( i = 0; i < nCount; i++ )
-                {
-                    if ( aSimplePolyPoly[ i ].HasFlags() )
-                    {
-                        Polygon aSimplePoly;
-                        aSimplePolyPoly[ i ].AdaptiveSubdivide( aSimplePoly );
-                        aSimplePolyPoly[ i ] = aSimplePoly;
-                    }
-                }
-                if( aGDIFillColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix(eGDIRasterOp);
-                    METSetColor(aGDIFillColor);
-                    METSetBackgroundColor(aGDIFillColor);
-                    METBeginPath(1);
-                    METLine( aSimplePolyPoly );
-                    METEndPath();
-                    METFillPath(1);
-                }
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix(eGDIRasterOp);
-                    METSetColor(aGDILineColor);
-                    METBeginPath(1);
-                    METLine( aSimplePolyPoly );
-                    METEndPath();
-                    METOutlinePath(1);
-                }
-            }
-            break;
-
-            case META_TEXT_ACTION:
-            {
-                const MetaTextAction*   pA = (const MetaTextAction*) pMA;
-                Point                   aPt( pA->GetPoint() );
-
-                if( aGDIFont.GetAlign() != ALIGN_BASELINE)
-                {
-                    VirtualDevice aVDev;
-
-                    if( aGDIFont.GetAlign()==ALIGN_TOP )
-                        aPt.Y()+=(long)aVDev.GetFontMetric( aGDIFont ).GetAscent();
-                    else
-                        aPt.Y()-=(long)aVDev.GetFontMetric( aGDIFont ).GetDescent();
-                }
-
-                METSetMix(eGDIRasterOp);
-                METSetColor(aGDIFont.GetColor());
-                METSetBackgroundColor(aGDIFont.GetFillColor());
-                METSetChrCellSize(aGDIFont.GetSize());
-                METSetChrAngle(aGDIFont.GetOrientation());
-                METSetChrSet(FindChrSet(aGDIFont));
-                METChrStr(aPt, String(pA->GetText(),pA->GetIndex(),pA->GetLen()));
-            }
-            break;
-
-            case META_TEXTARRAY_ACTION:
-            {
-                const MetaTextArrayAction*  pA = (const MetaTextArrayAction*) pMA;
-                USHORT                      i;
-                String                      aStr;
-                Polygon                     aPolyDummy(1);
-                short                       nOrientation;
-                Point                       aPt( pA->GetPoint() );
-
-                if( aGDIFont.GetAlign() != ALIGN_BASELINE )
-                {
-                    VirtualDevice aVDev;
-                    if( aGDIFont.GetAlign() == ALIGN_TOP )
-                        aPt.Y()+=(long)aVDev.GetFontMetric(aGDIFont).GetAscent();
-                    else
-                        aPt.Y()-=(long)aVDev.GetFontMetric(aGDIFont).GetDescent();
-                }
-
-                METSetMix(eGDIRasterOp);
-                METSetColor(aGDIFont.GetColor());
-                METSetBackgroundColor(aGDIFont.GetFillColor());
-                METSetChrCellSize(aGDIFont.GetSize());
-                METSetChrAngle( nOrientation = aGDIFont.GetOrientation() );
-                METSetChrSet(FindChrSet(aGDIFont));
-                aStr=String(pA->GetText(),pA->GetIndex(),pA->GetLen());
-
-                if( pA->GetDXArray()!=NULL )
-                {
-                    Point aPt2;
-
-                    for( i=0; i < aStr.Len(); i++ )
-                    {
-                        aPt2 = aPt;
-                        if ( i > 0 )
-                        {
-                            aPt2.X() += pA->GetDXArray()[i-1];
-                            if ( nOrientation )
-                            {
-                                aPolyDummy.SetPoint( aPt2, 0 );
-                                aPolyDummy.Rotate( aPt, nOrientation );
-                                aPt2 = aPolyDummy.GetPoint( 0 );
-                            }
-                        }
-                        METChrStr( aPt2, String( aStr.GetChar( i ) ) );
-                    }
-                }
-                else
-                    METChrStr( aPt, aStr );
-            }
-            break;
-
-            case META_STRETCHTEXT_ACTION:
-            {
-                const MetaStretchTextAction*    pA = (const MetaStretchTextAction*) pMA;
-                VirtualDevice                   aVDev;
-                USHORT                          i;
-                sal_Int32*                  pDXAry;
-                sal_Int32                       nNormSize;
-                String                          aStr;
-                Polygon                         aPolyDummy(1);
-                short                           nOrientation;
-                Point                           aPt( pA->GetPoint() );
-                Point                           aPt2;
-
-                aVDev.SetFont( aGDIFont );
-
-                if( aGDIFont.GetAlign() != ALIGN_BASELINE)
-                {
-                    if( aGDIFont.GetAlign() == ALIGN_TOP )
-                        aPt.Y()+=(long)aVDev.GetFontMetric().GetAscent();
-                    else
-                        aPt.Y()-=(long)aVDev.GetFontMetric().GetDescent();
-                }
-
-                METSetMix(eGDIRasterOp);
-                METSetColor(aGDIFont.GetColor());
-                METSetBackgroundColor(aGDIFont.GetFillColor());
-                METSetChrCellSize(aGDIFont.GetSize());
-                METSetChrAngle( nOrientation = aGDIFont.GetOrientation() );
-                METSetChrSet(FindChrSet(aGDIFont));
-                aStr=String(pA->GetText(),pA->GetIndex(),pA->GetLen());
-                pDXAry=new sal_Int32[aStr.Len()];
-                nNormSize = aVDev.GetTextArray( aStr, pDXAry );
-
-                for ( i = 0; i < aStr.Len(); i++ )
-                {
-                    aPt2 = aPt;
-                    if ( i > 0 )
-                    {
-                        aPt2.X() += pDXAry[i-1]*((long)pA->GetWidth())/ nNormSize;
-                        if ( nOrientation )
-                        {
-                            aPolyDummy.SetPoint( aPt2, 0 );
-                            aPolyDummy.Rotate( aPt, nOrientation );
-                            aPt2 = aPolyDummy.GetPoint( 0 );
-                        }
-                    }
-                    METChrStr( aPt2, String( aStr.GetChar( i ) ) );
-                }
-
-                delete[] pDXAry;
-            }
-            break;
-
-            case META_TEXTRECT_ACTION:
-            {
-//              DBG_ERROR( "Unsupported MET-Action: META_TEXTRECT_ACTION!" );
-            }
-            break;
-
-            case META_BMP_ACTION:
-            {
-                const MetaBmpAction* pA = (const MetaBmpAction*) pMA;
-
-                METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetPoint(), pA->GetBitmap().GetSizePixel(), pA->GetBitmap() );
-            }
-            break;
-
-            case META_BMPSCALE_ACTION:
-            {
-                const MetaBmpScaleAction* pA = (const MetaBmpScaleAction*) pMA;
-
-                METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetPoint(), pA->GetSize(), pA->GetBitmap() );
-            }
-            break;
-
-            case META_BMPSCALEPART_ACTION:
-            {
-                const MetaBmpScalePartAction*   pA = (const MetaBmpScalePartAction*) pMA;
-                Bitmap                          aTmp( pA->GetBitmap() );
-
-                aTmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) );
-                METSetMix( eGDIRasterOp );
-                METBitBlt( pA->GetDestPoint(), pA->GetDestSize(), aTmp );
-            }
-            break;
-
-            case META_BMPEX_ACTION:
-            {
-                const MetaBmpExAction*  pA = (const MetaBmpExAction*) pMA;
-                Bitmap                  aTmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
-
-                METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetPoint(), aTmp.GetSizePixel(), aTmp );
-            }
-            break;
-
-            case META_BMPEXSCALE_ACTION:
-            {
-                const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pMA;
-                Bitmap                      aTmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
-
-                METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetPoint(), pA->GetSize(), aTmp );
-            }
-            break;
-
-            case META_BMPEXSCALEPART_ACTION:
-            {
-                const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pMA;
-                Bitmap                          aTmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
-
-                aTmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) );
-                METSetMix(eGDIRasterOp);
-                METBitBlt( pA->GetDestPoint(), pA->GetDestSize(), aTmp );
-            }
-            break;
-
-            case META_EPS_ACTION :
-            {
-                const MetaEPSAction* pA = (const MetaEPSAction*)pMA;
-                const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
-
-                INT32 nCount = aGDIMetaFile.GetActionCount();
-                for ( INT32 i = 0; i < nCount; i++ )
-                {
-                    const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
-                    if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
-                    {
-                        const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*)pMetaAct;
-                        METSetMix(eGDIRasterOp);
-                        METBitBlt( pA->GetPoint(), pA->GetSize(), pBmpScaleAction->GetBitmap() );
-                        break;
-                    }
-                }
-            }
-            break;
-
-            case META_MASK_ACTION:
-            {
-//              DBG_ERROR( "Unsupported MET-Action: META_MASK_ACTION!" );
-            }
-            break;
-
-            case META_MASKSCALE_ACTION:
-            {
-//              DBG_ERROR( "Unsupported MET-Action: META_MASKSCALE_ACTION!" );
-            }
-            break;
-
-            case META_MASKSCALEPART_ACTION:
-            {
-//              DBG_ERROR( "Unsupported MET-Action: META_MASKSCALEPART_ACTION!" );
-            }
-            break;
-
-            case META_GRADIENT_ACTION:
-            {
-                VirtualDevice               aVDev;
-                GDIMetaFile                 aTmpMtf;
-                const MetaGradientAction*   pA = (const MetaGradientAction*) pMA;
-
-                aVDev.SetMapMode( aTargetMapMode );
-                aVDev.AddGradientActions( pA->GetRect(), pA->GetGradient(), aTmpMtf );
-                WriteOrders( &aTmpMtf );
-            }
-            break;
-
-            case META_HATCH_ACTION:
-            {
-                VirtualDevice           aVDev;
-                GDIMetaFile             aTmpMtf;
-                const MetaHatchAction*  pA = (const MetaHatchAction*) pMA;
-
-                aVDev.SetMapMode( aTargetMapMode );
-                aVDev.AddHatchActions( pA->GetPolyPolygon(), pA->GetHatch(), aTmpMtf );
-                WriteOrders( &aTmpMtf );
-            }
-            break;
-
-            case META_WALLPAPER_ACTION:
-            {
-//              DBG_ERROR( "Unsupported MET-Action: META_WALLPAPER_ACTION!" );
-            }
-            break;
-
-            case META_CLIPREGION_ACTION:
-            {
-//              DBG_ERROR( "Unsupported MET-Action: META_CLIPREGION_ACTION!" );
-            }
-            break;
-
-            case META_ISECTRECTCLIPREGION_ACTION:
-            {
-                const MetaISectRectClipRegionAction* pA = (const MetaISectRectClipRegionAction*) pMA;
-                WriteClipRect( pA->GetRect() );
-            }
-            break;
-
-            case META_ISECTREGIONCLIPREGION_ACTION:
-            {
-//              DBG_ERROR( "Unsupported MET-Action: META_ISECTREGIONCLIPREGION_ACTION!" );
-            }
-            break;
-
-            case META_MOVECLIPREGION_ACTION:
-            {
-//              DBG_ERROR( "Unsupported MET-Action: META_MOVECLIPREGION_ACTION!" );
-            }
-            break;
-
-            case META_LINECOLOR_ACTION:
-            {
-                const MetaLineColorAction* pA = (const MetaLineColorAction*) pMA;
-
-                if( pA->IsSetting() )
-                    aGDILineColor = pA->GetColor();
-                else
-                    aGDILineColor = Color( COL_TRANSPARENT );
-            }
-            break;
-
-            case META_FILLCOLOR_ACTION:
-            {
-                const MetaFillColorAction* pA = (const MetaFillColorAction*) pMA;
-
-                if( pA->IsSetting() )
-                    aGDIFillColor = pA->GetColor();
-                else
-                    aGDIFillColor = Color( COL_TRANSPARENT );
-            }
-            break;
-
-            case META_TEXTCOLOR_ACTION:
-            {
-                const MetaTextColorAction* pA = (const MetaTextColorAction*) pMA;
-                aGDIFont.SetColor( pA->GetColor() );
-            }
-            break;
-
-            case META_TEXTFILLCOLOR_ACTION:
-            {
-                const MetaTextFillColorAction* pA = (const MetaTextFillColorAction*) pMA;
-
-                if( pA->IsSetting() )
-                    aGDIFont.SetFillColor( pA->GetColor() );
-                else
-                    aGDIFont.SetFillColor( Color( COL_TRANSPARENT ) );
-            }
-            break;
-
-            case META_TEXTALIGN_ACTION:
-            {
-//              DBG_ERROR( "Unsupported MET-Action: META_TEXTALIGN_ACTION!" );
-            }
-            break;
-
-            case META_MAPMODE_ACTION:
-            {
-                const MetaMapModeAction* pA = (const MetaMapModeAction*) pMA;
-
-                if( aPictureMapMode != pA->GetMapMode() )
-                {
-                    if ( pA->GetMapMode().GetMapUnit() == MAP_RELATIVE )
-                    {
-                        MapMode aMM = pA->GetMapMode();
-                        Fraction aScaleX = aMM.GetScaleX();
-                        Fraction aScaleY = aMM.GetScaleY();
-
-                        Point aOrigin = aPictureMapMode.GetOrigin();
-                        BigInt aX( aOrigin.X() );
-                        aX *= BigInt( aScaleX.GetDenominator() );
-
-                        if( aOrigin.X() >= 0 )
-                        {
-                            if( aScaleX.GetNumerator() >= 0 )
-                                aX += BigInt( aScaleX.GetNumerator()/2 );
-                            else
-                                aX -= BigInt( (aScaleX.GetNumerator()+1)/2 );
-                        }
-                        else
-                        {
-                            if( aScaleX.GetNumerator() >= 0 )
-                                aX -= BigInt( (aScaleX.GetNumerator()-1)/2 );
-                            else
-                                aX += BigInt( aScaleX.GetNumerator()/2 );
-                        }
-
-                        aX /= BigInt( aScaleX.GetNumerator() );
-                        aOrigin.X() = (long) aX + aMM.GetOrigin().X();
-
-                        BigInt aY( aOrigin.Y() );
-                        aY *= BigInt( aScaleY.GetDenominator() );
-
-                        if( aOrigin.Y() >= 0 )
-                        {
-                            if( aScaleY.GetNumerator() >= 0 )
-                                aY += BigInt( aScaleY.GetNumerator()/2 );
-                            else
-                                aY -= BigInt( (aScaleY.GetNumerator()+1)/2 );
-                        }
-                        else
-                        {
-                            if( aScaleY.GetNumerator() >= 0 )
-                                aY -= BigInt( (aScaleY.GetNumerator()-1)/2 );
-                            else
-                                aY += BigInt( aScaleY.GetNumerator()/2 );
-                        }
-
-                        aY /= BigInt( aScaleY.GetNumerator() );
-                        aOrigin.Y() = (long)aY + aMM.GetOrigin().Y();
-                        aPictureMapMode.SetOrigin( aOrigin );
-
-                        aScaleX *= aPictureMapMode.GetScaleX();
-                        aScaleY *= aPictureMapMode.GetScaleY();
-                        aPictureMapMode.SetScaleX( aScaleX );
-                        aPictureMapMode.SetScaleY( aScaleY );
-                    }
-                    else
-                        aPictureMapMode=pA->GetMapMode();
-                }
-            }
-            break;
-
-            case META_FONT_ACTION:
-            {
-                aGDIFont = ( (const MetaFontAction*) pMA )->GetFont();
-            }
-            break;
-
-            case META_PUSH_ACTION:
-            {
-                METGDIStackMember* pGS = new METGDIStackMember;
-
-                pGS->pSucc=pGDIStack; pGDIStack=pGS;
-                pGS->aLineColor=aGDILineColor;
-                pGS->aFillColor=aGDIFillColor;
-                pGS->eRasterOp=eGDIRasterOp;
-                pGS->aFont=aGDIFont;
-                pGS->aMapMode=aPictureMapMode;
-                pGS->aClipRect=aGDIClipRect;
-            }
-            break;
-
-            case META_POP_ACTION:
-            {
-                METGDIStackMember* pGS;
-
-                if( pGDIStack )
-                {
-                    pGS=pGDIStack; pGDIStack=pGS->pSucc;
-                    aGDILineColor=pGS->aLineColor;
-                    aGDIFillColor=pGS->aFillColor;
-                    eGDIRasterOp=pGS->eRasterOp;
-                    aGDIFont=pGS->aFont;
-                    if ( pGS->aClipRect != aGDIClipRect )
-                        WriteClipRect( pGS->aClipRect );
-                    aPictureMapMode=pGS->aMapMode;
-                    delete pGS;
-                }
-            }
-            break;
-
-            case META_RASTEROP_ACTION:
-            {
-                eGDIRasterOp = ( (const MetaRasterOpAction*) pMA )->GetRasterOp();
-            }
-            break;
-
-            case META_TRANSPARENT_ACTION:
-            {
-                if( aGDIFillColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix(eGDIRasterOp);
-                    METSetColor(aGDIFillColor);
-                    METSetBackgroundColor(aGDIFillColor);
-                    METBeginPath(1);
-                    METLine(( (const MetaTransparentAction*) pMA )->GetPolyPolygon());
-                    METEndPath();
-                    METFillPath(1);
-                }
-
-                if( aGDILineColor != Color( COL_TRANSPARENT ) )
-                {
-                    METSetMix(eGDIRasterOp);
-                    METSetColor(aGDILineColor);
-                    METBeginPath(1);
-                    METLine(( (const MetaTransparentAction*) pMA )->GetPolyPolygon());
-                    METEndPath();
-                    METOutlinePath(1);
-                }
-            }
-            break;
-
-            case META_FLOATTRANSPARENT_ACTION:
-            {
-                const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pMA;
-
-                GDIMetaFile     aTmpMtf( pA->GetGDIMetaFile() );
-                Point           aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
-                const Size      aSrcSize( aTmpMtf.GetPrefSize() );
-                const Point     aDestPt( pA->GetPoint() );
-                const Size      aDestSize( pA->GetSize() );
-                const double    fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0;
-                const double    fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0;
-                long            nMoveX, nMoveY;
-
-                if( fScaleX != 1.0 || fScaleY != 1.0 )
-                {
-                    aTmpMtf.Scale( fScaleX, fScaleY );
-                    aSrcPt.X() = FRound( aSrcPt.X() * fScaleX ), aSrcPt.Y() = FRound( aSrcPt.Y() * fScaleY );
-                }
-
-                nMoveX = aDestPt.X() - aSrcPt.X(), nMoveY = aDestPt.Y() - aSrcPt.Y();
-
-                if( nMoveX || nMoveY )
-                    aTmpMtf.Move( nMoveX, nMoveY );
-
-                WriteOrders( &aTmpMtf );
-            }
-            break;
-      }
-
-      nWrittenActions++;
-      MayCallback();
-
-      if( pMET->GetError() )
-        bStatus=FALSE;
-
-      if( bStatus == FALSE )
-        break;
-    }
-}
-
-void METWriter::WriteObjectEnvironmentGroup(const GDIMetaFile * pMTF)
-{
-    ULONG i, nId;
-
-    //--- Das Feld 'Begin Object Environment Group':
-    WriteFieldIntroducer(16,BegObjEnvMagic,0,0);
-    WriteFieldId(7);
-
-    //--- Das Feld 'Map Color Attribute Table':
-    WriteFieldIntroducer(22,MapColAtrMagic,0,0);
-    WriteBigEndianShort(0x000e);
-    *pMET << (BYTE)0x0c << (BYTE)0x02 << (BYTE)0x84 << (BYTE)0x00;
-    WriteFieldId(4);
-
-    //--- Das erste Feld 'Map Coded Font':
-    WriteFieldIntroducer(32,MapCodFntMagic,0,0);
-    WriteBigEndianShort(0x0018);
-    *pMET << (BYTE)0x0c << (BYTE)0x02 << (BYTE)0x84 << (BYTE)0x00;
-    *pMET << (BYTE)0xff << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00;
-    *pMET << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00 << (BYTE)0x00;
-    *pMET << (BYTE)0x04 << (BYTE)0x24 << (BYTE)0x05 << (BYTE)0x00;
-    *pMET << (BYTE)0x06 << (BYTE)0x20;
-    *pMET << (BYTE)0x03 << (BYTE)0x97 << (BYTE)0x01 << (BYTE)0xb5;
-
-    //--- Die weiteren Felder 'Map Coded Font':
-    CreateChrSets(pMTF);
-    WriteChrSets();
-
-    //--- Die Felder 'Map Data Resource':
-    nId=nActBitmapId;
-    for (i=0; i<nNumberOfBitmaps; i++)
-    {
-        WriteFieldIntroducer(29,MapDatResMagic,0,0);
-        WriteBigEndianShort(0x0015);
-        *pMET << (BYTE)0x0c << (BYTE)0x02 << (BYTE)0x84 << (BYTE)0x00;
-        WriteFieldId(nId);
-        *pMET << (BYTE)0x07 << (BYTE)0x22 << (BYTE)0x10;
-        *pMET << (sal_uInt32)nId;
-        nId++;
-    }
-
-    //--- Das Feld 'End Object Environment Group':
-    WriteFieldIntroducer(16,EndObjEnvMagic,0,0);
-    WriteFieldId(7);
-}
-
-
-void METWriter::WriteGraphicsObject(const GDIMetaFile * pMTF)
-{
-    ULONG nSegmentSize,nPos,nDataFieldsStartPos;
-
-    if( bStatus==FALSE )
-        return;
-
-    //--- Das Feld 'Begin Graphics Object':
-    WriteFieldIntroducer(16,BegGrfObjMagic,0,0);
-    WriteFieldId(7);
-
-    // Map Color Attribute Table, Fonts und anderes:
-    WriteObjectEnvironmentGroup(pMTF);
-
-    //--- Das Feld 'Graphics Data Descriptor':
-    WriteDataDescriptor(pMTF);
-
-    // Zaehler fuer Data Fields initialisieren:
-    nNumberOfDataFields=0;
-
-    // Und Position des ersten Data Fields merken:
-    nDataFieldsStartPos=pMET->Tell();
-
-    //--- Anfang des ersten Feldes 'Graphics Data'
-    WriteFieldIntroducer(0,DatGrfObjMagic,0,0);
-    nNumberOfDataFields++;
-
-    // Nun schreiben wir zunaechst den Kopf des Segments:
-    *pMET << (BYTE)0x70 << (BYTE)0x0e << (sal_uInt32)0;
-    *pMET << (BYTE)0x70 << (BYTE)0x10; // Flags
-    *pMET << (USHORT)0; // Lo-Wort der Laenge der Segementdaten (Big Endian)
-    *pMET << (sal_uInt32)0;  // Reserved
-    *pMET << (USHORT)0; // Hi-Wort der Laenge der Segementdaten (Big Endian) (Ohh Ohh OS2)
-    // Anmerkung: die richtige Daten-Laenge schreiben wir weiter unten nochmal
-
-    // Jetzt werden alle Orders rausgeschrieben:
-    // (wobei die Sache ggf. in mehrere 'Graphics Data Fields' aufgeteilt
-    // wird, per Methode WillWriteOrder(..))
-    WriteOrders(pMTF);
-
-    //--- Das letzte Feld 'Graphic Data' beenden:
-    UpdateFieldSize();
-
-    //--- Und schliesslich die Segmentgroesse richtigstellen:
-    nPos=pMET->Tell();
-    nSegmentSize=nPos-nDataFieldsStartPos;
-    nSegmentSize-=nNumberOfDataFields*8; // Structured Field Introducers zaehlen nicht mit
-    pMET->Seek(nDataFieldsStartPos+16); // Zum Lo-Wort der Segmentgroesse seeken
-    WriteBigEndianShort((USHORT)(nSegmentSize&0x0000ffff)); // Und schreiben
-    pMET->Seek(nDataFieldsStartPos+22); // Zum Hi-Wort der Segmentgroesse seeken
-    WriteBigEndianShort((USHORT)(nSegmentSize>>16)); // Und schreiben
-    pMET->Seek(nPos); // Zurueck zur Tagesordnung
-
-    //--- Das Feld 'End Graphic Objects':
-    WriteFieldIntroducer(16,EndGrfObjMagic,0,0);
-    WriteFieldId(7);
-
-    if( pMET->GetError() )
-        bStatus=FALSE;
-}
-
-
-void METWriter::WriteResourceGroup(const GDIMetaFile * pMTF)
-{
-    if( bStatus==FALSE )
-        return;
-
-    //--- Das Feld 'Begin Resource Group':
-    WriteFieldIntroducer(16,BegResGrpMagic,0,0);
-    WriteFieldId(2);
-
-    //--- Der Inhalt:
-    WriteColorAttributeTable();
-    nActBitmapId=0x77777700;
-    WriteImageObjects(pMTF);
-    nActBitmapId=0x77777700;
-    WriteGraphicsObject(pMTF);
-
-    //--- Das Feld 'End Resource Group':
-    WriteFieldIntroducer(16,EndResGrpMagic,0,0);
-    WriteFieldId(2);
-
-    if( pMET->GetError() )
-        bStatus=FALSE;
-}
-
-
-void METWriter::WriteDocument(const GDIMetaFile * pMTF)
-{
-    if( bStatus==FALSE )
-        return;
-
-    //--- Das Feld 'Begin Document':
-    WriteFieldIntroducer(0,BegDocumnMagic,0,0);
-    WriteFieldId(1);
-    *pMET << (BYTE)0x00 << (BYTE)0x00;
-    *pMET << (BYTE)0x05 << (BYTE)0x18 << (BYTE)0x03 << (BYTE)0x0c << (BYTE)0x00;
-    *pMET << (BYTE)0x06 << (BYTE)0x01 << (BYTE)0x03 << (BYTE)0xd4 << (BYTE)0x03 << (BYTE)0x52;
-    *pMET << (BYTE)0x03 << (BYTE)0x65 << (BYTE)0x00;
-    UpdateFieldSize();
-
-    //--- Der Inhalt:
-    WriteResourceGroup(pMTF);
-
-    //--- Das Feld 'End Document':
-    WriteFieldIntroducer(16,EndDocumnMagic,0,0);
-    WriteFieldId(1);
-
-    if( pMET->GetError() )
-        bStatus=FALSE;
-}
-
-BOOL METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem )
-{
-    if ( pFilterConfigItem )
-    {
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    METChrSet*          pCS;
-    METGDIStackMember*  pGS;
-
-    bStatus=TRUE;
-    nLastPercent=0;
-
-    pMET=&rTargetStream;
-    pMET->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
-
-    aPictureRect = Rectangle( Point(), rMTF.GetPrefSize() );
-    aTargetMapMode = aPictureMapMode = rMTF.GetPrefMapMode();
-
-    aGDILineColor=Color( COL_BLACK );
-    aGDIFillColor=Color( COL_WHITE );
-    eGDIRasterOp=ROP_OVERPAINT;
-    aGDIFont=Font();
-    aGDIMapMode=MapMode();
-    aGDIClipRect=Rectangle();
-    pGDIStack=NULL;
-    aMETColor=Color(COL_BLACK);
-    aMETBackgroundColor=Color(COL_WHITE);
-    eMETMix=ROP_OVERPAINT;
-    nMETStrokeLineWidth=1;
-    aMETChrCellSize=Size(0,0);
-    nMETChrAngle=0;
-    nMETChrSet=0x00;
-    pChrSetList=NULL;
-    nNextChrSetId=1;
-    nNumberOfActions=0;
-    nNumberOfBitmaps=0;
-    nWrittenActions=0;
-    nWrittenBitmaps=0;
-    nActBitmapPercent=0;
-
-    CountActionsAndBitmaps(&rMTF);
-
-    WriteDocument(&rMTF);
-
-    while( pChrSetList )
-    {
-        pCS=pChrSetList;
-        pChrSetList=pCS->pSucc;
-        delete pCS;
-    }
-
-    while( pGDIStack )
-    {
-        pGS=pGDIStack;
-        pGDIStack=pGS->pSucc;
-        delete pGS;
-    }
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return bStatus;
-}
-
-//================== GraphicExport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, BOOL )
-{   METWriter aMETWriter;
-
-    if ( rGraphic.GetType() == GRAPHIC_GDIMETAFILE )
-        return aMETWriter.WriteMET( rGraphic.GetGDIMetaFile(), rStream, pFilterConfigItem );
-    else
-    {
-        Bitmap aBmp=rGraphic.GetBitmap();
-        GDIMetaFile aMTF;
-        VirtualDevice aVirDev;
-
-        aMTF.Record(&aVirDev);
-        aVirDev.DrawBitmap(Point(),aBmp);
-        aMTF.Stop();
-        aMTF.SetPrefSize(aBmp.GetSizePixel());
-        return aMETWriter.WriteMET( aMTF, rStream, pFilterConfigItem );
-    }
-}
-
-//================== GraphicDialog - die exportierte Funktion ================
-
-extern "C" BOOL SAL_CALL DoExportDialog( FltCallDialogParameter& rPara )
-{
-    BOOL    bRet = FALSE;
-
-    if ( rPara.pWindow )
-    {
-        ByteString aResMgrName( "eme" );
-        ResMgr* pResMgr;
-
-        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
-        if( pResMgr )
-        {
-            rPara.pResMgr = pResMgr;
-            bRet = ( DlgExportEMET( rPara ).Execute() == RET_OK );
-            delete pResMgr;
-        }
-        else
-            bRet = TRUE;
-    }
-
-    return bRet;
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/eos2met/exports.map b/goodies/source/filter.vcl/eos2met/exports.map
deleted file mode 100644
index ce76d3850094..000000000000
--- a/goodies/source/filter.vcl/eos2met/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-METEXPORTER_1_0 {
-        global:
-                GraphicExport;
-                DoExportDialog;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/eos2met/makefile.mk b/goodies/source/filter.vcl/eos2met/makefile.mk
deleted file mode 100644
index 05f2f032e342..000000000000
--- a/goodies/source/filter.vcl/eos2met/makefile.mk
+++ /dev/null
@@ -1,78 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=eos2met
-TARGET2=eme
-DEPTARGET=veos2met
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES= 	dlgeos2.src	\
-            eos2mstr.src
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/eos2met.obj	\
-            $(SLO)$/dlgeos2.obj
-.ENDIF
-# ==========================================================================
-
-RESLIB1NAME=$(TARGET2)
-RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
-.IF "$(L10N_framework)"==""
-SHL1TARGET=     eme$(DLLPOSTFIX)
-SHL1IMPLIB=     eos2met
-SHL1STDLIBS=    $(TOOLSLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB)
-
-SHL1LIBS=       $(SLB)$/eos2met.lib
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/eos2met.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/goodies/source/filter.vcl/eos2met/strings.hrc b/goodies/source/filter.vcl/eos2met/strings.hrc
deleted file mode 100644
index fe559eb8a2a9..000000000000
--- a/goodies/source/filter.vcl/eos2met/strings.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: strings.hrc,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.
- *
- ************************************************************************/
-#define KEY_MODE            260
-#define KEY_SIZE            261
-
diff --git a/goodies/source/filter.vcl/epbm/dlgepbm.cxx b/goodies/source/filter.vcl/epbm/dlgepbm.cxx
deleted file mode 100644
index e43c40033025..000000000000
--- a/goodies/source/filter.vcl/epbm/dlgepbm.cxx
+++ /dev/null
@@ -1,102 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepbm.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#ifndef GCC
-#endif
-
-#include <tools/ref.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include <vcl/msgbox.hxx>
-#include "dlgepbm.hxx"
-#include "dlgepbm.hrc"
-#include "strings.hrc"
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportEPBM::DlgExportEPBM( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_EPBM, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aGrpFormat          ( this, ResId( GRP_FORMAT, *rPara.pResMgr ) ),
-                aRBRaw              ( this, ResId( RB_RAW, *rPara.pResMgr ) ),
-                aRBASCII            ( this, ResId( RB_ASCII, *rPara.pResMgr ) ),
-                aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr )
-{
-    FreeResource();
-
-    // Config-Parameter lesen
-
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PBM" ) );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-    sal_Int32   nFormat = pConfigItem->ReadInt32( String( ResId( KEY_FORMAT, *pMgr ) ), 1 );
-
-    BOOL bCheck = FALSE;
-    if ( !nFormat )
-        bCheck ^= TRUE;
-
-    aRBRaw.Check( bCheck );
-    bCheck ^= TRUE;
-    aRBASCII.Check( bCheck );
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportEPBM, OK ) );
-}
-
-DlgExportEPBM::~DlgExportEPBM()
-{
-    delete pConfigItem;
-}
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEPBM, OK, void *, EMPTYARG )
-{
-
-    // Config-Parameter schreiben
-    sal_Int32 nFormat = 0;
-    if ( aRBASCII.IsChecked() )
-        nFormat++;
-    pConfigItem->WriteInt32( String( ResId( KEY_FORMAT, *pMgr ) ), nFormat );
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
diff --git a/goodies/source/filter.vcl/epbm/dlgepbm.hrc b/goodies/source/filter.vcl/epbm/dlgepbm.hrc
deleted file mode 100644
index 8c68bc82aee5..000000000000
--- a/goodies/source/filter.vcl/epbm/dlgepbm.hrc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepbm.hrc,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.
- *
- ************************************************************************/
-#include "goodies.hrc"
-
-#define BTN_OK      1
-#define BTN_CANCEL  1
-#define BTN_HELP    1
-#define GRP_FORMAT  1
-#define RB_RAW      1
-#define RB_ASCII    2
diff --git a/goodies/source/filter.vcl/epbm/dlgepbm.hxx b/goodies/source/filter.vcl/epbm/dlgepbm.hxx
deleted file mode 100644
index d6580007449e..000000000000
--- a/goodies/source/filter.vcl/epbm/dlgepbm.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepbm.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.
- *
- ************************************************************************/
-
-
-#ifndef _DLGEPBM_HXX_
-#define _DLGEPBM_HXX_
-#include <svtools/fltcall.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <svtools/stdctrl.hxx>
-
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen
-|*
-\************************************************************************/
-
-class ResMgr;
-
-class FilterConfigItem;
-class DlgExportEPBM : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    FixedLine           aGrpFormat;
-    RadioButton         aRBRaw;
-    RadioButton         aRBASCII;
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
-
-    DECL_LINK( OK, void * );
-
-public:
-            DlgExportEPBM( FltCallDialogParameter& rPara );
-            ~DlgExportEPBM();
-};
-
-#endif // _DLGEPBM_HXX_
diff --git a/goodies/source/filter.vcl/epbm/dlgepbm.src b/goodies/source/filter.vcl/epbm/dlgepbm.src
deleted file mode 100644
index 8ef55fc096b6..000000000000
--- a/goodies/source/filter.vcl/epbm/dlgepbm.src
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepbm.src,v $
- * $Revision: 1.21 $
- *
- * 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 "dlgepbm.hrc"
-ModalDialog DLG_EXPORT_EPBM
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 133 , 63 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Text [ en-US ] = "PBM Options" ;
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 73 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 73 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 73 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine GRP_FORMAT
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "File format";
-    };
-    RadioButton RB_RAW
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Binary";
-    };
-    RadioButton RB_ASCII
-    {
-        Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Text";
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/goodies/source/filter.vcl/epbm/epbm.cxx b/goodies/source/filter.vcl/epbm/epbm.cxx
deleted file mode 100644
index a624e7f45cfb..000000000000
--- a/goodies/source/filter.vcl/epbm/epbm.cxx
+++ /dev/null
@@ -1,275 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: epbm.cxx,v $
- * $Revision: 1.12 $
- *
- * 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_goodies.hxx"
-
-#include <vcl/svapp.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <vcl/msgbox.hxx>
-#include <svl/solar.hrc>
-#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include "strings.hrc"
-#include "dlgepbm.hrc"
-#include "dlgepbm.hxx"
-
-//============================ PBMWriter ==================================
-
-class PBMWriter {
-
-private:
-
-    SvStream*           mpOStm;             // Die auszugebende PBM-Datei
-    USHORT              mpOStmOldModus;
-
-    BOOL                mbStatus;
-    sal_Int32           mnMode;             // 0 -> raw, 1-> ascii
-    BitmapReadAccess*   mpAcc;
-    ULONG               mnWidth, mnHeight;  // Bildausmass in Pixeln
-
-    BOOL                ImplWriteHeader();
-    void                ImplWriteBody();
-    void                ImplWriteNumber( sal_Int32 );
-
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-public:
-                        PBMWriter();
-                        ~PBMWriter();
-
-    BOOL                WritePBM( const Graphic& rGraphic, SvStream& rPBM, FilterConfigItem* pFilterConfigItem );
-};
-
-//=================== Methoden von PBMWriter ==============================
-
-PBMWriter::PBMWriter() :
-    mbStatus    ( TRUE ),
-    mpAcc       ( NULL )
-{
-}
-
-// ------------------------------------------------------------------------
-
-PBMWriter::~PBMWriter()
-{
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PBMWriter::WritePBM( const Graphic& rGraphic, SvStream& rPBM, FilterConfigItem* pFilterConfigItem )
-{
-
-    mpOStm = &rPBM;
-
-    if ( pFilterConfigItem )
-    {
-        mnMode = pFilterConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FileFormat" ) ), 0 );
-
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    BitmapEx    aBmpEx( rGraphic.GetBitmapEx() );
-    Bitmap      aBmp = aBmpEx.GetBitmap();
-    aBmp.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
-
-    mpOStmOldModus = mpOStm->GetNumberFormatInt();
-    mpOStm->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-
-    mpAcc = aBmp.AcquireReadAccess();
-    if( mpAcc )
-    {
-        if ( ImplWriteHeader() )
-            ImplWriteBody();
-
-        aBmp.ReleaseAccess( mpAcc );
-    }
-    else
-        mbStatus = FALSE;
-
-    mpOStm->SetNumberFormatInt( mpOStmOldModus );
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PBMWriter::ImplWriteHeader()
-{
-    mnWidth = mpAcc->Width();
-    mnHeight = mpAcc->Height();
-    if ( mnWidth && mnHeight )
-    {
-        if ( mnMode == 0 )
-            *mpOStm << "P4\x0a";
-        else
-            *mpOStm << "P1\x0a";
-
-        ImplWriteNumber( mnWidth );
-        *mpOStm << (BYTE)32;
-        ImplWriteNumber( mnHeight );
-        *mpOStm << (BYTE)10;
-    }
-    else mbStatus = FALSE;
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void PBMWriter::ImplWriteBody()
-{
-    if ( mnMode == 0 )
-    {
-        BYTE    nBYTE = 0;
-        for ( ULONG y = 0; y < mnHeight; y++ )
-        {
-            ULONG x;
-            for ( x = 0; x < mnWidth; x++ )
-            {
-                nBYTE <<= 1;
-                if (!(mpAcc->GetPixel( y, x ) & 1 ) )
-                    nBYTE++;
-                if ( ( x & 7 ) == 7 )
-                    *mpOStm << nBYTE;
-            }
-            if ( ( x & 7 ) != 0 )
-                *mpOStm << (BYTE)( nBYTE << ( ( x ^ 7 ) + 1 ) );
-        }
-    }
-    else
-    {
-        int nxCount;
-        for ( ULONG y = 0; y < mnHeight; y++ )
-        {
-            nxCount = 70;
-            for ( ULONG x = 0; x < mnWidth; x++ )
-            {
-                if (!( --nxCount ) )
-                {
-                    nxCount = 69;
-                    *mpOStm << (BYTE)10;
-                }
-                *mpOStm << (BYTE)( ( mpAcc->GetPixel( y, x ) ^ 1 ) + '0' ) ;
-            }
-            *mpOStm << (BYTE)10;
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-
-void PBMWriter::ImplWriteNumber( sal_Int32 nNumber )
-{
-    const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
-    for( sal_Int16 n = 0, nLen = aNum.Len(); n < nLen; n++ )
-        *mpOStm << aNum.GetChar( n );
-
-}
-
-// ------------------------------------------------------------------------
-
-// ---------------------
-// - exported function -
-// ---------------------
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, BOOL )
-{
-    PBMWriter aPBMWriter;
-
-    return aPBMWriter.WritePBM( rGraphic, rStream, pFilterConfigItem );
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" BOOL __LOADONCALLAPI DoExportDialog( FltCallDialogParameter& rPara )
-{
-    BOOL bRet = FALSE;
-
-    if ( rPara.pWindow )
-    {
-        ByteString  aResMgrName( "epb" );
-        ResMgr* pResMgr;
-
-        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
-        if( pResMgr )
-        {
-            rPara.pResMgr = pResMgr;
-            bRet = ( DlgExportEPBM( rPara ).Execute() == RET_OK );
-            delete pResMgr;
-        }
-        else
-            bRet = TRUE;
-    }
-
-    return bRet;
-}
-
-// ------------------------------------------------------------------------
-#ifndef GCC
-#endif
-
-// ---------------
-// - Win16 trash -
-// ---------------
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-    if ( nHeap )
-        UnlockData( 0 );
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/epbm/epbmstr.src b/goodies/source/filter.vcl/epbm/epbmstr.src
deleted file mode 100644
index 9fd48e8e5063..000000000000
--- a/goodies/source/filter.vcl/epbm/epbmstr.src
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: epbmstr.src,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.
- *
- ************************************************************************/
-
-
-#include "strings.hrc"
-
-// Key fuer den Dialog
-String KEY_FORMAT
-{
-    Text = "FileFormat";
-};
diff --git a/goodies/source/filter.vcl/epbm/exports.map b/goodies/source/filter.vcl/epbm/exports.map
deleted file mode 100644
index 2d09b0bdb752..000000000000
--- a/goodies/source/filter.vcl/epbm/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-PBMEXPORTER_1_0 {
-        global:
-                GraphicExport;
-                DoExportDialog;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/epbm/makefile.mk b/goodies/source/filter.vcl/epbm/makefile.mk
deleted file mode 100644
index f4411d04e0fd..000000000000
--- a/goodies/source/filter.vcl/epbm/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=epbm
-TARGET2=epb
-DEPTARGET=vepbm
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES=	dlgepbm.src \
-            epbmstr.src
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/epbm.obj \
-            $(SLO)$/dlgepbm.obj
-.ENDIF
-# ==========================================================================
-
-RESLIB1NAME=$(TARGET2)
-RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
-.IF "$(L10N_framework)"==""
-SHL1TARGET= 	epb$(DLLPOSTFIX)
-SHL1IMPLIB= 	epbm
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(CPPULIB)	$(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/epbm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/epbm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/goodies/source/filter.vcl/epbm/strings.hrc b/goodies/source/filter.vcl/epbm/strings.hrc
deleted file mode 100644
index 1e280524839a..000000000000
--- a/goodies/source/filter.vcl/epbm/strings.hrc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: strings.hrc,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.
- *
- ************************************************************************/
-#define KEY_FORMAT  256
diff --git a/goodies/source/filter.vcl/epgm/dlgepgm.cxx b/goodies/source/filter.vcl/epgm/dlgepgm.cxx
deleted file mode 100644
index 13b63d6a21f7..000000000000
--- a/goodies/source/filter.vcl/epgm/dlgepgm.cxx
+++ /dev/null
@@ -1,100 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepgm.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#ifndef GCC
-#endif
-
-#include <tools/ref.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include <vcl/msgbox.hxx>
-#include "dlgepgm.hxx"
-#include "dlgepgm.hrc"
-#include "strings.hrc"
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportEPGM::DlgExportEPGM( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_EPGM, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aGrpFormat          ( this, ResId( GRP_FORMAT, *rPara.pResMgr ) ),
-                aRBRaw              ( this, ResId( RB_RAW, *rPara.pResMgr ) ),
-                aRBASCII            ( this, ResId( RB_ASCII, *rPara.pResMgr ) ),
-                aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr )
-{
-    FreeResource();
-
-    // Config-Parameter lesen
-
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PGM" ) );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-    sal_Int32   nFormat = pConfigItem->ReadInt32( String( ResId( KEY_FORMAT, *pMgr ) ), 0 );
-
-    BOOL bCheck = FALSE;
-    if ( !nFormat )
-        bCheck ^= TRUE;
-    aRBRaw.Check( bCheck );
-    bCheck ^= TRUE;
-    aRBASCII.Check( bCheck );
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportEPGM, OK ) );
-}
-
-DlgExportEPGM::~DlgExportEPGM()
-{
-    delete pConfigItem;
-}
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEPGM, OK, void *, EMPTYARG )
-{
-    // Config-Parameter schreiben
-    sal_Int32 nFormat = 0;
-    if ( aRBASCII.IsChecked() )
-        nFormat++;
-    pConfigItem->WriteInt32( String( ResId( KEY_FORMAT, *pMgr ) ), nFormat );
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
diff --git a/goodies/source/filter.vcl/epgm/dlgepgm.hrc b/goodies/source/filter.vcl/epgm/dlgepgm.hrc
deleted file mode 100644
index 6239e4450ecd..000000000000
--- a/goodies/source/filter.vcl/epgm/dlgepgm.hrc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepgm.hrc,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.
- *
- ************************************************************************/
-#include "goodies.hrc"
-
-#define BTN_OK      1
-#define BTN_CANCEL  1
-#define BTN_HELP    1
-#define GRP_FORMAT  1
-#define RB_RAW      1
-#define RB_ASCII    2
diff --git a/goodies/source/filter.vcl/epgm/dlgepgm.hxx b/goodies/source/filter.vcl/epgm/dlgepgm.hxx
deleted file mode 100644
index 9a8f8b4df158..000000000000
--- a/goodies/source/filter.vcl/epgm/dlgepgm.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepgm.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.
- *
- ************************************************************************/
-
-
-#ifndef _DLGEPGM_HXX_
-#define _DLGEPGM_HXX_
-#include <svtools/fltcall.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <svtools/stdctrl.hxx>
-
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen
-|*
-\************************************************************************/
-
-class FilterConfigItem;
-class ResMgr;
-
-class DlgExportEPGM : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    FixedLine           aGrpFormat;
-    RadioButton         aRBRaw;
-    RadioButton         aRBASCII;
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
-
-    DECL_LINK( OK, void * );
-
-public:
-            DlgExportEPGM( FltCallDialogParameter& rPara );
-            ~DlgExportEPGM();
-};
-
-#endif // _DLGEPGM_HXX_
diff --git a/goodies/source/filter.vcl/epgm/dlgepgm.src b/goodies/source/filter.vcl/epgm/dlgepgm.src
deleted file mode 100644
index 4933b6750e7a..000000000000
--- a/goodies/source/filter.vcl/epgm/dlgepgm.src
+++ /dev/null
@@ -1,108 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepgm.src,v $
- * $Revision: 1.25 $
- *
- * 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 "dlgepgm.hrc"
-ModalDialog DLG_EXPORT_EPGM
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 133 , 63 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Text [ en-US ] = "PGM Options" ;
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 73 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 73 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 73 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine GRP_FORMAT
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "File format";
-    };
-    RadioButton RB_RAW
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Binary";
-    };
-    RadioButton RB_ASCII
-    {
-        Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Text";
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/goodies/source/filter.vcl/epgm/epgm.cxx b/goodies/source/filter.vcl/epgm/epgm.cxx
deleted file mode 100644
index 32d6e74a5cfe..000000000000
--- a/goodies/source/filter.vcl/epgm/epgm.cxx
+++ /dev/null
@@ -1,300 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: epgm.cxx,v $
- * $Revision: 1.12 $
- *
- * 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_goodies.hxx"
-
-#include <vcl/svapp.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <vcl/msgbox.hxx>
-#include <svl/solar.hrc>
-#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include "strings.hrc"
-#include "dlgepgm.hrc"
-#include "dlgepgm.hxx"
-
-//============================ PGMWriter ==================================
-
-class PGMWriter {
-
-private:
-
-    SvStream*           mpOStm;             // Die auszugebende PGM-Datei
-    USHORT              mpOStmOldModus;
-
-    BOOL                mbStatus;
-    UINT32              mnMode;
-    BitmapReadAccess*   mpAcc;
-    ULONG               mnWidth, mnHeight;  // Bildausmass in Pixeln
-
-    BOOL                ImplWriteHeader();
-    void                ImplWriteBody();
-    void                ImplWriteNumber( sal_Int32 );
-
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-public:
-                        PGMWriter();
-                        ~PGMWriter();
-
-    BOOL                WritePGM( const Graphic& rGraphic, SvStream& rPGM, FilterConfigItem* pFilterConfigItem );
-};
-
-//=================== Methoden von PGMWriter ==============================
-
-PGMWriter::PGMWriter() :
-    mbStatus    ( TRUE ),
-    mpAcc       ( NULL )
-{
-}
-
-// ------------------------------------------------------------------------
-
-PGMWriter::~PGMWriter()
-{
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PGMWriter::WritePGM( const Graphic& rGraphic, SvStream& rPGM, FilterConfigItem* pFilterConfigItem )
-{
-
-    mpOStm = &rPGM;
-
-    if ( pFilterConfigItem )
-    {
-        mnMode = pFilterConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FileFormat" ) ), 0 );
-
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    BitmapEx    aBmpEx( rGraphic.GetBitmapEx() );
-    Bitmap      aBmp = aBmpEx.GetBitmap();
-    aBmp.Convert( BMP_CONVERSION_8BIT_GREYS );
-
-    mpOStmOldModus = mpOStm->GetNumberFormatInt();
-    mpOStm->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-
-    mpAcc = aBmp.AcquireReadAccess();
-    if( mpAcc )
-    {
-        if ( ImplWriteHeader() )
-        {
-            ImplWriteBody();
-        }
-        aBmp.ReleaseAccess( mpAcc );
-    }
-    else
-        mbStatus = FALSE;
-
-    mpOStm->SetNumberFormatInt( mpOStmOldModus );
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PGMWriter::ImplWriteHeader()
-{
-    mnWidth = mpAcc->Width();
-    mnHeight = mpAcc->Height();
-    if ( mnWidth && mnHeight )
-    {
-        if ( mnMode == 0 )
-            *mpOStm << "P5\x0a";
-        else
-            *mpOStm << "P2\x0a";
-
-        ImplWriteNumber( mnWidth );
-        *mpOStm << (BYTE)32;
-        ImplWriteNumber( mnHeight );
-        *mpOStm << (BYTE)32;
-        ImplWriteNumber( 255 );         // max. gray value
-        *mpOStm << (BYTE)10;
-    }
-    else
-        mbStatus = FALSE;
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void PGMWriter::ImplWriteBody()
-{
-    if ( mnMode == 0 )
-    {
-        for ( ULONG y = 0; y < mnHeight; y++ )
-        {
-            for ( ULONG x = 0; x < mnWidth; x++ )
-            {
-                *mpOStm << (BYTE)( mpAcc->GetPixel( y, x ) );
-            }
-        }
-    }
-    else
-    {
-        for ( ULONG y = 0; y < mnHeight; y++ )
-        {
-            int nCount = 70;
-            for ( ULONG x = 0; x < mnWidth; x++ )
-            {
-                BYTE nDat, nNumb;
-                if ( nCount < 0 )
-                {
-                    nCount = 69;
-                    *mpOStm << (BYTE)10;
-                }
-                nDat = (BYTE)mpAcc->GetPixel( y, x );
-                nNumb = nDat / 100;
-                if ( nNumb )
-                {
-                    *mpOStm << (BYTE)( nNumb + '0' );
-                    nDat -= ( nNumb * 100 );
-                    nNumb = nDat / 10;
-                    *mpOStm << (BYTE)( nNumb + '0' );
-                    nDat -= ( nNumb * 10 );
-                    *mpOStm << (BYTE)( nDat + '0' );
-                    nCount -= 4;
-                }
-                else
-                {
-                    nNumb = nDat / 10;
-                    if ( nNumb )
-                    {
-                        *mpOStm << (BYTE)( nNumb + '0' );
-                        nDat -= ( nNumb * 10 );
-                        *mpOStm << (BYTE)( nDat + '0' );
-                        nCount -= 3;
-                    }
-                    else
-                    {
-                        *mpOStm << (BYTE)( nDat + '0' );
-                        nCount -= 2;
-                    }
-                }
-                *mpOStm << (BYTE)' ';
-            }
-            *mpOStm << (BYTE)10;
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-
-void PGMWriter::ImplWriteNumber( sal_Int32 nNumber )
-{
-    const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
-    for( sal_Int16 n = 0UL, nLen = aNum.Len(); n < nLen; n++  )
-        *mpOStm << aNum.GetChar( n );
-
-}
-
-// ------------------------------------------------------------------------
-
-// ---------------------
-// - exported function -
-// ---------------------
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, BOOL )
-{
-    PGMWriter aPGMWriter;
-
-    return aPGMWriter.WritePGM( rGraphic, rStream, pFilterConfigItem );
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" BOOL __LOADONCALLAPI DoExportDialog( FltCallDialogParameter& rPara )
-{
-    BOOL bRet = FALSE;
-
-    if ( rPara.pWindow )
-    {
-        ByteString  aResMgrName( "epg" );
-        ResMgr* pResMgr;
-
-        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
-        if( pResMgr )
-        {
-            rPara.pResMgr = pResMgr;
-            bRet = ( DlgExportEPGM( rPara ).Execute() == RET_OK );
-            delete pResMgr;
-        }
-        else
-            bRet = TRUE;
-    }
-
-    return bRet;
-}
-
-// ------------------------------------------------------------------------
-#ifndef GCC
-#endif
-
-// ---------------
-// - Win16 trash -
-// ---------------
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-    if ( nHeap )
-        UnlockData( 0 );
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/epgm/epgmstr.src b/goodies/source/filter.vcl/epgm/epgmstr.src
deleted file mode 100644
index b91380ae2797..000000000000
--- a/goodies/source/filter.vcl/epgm/epgmstr.src
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: epgmstr.src,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.
- *
- ************************************************************************/
-
-
-#include "strings.hrc"
-
-// Key fuer den Dialog
-String KEY_FORMAT
-{
-    Text = "FileFormat";
-};
diff --git a/goodies/source/filter.vcl/epgm/exports.map b/goodies/source/filter.vcl/epgm/exports.map
deleted file mode 100644
index 3967c4684f05..000000000000
--- a/goodies/source/filter.vcl/epgm/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-PGMEXPORTER_1_0 {
-        global:
-                GraphicExport;
-                DoExportDialog;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/epgm/makefile.mk b/goodies/source/filter.vcl/epgm/makefile.mk
deleted file mode 100644
index 579ee6858a78..000000000000
--- a/goodies/source/filter.vcl/epgm/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=epgm
-TARGET2=epg
-DEPTARGET=vepgm
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES=	dlgepgm.src \
-            epgmstr.src
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/epgm.obj \
-            $(SLO)$/dlgepgm.obj
-.ENDIF
-# ==========================================================================
-
-RESLIB1NAME=$(TARGET2)
-RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
-.IF "$(L10N_framework)"==""
-SHL1TARGET= 	epg$(DLLPOSTFIX)
-SHL1IMPLIB= 	epgm
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/epgm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/epgm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/goodies/source/filter.vcl/epgm/strings.hrc b/goodies/source/filter.vcl/epgm/strings.hrc
deleted file mode 100644
index 1e280524839a..000000000000
--- a/goodies/source/filter.vcl/epgm/strings.hrc
+++ /dev/null
@@ -1,30 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: strings.hrc,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.
- *
- ************************************************************************/
-#define KEY_FORMAT  256
diff --git a/goodies/source/filter.vcl/epict/dlgepct.cxx b/goodies/source/filter.vcl/epict/dlgepct.cxx
deleted file mode 100644
index dd9f0c8a716f..000000000000
--- a/goodies/source/filter.vcl/epict/dlgepct.cxx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepct.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#ifndef GCC
-#endif
-
-#include <vcl/msgbox.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include <com/sun/star/awt/Size.hpp>
-#include "dlgepct.hxx"
-#include "dlgepct.hrc"
-#include "strings.hrc"
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportEPCT::DlgExportEPCT( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_EPCT, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                aRbOriginal         ( this, ResId( RB_ORIGINAL, *rPara.pResMgr ) ),
-                aRbSize             ( this, ResId( RB_SIZE, *rPara.pResMgr ) ),
-                aGrpMode            ( this, ResId( GRP_MODE, *rPara.pResMgr ) ),
-                aFtSizeX            ( this, ResId( FT_SIZEX, *rPara.pResMgr ) ),
-                aMtfSizeX           ( this, ResId( MTF_SIZEX, *rPara.pResMgr ) ),
-                aFtSizeY            ( this, ResId( FT_SIZEY, *rPara.pResMgr ) ),
-                aMtfSizeY           ( this, ResId( MTF_SIZEY, *rPara.pResMgr ) ),
-                aGrpSize            ( this, ResId( GRP_SIZE, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr )
-{
-    FreeResource();
-
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PCT" ) );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportEPCT, OK ) );
-    aRbOriginal.SetClickHdl( LINK( this, DlgExportEPCT, ClickRbOriginal ) );
-    aRbSize.SetClickHdl( LINK( this, DlgExportEPCT, ClickRbSize ) );
-
-    // Config-Parameter lesen
-    sal_Int32 nStrMode = pConfigItem->ReadInt32( String( ResId( KEY_MODE, *pMgr ) ), 0 );
-    ::com::sun::star::awt::Size aDefault( 10000, 10000 );
-    ::com::sun::star::awt::Size aSize;
-    aSize = pConfigItem->ReadSize( String( ResId( KEY_SIZE, *pMgr ) ), aDefault );
-
-    aMtfSizeX.SetDefaultUnit( FUNIT_MM );
-    aMtfSizeY.SetDefaultUnit( FUNIT_MM );
-    aMtfSizeX.SetValue( aSize.Width );
-    aMtfSizeY.SetValue( aSize.Height );
-
-    switch ( rPara.eFieldUnit )
-    {
-        case FUNIT_NONE :
-        case FUNIT_KM :
-        case FUNIT_PERCENT :
-        case FUNIT_CUSTOM :
-        case FUNIT_MILE :
-        case FUNIT_FOOT :
-        case FUNIT_M :
-            break;  // -Wall not handled.
-        case FUNIT_MM :
-        case FUNIT_CM :
-        case FUNIT_TWIP :
-        case FUNIT_POINT :
-        case FUNIT_PICA :
-        case FUNIT_INCH :
-        case FUNIT_100TH_MM :
-        {
-            aMtfSizeX.SetUnit( rPara.eFieldUnit );
-            aMtfSizeY.SetUnit( rPara.eFieldUnit );
-        }
-        break;
-    }
-    if ( nStrMode == 1 )
-    {
-        aRbSize.Check( TRUE );
-        ClickRbSize( NULL );
-    }
-    else
-    {
-        aRbOriginal.Check( TRUE );
-        ClickRbOriginal( NULL );
-    }
-}
-
-DlgExportEPCT::~DlgExportEPCT()
-{
-    delete pConfigItem;
-}
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\****************************************   ********************************/
-
-IMPL_LINK( DlgExportEPCT, OK, void *, EMPTYARG )
-{
-    // Config-Parameter schreiben
-    ::com::sun::star::awt::Size aSize(
-        (sal_Int32)MetricField::ConvertDoubleValue( aMtfSizeX.GetValue(), 2, aMtfSizeX.GetUnit(), MAP_100TH_MM ),
-            (sal_Int32)MetricField::ConvertDoubleValue( aMtfSizeY.GetValue(), 2, aMtfSizeY.GetUnit(), MAP_100TH_MM ) );
-
-    sal_Int32 nStrMode = 0;
-    if ( aRbSize.IsChecked() )
-        nStrMode++;
-
-    pConfigItem->WriteInt32( String( ResId( KEY_MODE, *pMgr ) ), nStrMode );
-    pConfigItem->WriteSize( String( ResId( KEY_SIZE, *pMgr ) ), aSize );
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEPCT, ClickRbOriginal, void*, EMPTYARG )
-{
-    aGrpSize.Disable();
-    aFtSizeX.Disable();
-    aMtfSizeX.Disable();
-    aFtSizeY.Disable();
-    aMtfSizeY.Disable();
-
-    return 0;
-}
-
-
-/*************************************************************************
-|*
-|* Enabled/Disabled Controls
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEPCT, ClickRbSize, void*, EMPTYARG )
-{
-    aGrpSize.Enable();
-    aFtSizeX.Enable();
-    aMtfSizeX.Enable();
-    aFtSizeY.Enable();
-    aMtfSizeY.Enable();
-
-    return 0;
-}
-
-
-
diff --git a/goodies/source/filter.vcl/epict/dlgepct.hrc b/goodies/source/filter.vcl/epict/dlgepct.hrc
deleted file mode 100644
index 32d817a7305b..000000000000
--- a/goodies/source/filter.vcl/epict/dlgepct.hrc
+++ /dev/null
@@ -1,44 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepct.hrc,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.
- *
- ************************************************************************/
-#include <goodies.hrc>
-
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define CBX_SIZE 2
-#define MTF_SIZEX 1
-#define MTF_SIZEY 2
-#define FT_SIZEX 1
-#define FT_SIZEY 2
-#define GRP_SIZE 1
-#define GRP_MODE 2
-#define RB_ORIGINAL 1
-#define RB_SIZE 2
-
diff --git a/goodies/source/filter.vcl/epict/dlgepct.hxx b/goodies/source/filter.vcl/epict/dlgepct.hxx
deleted file mode 100644
index b5cf3302c44a..000000000000
--- a/goodies/source/filter.vcl/epict/dlgepct.hxx
+++ /dev/null
@@ -1,83 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepct.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.
- *
- ************************************************************************/
-
-
-#ifndef _DLGEPCT_HXX_
-#define _DLGEPCT_HXX_
-
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <svtools/fltcall.hxx>
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen bei Vektorformaten
-|*
-\************************************************************************/
-
-class FilterConfigItem;
-class ResMgr;
-
-class DlgExportEPCT : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-    RadioButton         aRbOriginal;
-    RadioButton         aRbSize;
-    FixedLine           aGrpMode;
-
-    FixedText           aFtSizeX;
-    MetricField         aMtfSizeX;
-    FixedText           aFtSizeY;
-    MetricField         aMtfSizeY;
-    FixedLine           aGrpSize;
-
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
-
-    DECL_LINK( OK, void* p );
-    DECL_LINK( ClickRbOriginal,void* p );
-    DECL_LINK( ClickRbSize,void* p );
-
-public:
-            DlgExportEPCT( FltCallDialogParameter& rPara );
-            ~DlgExportEPCT();
-};
-
-#endif // _DLGEPCT_HXX_
-
diff --git a/goodies/source/filter.vcl/epict/dlgepct.src b/goodies/source/filter.vcl/epict/dlgepct.src
deleted file mode 100644
index a0a8020aa0cb..000000000000
--- a/goodies/source/filter.vcl/epict/dlgepct.src
+++ /dev/null
@@ -1,166 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgepct.src,v $
- * $Revision: 1.20 $
- *
- * 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 "dlgepct.hrc"
-
-ModalDialog DLG_EXPORT_EPCT
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 178 , 89 ) ;
-    Text [ en-US ] = "PICT Options" ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    MetricField MTF_SIZEX
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 55 ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 100 ;
-        Maximum = 99999 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_MM ;
-        First = 100 ;
-        Last = 99999 ;
-        SpinSize = 100 ;
-    };
-    MetricField MTF_SIZEY
-    {
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 60 , 71 ) ;
-        Size = MAP_APPFONT ( 50 , 12 ) ;
-        TabStop = TRUE ;
-        Repeat = TRUE ;
-        Spin = TRUE ;
-        Minimum = 100 ;
-        Maximum = 99999 ;
-        StrictFormat = TRUE ;
-        DecimalDigits = 2 ;
-        Unit = FUNIT_MM ;
-        First = 100 ;
-        Last = 99999 ;
-        SpinSize = 100 ;
-    };
-    FixedLine GRP_SIZE
-    {
-        Pos = MAP_APPFONT ( 6 , 44 ) ;
-        Size = MAP_APPFONT ( 110 , 8 ) ;
-        Text [ en-US ] = "Size" ;
-    };
-    FixedText FT_SIZEX
-    {
-        Pos = MAP_APPFONT ( 12 , 57 ) ;
-        Size = MAP_APPFONT ( 45 , 8 ) ;
-        Text [ en-US ] = "Width" ;
-    };
-    FixedText FT_SIZEY
-    {
-        Pos = MAP_APPFONT ( 12 , 73 ) ;
-        Size = MAP_APPFONT ( 45 , 8 ) ;
-        Text [ en-US ] = "Height" ;
-    };
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 122 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 122 , 24 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 122 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    RadioButton RB_ORIGINAL
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 98 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Original" ;
-    };
-    RadioButton RB_SIZE
-    {
-        Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 98 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Size" ;
-    };
-    FixedLine GRP_MODE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 110 , 8 ) ;
-        Text [ en-US ] = "Mode" ;
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/goodies/source/filter.vcl/epict/epict.cxx b/goodies/source/filter.vcl/epict/epict.cxx
deleted file mode 100644
index cd9e33edd5d9..000000000000
--- a/goodies/source/filter.vcl/epict/epict.cxx
+++ /dev/null
@@ -1,2390 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: epict.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <vcl/metaact.hxx>
-#include <svtools/filter.hxx>
-#include <svl/solar.hrc>
-#include <svtools/fltcall.hxx>
-
-#include <math.h>
-#include <vcl/bmpacc.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/hatch.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/font.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/gdimtf.hxx>
-
-#include <tools/bigint.hxx>
-#include "strings.hrc"
-#include "dlgepct.hrc"
-#include "dlgepct.hxx"
-
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
-
-//============================== PictWriter ===================================
-
-struct PictWriterAttrStackMember {
-    struct PictWriterAttrStackMember *  pSucc;
-    Color                               aLineColor;
-    Color                               aFillColor;
-    RasterOp                            eRasterOp;
-    Font                                aFont;
-    MapMode                             aMapMode;
-    Rectangle                           aClipRect;
-};
-
-
-enum PictDrawingMethod {
-    PDM_FRAME, PDM_PAINT, PDM_ERASE, PDM_INVERT, PDM_FILL
-};
-
-
-struct PictPattern {
-    sal_uInt32 nLo, nHi;
-};
-
-class PictWriter {
-
-private:
-
-    BOOL bStatus;
-    ULONG nLastPercent; // Mit welcher Zahl pCallback zuletzt aufgerufen wurde.
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-    SvStream * pPict;
-
-    // Aktuelle Attribute im Quell-Metafile:
-    Color       aLineColor;
-    Color       aFillColor;
-    RasterOp    eSrcRasterOp;
-    Font        aSrcFont;
-    MapMode     aSrcMapMode;
-    MapMode     aTargetMapMode;
-    Rectangle   aClipRect;
-    PictWriterAttrStackMember * pAttrStack;
-
-    // Aktuelle Attribute im Ziel-Metafile, und ob sie gueltig sind
-    BOOL        bDstBkPatVisible;   BOOL bDstBkPatValid;
-    BYTE        nDstTxFace;         BOOL bDstTxFaceValid;
-    RasterOp    eDstTxMode;         BOOL bDstTxModeValid;
-    USHORT      nDstPnSize;         BOOL bDstPnSizeValid;
-    RasterOp    eDstPnMode;         BOOL bDstPnModeValid;
-    PictPattern aDstPnPat;          BOOL bDstPnPatValid;
-    BOOL        bDstFillPatVisible; BOOL bDstFillPatValid;
-    USHORT      nDstTxSize;         BOOL bDstTxSizeValid;
-    Color       aDstFgCol;          BOOL bDstFgColValid;
-    Color       aDstBkCol;          BOOL bDstBkColValid;
-    Point       aDstPenPosition;    BOOL bDstPenPositionValid;
-    Point       aDstTextPosition;   BOOL bDstTextPositionValid;
-    String      aDstFontName; USHORT nDstFontNameId; BOOL bDstFontNameValid;
-
-    ULONG nNumberOfActions;  // Anzahl der Actions im GDIMetafile
-    ULONG nNumberOfBitmaps;  // Anzahl der Bitmaps
-    ULONG nWrittenActions;   // Anzahl der bereits verarbeiteten Actions beim Schreiben der Opcodes
-    ULONG nWrittenBitmaps;   // Anzahl der bereits geschriebenen Bitmaps
-    ULONG nActBitmapPercent; // Wieviel Prozent die naechste Bitmap schon geschrieben ist.
-
-    void MayCallback();
-        // Berechnet anhand der obigen 5 Parameter eine Prozentzahl
-        // und macht dann ggf. einen Callback. Setzt bStatus auf FALSE wenn User abbrechen
-        // moechte.
-
-    void CountActionsAndBitmaps(const GDIMetaFile & rMTF);
-        // Zaehlt die Bitmaps und Actions (nNumberOfActions und nNumberOfBitmaps muessen
-        // zu Anfang auf 0 gesetzt werden, weil diese Methode rekursiv ist)
-
-    Polygon PolyPolygonToPolygon(const PolyPolygon & rPoly);
-        // Macht aus einem PolyPolygon ein halbwegs vernuenftiges Polygon
-
-    Rectangle MapRectangle( const Rectangle& rRect );
-    void WritePoint(const Point & rPoint);
-    void WriteSize(const Size & rSize);
-    void WriteRGBColor(const Color & rColor);
-    void WriteString( const String & rString );
-    void WriteRectangle(const Rectangle & rRect);
-    void WritePolygon(const Polygon & rPoly);
-    void WriteArcAngles(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt);
-
-    void ConvertLinePattern(PictPattern & rPat, BOOL bVisible);
-    void ConvertFillPattern(PictPattern & rPat, BOOL bVisible);
-
-    void WriteOpcode_TxFace(const Font & rFont);
-    void WriteOpcode_TxMode(RasterOp eMode);
-    void WriteOpcode_PnSize(USHORT nSize);
-    void WriteOpcode_PnMode(RasterOp eMode);
-    void WriteOpcode_PnLinePat(BOOL bVisible);
-    void WriteOpcode_PnFillPat(BOOL bVisible);
-    void WriteOpcode_OvSize(const Size & rSize);
-    void WriteOpcode_TxSize(USHORT nSize);
-    void WriteOpcode_RGBFgCol(const Color & rColor);
-    void WriteOpcode_RGBBkCol(const Color & rColor);
-    void WriteOpcode_Line(const Point & rLocPt, const Point & rNewPt);
-    void WriteOpcode_LineFrom(const Point & rNewPt);
-    void WriteOpcode_Text(const Point & rPoint, const String& rString, BOOL bDelta);
-    void WriteOpcode_FontName(const Font & rFont);
-    void WriteOpcode_ClipRect( const Rectangle& rRect );
-    void WriteOpcode_Rect(PictDrawingMethod eMethod, const Rectangle & rRect);
-    void WriteOpcode_SameRect(PictDrawingMethod eMethod);
-    void WriteOpcode_RRect(PictDrawingMethod eMethod, const Rectangle & rRect);
-    void WriteOpcode_SameRRect(PictDrawingMethod eMethod);
-    void WriteOpcode_Oval(PictDrawingMethod eMethod, const Rectangle & rRect);
-    void WriteOpcode_SameOval(PictDrawingMethod eMethod);
-    void WriteOpcode_Arc(PictDrawingMethod eMethod, const Rectangle & rRect,
-                         const Point & rStartPt, const Point & rEndPt);
-    void WriteOpcode_SameArc(PictDrawingMethod eMethod, const Rectangle & rRect,
-                             const Point & rStartPt, const Point & rEndPt);
-    void WriteOpcode_Poly(PictDrawingMethod eMethod, const Polygon & rPoly);
-    void WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, const Bitmap & rBitmap);
-    void WriteOpcode_EndOfFile();
-
-    void SetAttrForPaint();
-    void SetAttrForFrame();
-    void SetAttrForText();
-
-    void WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry);
-
-    void HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon);
-    void WriteOpcodes(const GDIMetaFile & rMTF);
-
-    void WriteHeader(const GDIMetaFile & rMTF);
-    void UpdateHeader();
-
-public:
-
-    BOOL WritePict( const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pFilterConfigItem );
-};
-
-
-//========================== Methoden von PictWriter ==========================
-
-
-void PictWriter::MayCallback()
-{
-    if ( xStatusIndicator.is() )
-    {
-        ULONG nPercent;
-        nPercent=((nWrittenBitmaps<<14)+(nActBitmapPercent<<14)/100+nWrittenActions)
-                *100
-                /((nNumberOfBitmaps<<14)+nNumberOfActions);
-
-        if (nPercent>=nLastPercent+3)
-        {
-            nLastPercent=nPercent;
-            if( nPercent<=100 )
-                xStatusIndicator->setValue( nPercent );
-        }
-    }
-}
-
-void PictWriter::CountActionsAndBitmaps(const GDIMetaFile & rMTF)
-{
-    ULONG               nAction, nActionCount;
-    const MetaAction*   pMA;
-
-    nActionCount = rMTF.GetActionCount();
-
-    for (nAction=0; nAction<nActionCount; nAction++)
-    {
-        pMA = rMTF.GetAction( nAction );
-
-        switch( pMA->GetType() )
-        {
-            case META_BMP_ACTION:
-            case META_BMPSCALE_ACTION:
-            case META_BMPSCALEPART_ACTION:
-            case META_BMPEX_ACTION:
-            case META_BMPEXSCALE_ACTION:
-            case META_BMPEXSCALEPART_ACTION:
-                nNumberOfBitmaps++;
-            break;
-        }
-
-        nNumberOfActions++;
-    }
-}
-
-
-Polygon PictWriter::PolyPolygonToPolygon(const PolyPolygon & rPolyPoly)
-{
-    USHORT nCount,nSize1,nSize2,np,i1,i2,i3,nBestIdx1,nBestIdx2;
-    long nDistSqr,nBestDistSqr, nCountdownTests;
-    Point aP1,aPRel;
-    Polygon aPoly1, aPoly2, aPoly3;
-
-    nCount=rPolyPoly.Count();
-    if (nCount==0) return Polygon(0);
-
-    aPoly1=rPolyPoly.GetObject(0);
-    for (np=1; np<nCount; np++) {
-        aPoly2=rPolyPoly.GetObject(np);
-
-        //-----------------Folgendes verschmilzt aPoly1 und aPoly2 zu aPoly1-----------------
-
-        nSize1=aPoly1.GetSize();
-        nSize2=aPoly2.GetSize();
-
-        // Zunaechst werden ein Punkt in aPoly1 (referenziert durch nBestIdx1) und ein
-        // Punkt in aPoly2 (referenziert durch nBestIdx2) gesucht, die moeglichst dicht
-        // beieinander liegen. Da dies mit quadratischem Aufwand einher geht, und somit
-        // manche Bilder Ewigkeiten benoetigen, um exportiert zu werden, begrenzen wir
-        // die Anzahl der Tests auf 1000, und brechen die Suche ggf. schon vorher ab.
-        // Dadruch wird das Ergebnis nicht falsch, sondern eventuell nicht so schoen.
-        nCountdownTests=1000;
-        nBestDistSqr=0x7fffffff;
-        nBestIdx1=0;
-        nBestIdx2=0;
-        for (i1=0; i1<nSize1; i1++) {
-            aP1=aPoly1.GetPoint(i1);
-            for (i2=0; i2<nSize2; i2++) {
-                aPRel=aPoly2.GetPoint(i2); aPRel-=aP1;
-                nDistSqr=aPRel.X()*aPRel.X()+aPRel.Y()*aPRel.Y();
-                if (nDistSqr<nBestDistSqr) {
-                    nBestIdx1=i1;
-                    nBestIdx2=i2;
-                    nBestDistSqr=nDistSqr;
-                }
-                if (nCountdownTests<=0) break;
-                nCountdownTests--;
-            }
-            if (nCountdownTests<=0) break;
-        }
-
-        // Nun werden aPoly1 und aPoly2 zu einem Polygon aPoly3 (spaeter aPoly1) zusammengefuegt.
-        // Die beiden Polygone werden verbunden durch zwei zusaetzliche Kanten zwischen den oben
-        // gefundenen Punkten.
-        aPoly3.Clear();
-        aPoly3.SetSize(nSize1+nSize2+2);
-        i3=0;
-        for (i1=nBestIdx1; i1<nSize1;     i1++) aPoly3.SetPoint(aPoly1.GetPoint(i1),i3++);
-        for (i1=0;         i1<=nBestIdx1; i1++) aPoly3.SetPoint(aPoly1.GetPoint(i1),i3++);
-        for (i2=nBestIdx2; i2<nSize2;     i2++) aPoly3.SetPoint(aPoly2.GetPoint(i2),i3++);
-        for (i2=0;         i2<=nBestIdx2; i2++) aPoly3.SetPoint(aPoly2.GetPoint(i2),i3++);
-
-        aPoly1=aPoly3;
-
-        //-----------------------------------------------------------------------------------
-
-    }
-    return aPoly1;
-}
-
-
-void PictWriter::WritePoint(const Point & rPoint)
-{
-    Point aPoint = OutputDevice::LogicToLogic( rPoint, aSrcMapMode, aTargetMapMode );
-    *pPict << ((short)aPoint.Y()) << ((short)aPoint.X());
-}
-
-
-void PictWriter::WriteSize(const Size & rSize)
-{
-    OutputDevice::LogicToLogic( rSize, aSrcMapMode, aTargetMapMode ); // -Wall is this needed.
-    *pPict << ((short)rSize.Height()) << ((short)rSize.Width());
-}
-
-
-void PictWriter::WriteRGBColor(const Color & rColor)
-{
-    const UINT16 nR = ( (UINT16) rColor.GetRed() << 8 ) | (UINT16) rColor.GetRed();
-    const UINT16 nG = ( (UINT16) rColor.GetGreen() << 8 ) | (UINT16) rColor.GetGreen();
-    const UINT16 nB = ( (UINT16) rColor.GetBlue() << 8 ) | (UINT16) rColor.GetBlue();
-
-    *pPict << nR << nG << nB;
-}
-
-
-void PictWriter::WriteString( const String & rString )
-{
-    USHORT i,nLen;
-
-    ByteString aByteString( rString, gsl_getSystemTextEncoding() );
-    nLen = aByteString.Len();
-    if ( nLen > 255 )
-        nLen = 255;
-    *pPict << ( (BYTE)nLen );
-    for ( i = 0; i < nLen; i++ )
-        *pPict << aByteString.GetChar( i );
-}
-
-Rectangle PictWriter::MapRectangle( const Rectangle& rRect )
-{
-    Point   aPoint = OutputDevice::LogicToLogic( rRect.TopLeft(), aSrcMapMode, aTargetMapMode );
-    Size    aSize = OutputDevice::LogicToLogic( rRect.GetSize(), aSrcMapMode, aTargetMapMode );
-    Rectangle aRect( aPoint, aSize );
-    aRect.Justify();
-    aRect.nBottom++;
-    aRect.nRight++;
-    return aRect;
-}
-
-void PictWriter::WriteRectangle(const Rectangle & rRect)
-{
-    Rectangle aRect( MapRectangle( rRect ) );
-    *pPict  << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left()
-            << (sal_Int16)aRect.Bottom() << (sal_Int16)aRect.Right();
-}
-
-void PictWriter::WritePolygon(const Polygon & rPoly)
-{
-    USHORT nDataSize,i,nSize;
-    short nMinX = 0, nMinY = 0, nMaxX = 0, nMaxY = 0;
-    short nx,ny;
-    Polygon aPoly(rPoly);
-
-    nSize=aPoly.GetSize();
-
-    if (aPoly.GetPoint(0) != aPoly.GetPoint(nSize-1))
-    {
-        nSize++;
-        aPoly.SetSize(nSize);
-        aPoly.SetPoint(aPoly.GetPoint(0),nSize-1);
-    }
-
-    nDataSize=nSize*4+10;
-    for (i=0; i<nSize; i++)
-    {
-        Point aPoint = OutputDevice::LogicToLogic( aPoly.GetPoint( i ),
-                                                   aSrcMapMode,
-                                                   aTargetMapMode );
-
-        nx = (short) aPoint.X();
-        ny = (short) aPoint.Y();
-
-        if ( i==0 || nMinX>nx )
-            nMinX=nx;
-        if ( i==0 || nMinY>ny )
-            nMinY=ny;
-        if ( i==0 || nMaxX<nx )
-            nMaxX=nx;
-        if ( i==0 || nMaxY<ny )
-            nMaxY=ny;
-    }
-
-    *pPict << nDataSize << nMinY << nMinX << nMaxY << nMaxX;
-
-    for (i=0; i<nSize; i++)
-        WritePoint( aPoly.GetPoint(i) );
-}
-
-
-void PictWriter::WriteArcAngles(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt)
-{
-    Point       aStartPt = OutputDevice::LogicToLogic( rStartPt,
-                                                       aSrcMapMode,
-                                                       aTargetMapMode );
-    Point       aEndPt = OutputDevice::LogicToLogic( rEndPt,
-                                                     aSrcMapMode,
-                                                     aTargetMapMode );
-    Rectangle   aRect( OutputDevice::LogicToLogic( rRect.TopLeft(),
-                                                   aSrcMapMode,
-                                                   aTargetMapMode ),
-                       OutputDevice::LogicToLogic( rRect.GetSize(),
-                                                   aSrcMapMode,
-                                                   aTargetMapMode ) );
-    Point aCenter;
-    double fAngS, fAngE, fdx, fdy;
-    short nStartAngle, nArcAngle;
-
-
-    aCenter=Point( ( aRect.Left() + aRect.Right() ) >> 1,
-                   ( aRect.Top() + aRect.Bottom() ) >> 1 );
-
-    fdx=(double)(aStartPt.X()-aCenter.X());
-    fdy=(double)(aStartPt.Y()-aCenter.Y());
-    if ( fdx==0.0 && fdy==0.0 )
-        fdx=1.0;
-    fAngE=atan2(fdx,-fdy);
-
-    fdx=(double)(aEndPt.X()-aCenter.X());
-    fdy=(double)(aEndPt.Y()-aCenter.Y());
-    if ( fdx==0.0 && fdy==0.0 )
-        fdx=1.0;
-    fAngS=atan2(fdx,-fdy);
-
-    nStartAngle=(short)(fAngS*180.0/3.14159265359);
-    nArcAngle=((short)(fAngE*180.0/3.14159265359))-nStartAngle;
-    if (nArcAngle<0)
-        nArcAngle += 360;
-    *pPict << nStartAngle << nArcAngle;
-}
-
-
-void PictWriter::ConvertLinePattern(PictPattern & rPat, BOOL bVisible)
-{
-    if( bVisible )
-    {
-        rPat.nHi=0xffffffff;
-        rPat.nLo=0xffffffff;
-    }
-    else
-    {
-        rPat.nHi=0x00000000;
-        rPat.nLo=0x00000000;
-    }
-}
-
-void PictWriter::ConvertFillPattern(PictPattern & rPat, BOOL bVisible)
-{
-    if( bVisible )
-    {
-        rPat.nHi=0xffffffff;
-        rPat.nLo=0xffffffff;
-    }
-    else
-    {
-        rPat.nHi=0x00000000;
-        rPat.nLo=0x00000000;
-    }
-}
-
-
-void PictWriter::WriteOpcode_TxFace(const Font & rFont)
-{
-    BYTE nFace;
-    FontWeight eWeight;
-
-    nFace=0;
-    eWeight=rFont.GetWeight();
-    if (eWeight==WEIGHT_BOLD ||
-        eWeight==WEIGHT_SEMIBOLD ||
-        eWeight==WEIGHT_ULTRABOLD ||
-        eWeight==WEIGHT_BLACK)                nFace|=0x01;
-    if (rFont.GetItalic()!=ITALIC_NONE)       nFace|=0x02;
-    if (rFont.GetUnderline()!=UNDERLINE_NONE) nFace|=0x04;
-    if (rFont.IsOutline()==TRUE)              nFace|=0x08;
-    if (rFont.IsShadow()==TRUE)               nFace|=0x10;
-
-    if (bDstTxFaceValid==FALSE || nDstTxFace!=nFace) {
-        *pPict << (USHORT)0x0004 << nFace << (BYTE)0;
-        nDstTxFace=nFace;
-        bDstTxFaceValid=TRUE;
-    }
-}
-
-
-void PictWriter::WriteOpcode_TxMode(RasterOp eMode)
-{
-    USHORT nVal;
-
-    if (bDstTxModeValid==FALSE || eDstTxMode!=eMode) {
-        switch (eMode) {
-            case ROP_INVERT: nVal=0x000c; break;
-            case ROP_XOR:    nVal=0x000a; break;
-            default:         nVal=0x0008;
-        }
-        *pPict << (USHORT)0x0005 << nVal;
-        eDstTxMode=eMode;
-        bDstTxModeValid=TRUE;
-    }
-}
-
-
-void PictWriter::WriteOpcode_PnSize(USHORT nSize)
-{
-    if (nSize==0) nSize=1;
-    if (bDstPnSizeValid==FALSE || nDstPnSize!=nSize) {
-        *pPict << (USHORT)0x0007 << nSize << nSize;
-        nDstPnSize=nSize;
-        bDstPnSizeValid=TRUE;
-    }
-}
-
-
-void PictWriter::WriteOpcode_PnMode(RasterOp eMode)
-{
-    USHORT nVal;
-
-    if (bDstPnModeValid==FALSE || eDstPnMode!=eMode) {
-        switch (eMode)
-        {
-            case ROP_INVERT: nVal=0x000c; break;
-            case ROP_XOR:    nVal=0x000a; break;
-            default:         nVal=0x0008;
-        }
-        *pPict << (USHORT)0x0008 << nVal;
-        eDstPnMode=eMode;
-        bDstPnModeValid=TRUE;
-    }
-}
-
-
-void PictWriter::WriteOpcode_PnLinePat(BOOL bVisible)
-{
-    PictPattern aPat;
-
-    ConvertLinePattern(aPat,bVisible);
-    if (bDstPnPatValid==FALSE || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) {
-        *pPict << (USHORT)0x0009 << aPat.nHi << aPat.nLo;
-        aDstPnPat=aPat;
-        bDstPnPatValid=TRUE;
-    }
-}
-
-
-void PictWriter::WriteOpcode_PnFillPat(BOOL bVisible)
-{
-    PictPattern aPat;
-
-    ConvertFillPattern(aPat,bVisible);
-    if (bDstPnPatValid==FALSE || aDstPnPat.nHi!=aPat.nHi || aDstPnPat.nLo!=aPat.nLo) {
-        *pPict << (USHORT)0x0009 << aPat.nHi << aPat.nLo;
-        aDstPnPat=aPat;
-        bDstPnPatValid=TRUE;
-    }
-}
-
-
-void PictWriter::WriteOpcode_OvSize(const Size & rSize)
-{
-    *pPict << (USHORT)0x000b;
-    WriteSize(rSize);
-}
-
-
-void PictWriter::WriteOpcode_TxSize(USHORT nSize)
-{
-    if (bDstTxSizeValid==FALSE || nDstTxSize!=nSize) {
-
-        nDstTxSize = (USHORT) OutputDevice::LogicToLogic( Size( 0, nSize ),
-                                                          aSrcMapMode, aTargetMapMode ).Height();
-
-        *pPict << (USHORT)0x000d << nDstTxSize;
-        bDstTxSizeValid=TRUE;
-    }
-}
-
-
-void PictWriter::WriteOpcode_RGBFgCol(const Color & rColor)
-{
-    if (bDstFgColValid==FALSE || aDstFgCol!=rColor) {
-        *pPict << (USHORT)0x001a;
-        WriteRGBColor(rColor);
-        aDstFgCol=rColor;
-        bDstFgColValid=TRUE;
-    }
-}
-
-
-void PictWriter::WriteOpcode_RGBBkCol(const Color & rColor)
-{
-    if (bDstBkColValid==FALSE || aDstBkCol!=rColor) {
-        *pPict << (USHORT)0x001b;
-        WriteRGBColor(rColor);
-        aDstBkCol=rColor;
-        bDstBkColValid=TRUE;
-    }
-}
-
-
-void PictWriter::WriteOpcode_Line(const Point & rLocPt, const Point & rNewPt)
-{
-    Point aLocPt = OutputDevice::LogicToLogic( rLocPt,
-                                               aSrcMapMode,
-                                               aTargetMapMode );
-    Point aNewPt = OutputDevice::LogicToLogic( rNewPt,
-                                               aSrcMapMode,
-                                               aTargetMapMode );
-    long  dh,dv;
-
-    dh=aNewPt.X()-aLocPt.X();
-    dv=aNewPt.Y()-aLocPt.Y();
-    if (dh<=127 && dh>=-128 && dv<=127 && dv>=-128)
-    { // ShortLine
-        *pPict << (USHORT)0x0022;
-        WritePoint(rLocPt);
-        *pPict << (char)dh << (char)dv;
-    }
-    else
-    {
-        *pPict << (USHORT)0x0020;
-        WritePoint(rLocPt);
-        WritePoint(rNewPt);
-    }
-    aDstPenPosition=rNewPt;
-    bDstPenPositionValid=TRUE;
-}
-
-
-void PictWriter::WriteOpcode_LineFrom(const Point & rNewPt)
-{
-    Point aNewPt = OutputDevice::LogicToLogic( rNewPt,
-                                               aSrcMapMode,
-                                               aTargetMapMode );
-    long  dh,dv;
-
-    dh = aNewPt.X()-aDstPenPosition.X();
-    dv = aNewPt.Y()-aDstPenPosition.Y();
-
-    if (dh<=127 && dh>=-128 && dv<=127 && dv>=-128)
-    { // ShortLine
-        *pPict << (USHORT)0x0023;
-        *pPict << (char)dh << (char)dv;
-    }
-    else
-    {
-        *pPict << (USHORT)0x0021;
-        WritePoint(rNewPt);
-    }
-    aDstPenPosition=rNewPt;
-    bDstPenPositionValid=TRUE;
-}
-
-
-void PictWriter::WriteOpcode_Text(const Point & rPoint, const String& rString, BOOL bDelta)
-{
-    Point aPoint = OutputDevice::LogicToLogic( rPoint,
-                                               aSrcMapMode,
-                                               aTargetMapMode );
-    long  dh,dv;
-    ULONG nPos;
-
-    nPos = pPict->Tell();
-    dh = aPoint.X()-aDstTextPosition.X();
-    dv = aPoint.Y()-aDstTextPosition.Y();
-
-    if (bDstTextPositionValid==FALSE || dh<0 || dh>255 || dv<0 || dv>0 || bDelta==FALSE)
-    {
-        *pPict << (USHORT)0x0028;
-        WritePoint(rPoint);
-    }
-    else if (dv==0)
-    {
-        *pPict << (USHORT)0x0029 << (BYTE)dh;
-    }
-    else if (dh==0)
-    {
-        *pPict << (USHORT)0x002a << (BYTE)dv;
-    }
-    else
-    {
-        *pPict << (USHORT)0x002b << (BYTE)dh << (BYTE)dv;
-    }
-
-    WriteString( rString );
-    if (((pPict->Tell()-nPos)&1)!=0)
-        *pPict << (BYTE)0;
-
-    aDstTextPosition = aPoint;
-    bDstTextPositionValid=TRUE;
-}
-
-
-void PictWriter::WriteOpcode_FontName(const Font & rFont)
-{
-    USHORT nDataLen,nFontId;
-
-    switch (rFont.GetFamily()) {
-        case FAMILY_MODERN:     nFontId=22; break;
-        case FAMILY_ROMAN:      nFontId=20; break;
-        case FAMILY_SWISS:      nFontId=21; break;
-        default:                nFontId=1;
-    }
-
-    if (bDstFontNameValid==FALSE || nDstFontNameId!=nFontId || aDstFontName!=rFont.GetName())
-    {
-        ByteString aByteString( rFont.GetName(), gsl_getSystemTextEncoding() );
-        sal_uInt16 nFontNameLen = aByteString.Len();
-        if ( nFontNameLen )
-        {
-            nDataLen = 3 + nFontNameLen;
-            *pPict << (USHORT)0x002c << nDataLen << nFontId;
-            WriteString( rFont.GetName() );
-            if ( ( nFontNameLen & 1 ) == 0 )
-                *pPict << (BYTE)0;
-        }
-        *pPict << (USHORT)0x0003 << nFontId;
-        aDstFontName=rFont.GetName();
-        nDstFontNameId=nFontId;
-        bDstFontNameValid=TRUE;
-    }
-}
-
-void PictWriter::WriteOpcode_ClipRect( const Rectangle& rRect )
-{
-    Rectangle aRect( MapRectangle( rRect ) );
-    aRect.nBottom++;
-    aRect.nRight++;
-    *pPict  << (sal_uInt16)1    // opcode 1
-            << (sal_uInt16)10   // data size
-            << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left()
-            << (sal_Int16)aRect.Bottom() << (sal_Int16)aRect.Right();
-    aClipRect = aRect;
-}
-
-void PictWriter::WriteOpcode_Rect(PictDrawingMethod eMethod, const Rectangle & rRect)
-{
-    USHORT oc;
-    switch (eMethod) {
-        case PDM_FRAME:  oc=0x0030; break;
-        case PDM_PAINT:  oc=0x0031; break;
-        case PDM_ERASE:  oc=0x0032; break;
-        case PDM_INVERT: oc=0x0033; break;
-        case PDM_FILL:   oc=0x0034; break;
-        default:         oc=0;      break;   // -Wall a default for oc...
-    }
-    *pPict << oc;
-    WriteRectangle(rRect);
-}
-
-
-void PictWriter::WriteOpcode_SameRect(PictDrawingMethod eMethod)
-{
-    USHORT oc;
-    switch (eMethod) {
-        case PDM_FRAME:  oc=0x0038; break;
-        case PDM_PAINT:  oc=0x0039; break;
-        case PDM_ERASE:  oc=0x003a; break;
-        case PDM_INVERT: oc=0x003b; break;
-        case PDM_FILL:   oc=0x003c; break;
-        default:         oc=0;      break;   // -Wall a default for oc...
-    }
-    *pPict << oc;
-}
-
-
-void PictWriter::WriteOpcode_RRect(PictDrawingMethod eMethod, const Rectangle & rRect)
-{
-    USHORT oc;
-    switch (eMethod) {
-        case PDM_FRAME:  oc=0x0040; break;
-        case PDM_PAINT:  oc=0x0041; break;
-        case PDM_ERASE:  oc=0x0042; break;
-        case PDM_INVERT: oc=0x0043; break;
-        case PDM_FILL:   oc=0x0044; break;
-        default:         oc=0;      break;   // -Wall a default for oc...
-    }
-    *pPict << oc;
-    WriteRectangle(rRect);
-}
-
-
-void PictWriter::WriteOpcode_SameRRect(PictDrawingMethod eMethod)
-{
-    USHORT oc;
-    switch (eMethod) {
-        case PDM_FRAME:  oc=0x0048; break;
-        case PDM_PAINT:  oc=0x0049; break;
-        case PDM_ERASE:  oc=0x004a; break;
-        case PDM_INVERT: oc=0x004b; break;
-        case PDM_FILL:   oc=0x004c; break;
-        default:         oc=0;      break;   // -Wall a default for oc...
-    }
-    *pPict << oc;
-}
-
-
-void PictWriter::WriteOpcode_Oval(PictDrawingMethod eMethod, const Rectangle & rRect)
-{
-    USHORT oc;
-    switch (eMethod) {
-        case PDM_FRAME:  oc=0x0050; break;
-        case PDM_PAINT:  oc=0x0051; break;
-        case PDM_ERASE:  oc=0x0052; break;
-        case PDM_INVERT: oc=0x0053; break;
-        case PDM_FILL:   oc=0x0054; break;
-        default:         oc=0;      break;   // -Wall a default for oc...
-    }
-    *pPict << oc;
-    WriteRectangle(rRect);
-}
-
-
-void PictWriter::WriteOpcode_SameOval(PictDrawingMethod eMethod)
-{
-    USHORT oc;
-    switch (eMethod) {
-        case PDM_FRAME:  oc=0x0058; break;
-        case PDM_PAINT:  oc=0x0059; break;
-        case PDM_ERASE:  oc=0x005a; break;
-        case PDM_INVERT: oc=0x005b; break;
-        case PDM_FILL:   oc=0x005c; break;
-        default:         oc=0;      break;   // -Wall a default for oc...
-    }
-    *pPict << oc;
-}
-
-
-void PictWriter::WriteOpcode_Arc(PictDrawingMethod eMethod, const Rectangle & rRect,
-                                 const Point & rStartPt, const Point & rEndPt)
-{
-    USHORT oc;
-    switch (eMethod) {
-        case PDM_FRAME:  oc=0x0060; break;
-        case PDM_PAINT:  oc=0x0061; break;
-        case PDM_ERASE:  oc=0x0062; break;
-        case PDM_INVERT: oc=0x0063; break;
-        case PDM_FILL:   oc=0x0064; break;
-        default:         oc=0;      break;   // -Wall a default for oc...
-    }
-    *pPict << oc;
-    WriteRectangle(rRect);
-    WriteArcAngles(rRect,rStartPt,rEndPt);
-}
-
-
-void PictWriter::WriteOpcode_SameArc(PictDrawingMethod eMethod, const Rectangle & rRect,
-                                     const Point & rStartPt, const Point & rEndPt)
-{
-    USHORT oc;
-    switch (eMethod) {
-        case PDM_FRAME:  oc=0x0068; break;
-        case PDM_PAINT:  oc=0x0069; break;
-        case PDM_ERASE:  oc=0x006a; break;
-        case PDM_INVERT: oc=0x006b; break;
-        case PDM_FILL:   oc=0x006c; break;
-        default:         oc=0;      break;   // -Wall a default for oc...
-    }
-    *pPict << oc;
-    WriteArcAngles(rRect,rStartPt,rEndPt);
-}
-
-
-void PictWriter::WriteOpcode_Poly(PictDrawingMethod eMethod, const Polygon & rPoly)
-{
-    USHORT oc;
-
-    if (rPoly.GetSize()<3) return;
-    switch (eMethod) {
-        case PDM_FRAME:  oc=0x0070; break;
-        case PDM_PAINT:  oc=0x0071; break;
-        case PDM_ERASE:  oc=0x0072; break;
-        case PDM_INVERT: oc=0x0073; break;
-        case PDM_FILL:   oc=0x0074; break;
-        default:         oc=0;      break;   // -Wall a default for oc...
-    }
-    *pPict << oc;
-    WritePolygon(rPoly);
-}
-
-
-void PictWriter::WriteOpcode_BitsRect(const Point & rPoint, const Size & rSize, const Bitmap & rBitmap)
-{
-    BitmapReadAccess*   pAcc = NULL;
-    Bitmap              aBitmap( rBitmap );
-
-    ULONG   nWidth, nHeight, nDstRowBytes, nx, nc, ny, nCount, nColTabSize, i;
-    ULONG   nDstRowPos, nSrcRowBytes, nEqu3, nPos, nDstMapPos;
-    USHORT  nBitsPerPixel, nPackType;
-    BYTE    *pComp[4], *pPix, *pTemp;
-    BYTE    nEquData = 0;
-    BYTE    nFlagCounterByte, nRed, nGreen, nBlue;
-
-    SetAttrForPaint();
-
-    // temopraere Windows-BMP-Datei erzeugen:
-    nActBitmapPercent=30;
-    MayCallback();
-
-    if ( bStatus == FALSE )
-        return;
-    if ( ( pAcc = aBitmap.AcquireReadAccess() ) == NULL )
-        return;
-
-    nBitsPerPixel = aBitmap.GetBitCount();
-
-    // export code below only handles four discrete cases
-    nBitsPerPixel =
-        nBitsPerPixel <= 1 ? 1 : nBitsPerPixel <= 4 ? 4 : nBitsPerPixel <= 8 ? 8 : 24;
-
-    nWidth = pAcc->Width();
-    nHeight = pAcc->Height();
-
-    // Wenn 24-Bit, dann den Opcode 'DirectBitsRect' erzeugen:
-    if ( nBitsPerPixel == 24 )
-    {
-
-        // Anzahl Bytes einer (ungepackten) Zeile in Quelle und Ziel berechnen:
-        nSrcRowBytes =( ( 3 * nWidth ) + 0x0003 ) & 0xfffc;
-        nDstRowBytes = nWidth * 4;
-
-        // Opcode und BaseAddr (?) schreiben:
-        *pPict << (USHORT)0x009a << (sal_uInt32)0x000000ff;
-
-        // Normalerweise wollen wir den Packing-Type 4 (Run length encoding
-        // for 32-Bit Pixels) erzeugen. Wenn aber RowBytes<8 gilt, sind die Daten
-        // grundsaetzlich ungepackt, auch wenn der Packing-Type 4 angegeben ist,
-        // was etwas komisch erscheint. Daher wollen wir in so einem Fall lieber
-        // gleich den Packing-Type 1 (ungepackt) angeben:
-
-        if ( nDstRowBytes < 8 )
-            nPackType = 1;
-        else
-            nPackType = 4;
-
-        // PixMap-Struktur schreiben:
-        *pPict << (USHORT)(nDstRowBytes|0x8000) // Bytes pro Zeile und dass es eine 'PixMap' ist
-               << (USHORT)0x0000                // Y1-Position der Bitmap in der Quelle
-               << (USHORT)0x0000                // X1-Position der Bitmap in der Quelle
-               << (USHORT)nHeight               // Y2-Position der Bitmap in der Quelle
-               << (USHORT)nWidth                // X2-Position der Bitmap in der Quelle
-               << (USHORT)0x0000                // Version
-               << (USHORT)nPackType             // Packing type
-               << (sal_uInt32) 0x00000000            // Packing size (?)
-               << (sal_uInt32) 0x00480000            // H-Res
-               << (sal_uInt32) 0x00480000            // V-Res
-               << (USHORT)0x0010                // Pixel type (?)
-               << (USHORT)0x0020                // Pixel size: 32 bit
-               << (USHORT)0x0004                // CmpCount: 4 Komponenten
-               << (USHORT)0x0008                // CmpSize: 8 Bits
-               << (sal_uInt32) 0x00000000            // PlaneBytes (?)
-               << (sal_uInt32) 0x00000000            // (?)
-               << (sal_uInt32) 0x00000000;           // (?)
-
-        // Source-Rectangle schreiben:
-        *pPict << (USHORT)0x0000                // Y1-Position auf der Bitmap
-               << (USHORT)0x0000                // X1-Position auf der Bitmap
-               << (USHORT)nHeight               // Y2-Position auf der Bitmap
-               << (USHORT)nWidth;               // X2-Position auf der Bitmap
-
-        // Destination-Rectangle schreiben:
-        WritePoint( rPoint );
-        WritePoint( Point( rPoint.X() + rSize.Width(), rPoint.Y() + rSize.Height() ) );
-
-        // Transfer mode schreiben:
-        *pPict << (USHORT)0x0000; // (?)
-
-        // Position der Map-Daten in Ziel merken:
-        nDstMapPos=pPict->Tell();
-
-        if ( nPackType == 1 )               // bei 24 bits nWidth == 1 !!
-        {                                   // nicht packen
-            for ( ny = 0; ny < nHeight; ny++ )
-            {
-                *pPict << (BYTE)0;
-                *pPict << (BYTE)pAcc->GetPixel( ny, 0 ).GetRed();
-                *pPict << (BYTE)pAcc->GetPixel( ny, 0 ).GetGreen();
-                *pPict << (BYTE)pAcc->GetPixel( ny, 0 ).GetBlue();
-                // Prozente zaehlen, Callback, Fehler pruefen:
-                nActBitmapPercent = ( ny * 70 / nHeight ) + 30; // (30% machten schon das Schreiben der Win-BMP-Datei aus)
-                MayCallback();
-            }
-        }
-        else    // packen ( PackType == 4 )
-        {
-            // Speicher fuer Zeilen-Zwischen-Datenstruktur allozieren:
-            for ( nc = 0; nc < 4; nc++ )
-                pComp[ nc ] = new BYTE[ nWidth ];
-
-            // Schleife ueber Zeilen:
-            for ( ny = 0; ny < nHeight; ny++ )
-            {
-                // Zeil ny der Quelle in die Zwischen-Datenstrktur einlesen:
-
-                for ( nx = 0; nx < nWidth; nx++ )
-                {
-                    pComp[ 1 ][ nx ] = (BYTE)pAcc->GetPixel( ny, nx ) .GetRed();
-                    pComp[ 2 ][ nx ] = (BYTE)pAcc->GetPixel( ny, nx ) .GetGreen();
-                    pComp[ 3 ][ nx ] = (BYTE)pAcc->GetPixel( ny, nx ) .GetBlue();
-                    pComp[ 0 ][ nx ] = 0;
-                }
-
-                // Anfang der Zeile im Ziel merken:
-                nDstRowPos = pPict->Tell();
-
-                // ByteCount (das ist die Groesse der gepackten Zeile) zunaechst 0 (wird spaeter berichtigt):
-                if ( nDstRowBytes > 250 )
-                    *pPict << (USHORT)0;
-                else
-                    *pPict << (BYTE)0;
-
-                // Schleife ueber Componenten:
-                for ( nc = 0; nc < 4; nc++ )
-                {
-                    // Schleife ueber x:
-                    nx = 0;
-                    while ( nx < nWidth )
-                    {
-                        // Die Position von 3 gleichen Bytes suchen und in nEqu3 merken.
-                        // wenn nicht gefunden, dann nEqu3=nWidth setzten.
-                        // Wenn doch gefunden, dann in nEquData den Wert der Bytes merken.
-                        nEqu3 = nx;
-                        for (;;)
-                        {
-                            if ( nEqu3 + 2 >= nWidth )
-                            {
-                                nEqu3 = nWidth;
-                                break;
-                            }
-                            nEquData = pComp[nc][nEqu3];
-                            if ( nEquData == pComp[nc][nEqu3+1] && nEquData==pComp[nc][nEqu3+2] )
-                                break;
-                            nEqu3++;
-                        }
-
-                        // Die Daten von nx bis nEqu3 unkomprimiert schreiben (ggf. in mehreren Records):
-                        while ( nEqu3 > nx )
-                        {
-                            nCount = nEqu3 - nx;
-                            if ( nCount > 128 )
-                                nCount=128;
-                            nFlagCounterByte = (BYTE)(nCount-1);
-                            *pPict << nFlagCounterByte;
-                            do
-                            {
-                                *pPict << pComp[nc][nx++];
-                                nCount--;
-                            }
-                            while ( nCount > 0 );
-                        }
-
-                        // Jetzt einen Komprimierungs-Record erzeugen (falls oben mindestens 3
-                        // gleiche Bytes gefunden):
-                        if ( nx < nWidth )
-                        {               // Hinweis: es gilt nx==nEqu3 (hoffentlich)
-                            nCount=3;   // Drei Bytes sind gleich, wie weiter oben herausgefunden.
-                                        // Pruefen, ob es weitere gleiche Bytes gibts (dabei Max.-Record-Groesse beachten):
-                            while ( nx + nCount < nWidth && nCount < 128 )
-                            {
-                                if ( nEquData != pComp[ nc ][ nx + nCount ] )
-                                    break;
-                                nCount++;
-                            }
-                            // nCount gleiche Bytes komprimiert schreiben:
-                            nFlagCounterByte = (BYTE)( 1 - (long)nCount );
-                            *pPict << nFlagCounterByte << nEquData;
-                            nx += nCount;
-                        }
-                    }
-                }
-                // ByteCount berichtigen:
-                nPos = pPict->Tell();
-                pPict->Seek( nDstRowPos );
-                if ( nDstRowBytes > 250 )
-                    *pPict << ( (USHORT)( nPos - nDstRowPos - 2 ) );
-                else
-                    *pPict << ( (BYTE)( nPos - nDstRowPos - 1 ) );
-                pPict->Seek( nPos );
-
-                // Prozente zaehlen, Callback, Fehler pruefen:
-                nActBitmapPercent = ( ny * 70 / nHeight ) + 30; // (30% machten schon das Schreiben der Win-BMP-Datei aus)
-                MayCallback();
-            }
-            // Aufraeumen:
-            for ( nc = 0; nc < 4; nc++ )
-                delete pComp[ nc ];
-        }
-    }
-    else
-    {   // nicht 24-Bit also Opcode 'PackBitsRect' erzeugen:
-
-        // Bei 1-Bit-Bildern ignorieren manche Import-Filter die Palette und nehmen statt
-        // dessen die Vorder- und Hintergrundfarbe:
-        if ( nBitsPerPixel == 1 )
-        {
-            WriteOpcode_RGBBkCol( pAcc->GetPaletteColor( 0 ) );
-            WriteOpcode_RGBFgCol( pAcc->GetPaletteColor( 1 ) );
-        }
-        else
-        {
-            WriteOpcode_RGBBkCol( Color( COL_BLACK ) );
-            WriteOpcode_RGBFgCol( Color( COL_WHITE ) );
-        }
-
-        // Anzahl Bytes einer (ungepackten) Zeile in Ziel und Quelle berechnen:
-        nDstRowBytes = ( nWidth * nBitsPerPixel + 7 ) >> 3;
-        nSrcRowBytes = ( nDstRowBytes + 3 ) & 0xfffffffc;
-
-        // Opcode schreiben:
-        *pPict << (USHORT)0x0098;
-
-        // Normalerweise wollen wir den Packing-Type 0 (default Packing) erzeugen.
-        // Wenn aber RowBytes<8 gilt, sind die Daten grundsaetzlich ungepackt,
-        // auch wenn der Packing-Type 0 angegeben ist, was etwas komisch erscheint.
-        // Daher wollen wir in so einem Fall lieber gleich den Packing-Type 1 (ungepackt)
-        // angeben:
-        if ( nDstRowBytes < 8 )
-            nPackType = 1;
-        else
-            nPackType = 0;
-
-        // PixMap-Struktur schreiben:
-        *pPict << (USHORT)(nDstRowBytes|0x8000) // Bytes pro Zeile und dass es eine 'PixMap' ist
-               << (USHORT)0x0000                // Y1-Position der Bitmap in der Quelle
-               << (USHORT)0x0000                // X1-Position der Bitmap in der Quelle
-               << (USHORT)nHeight               // Y2-Position der Bitmap in der Quelle
-               << (USHORT)nWidth                // X2-Position der Bitmap in der Quelle
-               << (USHORT)0x0000                // Version
-               << (USHORT)nPackType             // Packing type
-               << (sal_uInt32) 0x00000000            // Packing size (?)
-               << (sal_uInt32) 0x00480000            // H-Res
-               << (sal_uInt32) 0x00480000            // V-Res
-               << (USHORT)0x0000                // Pixel type (?)
-               << (USHORT)nBitsPerPixel         // Pixel size
-               << (USHORT)0x0001                // CmpCount: 1 Komponente
-               << (USHORT)nBitsPerPixel         // CmpSize
-               << (sal_uInt32) 0x00000000            // PlaneBytes (?)
-               << (sal_uInt32) 0x00000000            // (?)
-               << (sal_uInt32) 0x00000000;           // (?)
-
-        // Palette lesen und schreiben:
-        nColTabSize = pAcc->GetPaletteEntryCount();
-        *pPict << (sal_uInt32)0 << (USHORT)0x8000 << (USHORT)( nColTabSize - 1 );
-
-        for ( i = 0; i < nColTabSize; i++ )
-        {
-            nRed = (BYTE)pAcc->GetPaletteColor( (USHORT)i ).GetRed();
-            nGreen = (BYTE)pAcc->GetPaletteColor( (USHORT)i ).GetGreen();
-            nBlue = (BYTE)pAcc->GetPaletteColor( (USHORT)i ).GetBlue();
-            *pPict << (UINT16)0 << nRed << nRed << nGreen << nGreen << nBlue << nBlue;
-        }
-
-        // Source-Rectangle schreiben:
-        *pPict << (USHORT)0 << (USHORT)0 << (USHORT)nHeight << (USHORT)nWidth;
-
-        // Destination-Rectangle schreiben:
-        WritePoint( rPoint );
-        WritePoint( Point( rPoint.X() + rSize.Width(), rPoint.Y() + rSize.Height() ) );
-
-        // Transfer mode schreiben:
-        *pPict << (USHORT)0;            // (?)
-
-        // Speicher fuer eine Zeile allozieren:
-        pPix = new BYTE[ nSrcRowBytes ];
-
-        // Position der Map-Daten in Ziel merken:
-        nDstMapPos=pPict->Tell();
-
-        // Schleife ueber Zeilen:
-        for ( ny = 0; ny < nHeight; ny++ )
-        {
-
-            // Zeile ny der Quelle in den Zwischenspeicher einlesen:
-
-            switch ( nBitsPerPixel )
-            {
-                case 1 :
-                    for ( pTemp = pPix, i = 0; i < nSrcRowBytes; i++ )
-                        *pTemp++ = (BYTE)0;
-                    for ( i = 0; i < nWidth; i++ )
-                        pPix[ ( i >> 3 ) ] |= (BYTE)( pAcc->GetPixel( ny, i ) & 1 ) << ( ( i & 7 ) ^ 7 );
-                    break;
-                case 4 :
-                    for ( pTemp = pPix, i = 0; i < nSrcRowBytes; i++ )
-                        *pTemp++ = (BYTE)0;
-                    for ( i = 0; i < nWidth; i++ )
-                        pPix[ ( i >> 1 ) ] |= (BYTE)( pAcc->GetPixel( ny, i ) & 15 ) << ( ( i & 1 ) << 2 ) ;
-                    break;
-                case 8 :
-                    for ( i = 0; i < nWidth; i++ )
-                        pPix[ i ] = (BYTE)pAcc->GetPixel( ny, i );
-                    break;
-            }
-
-            if ( nPackType == 1 )
-            {   // nicht packen
-                pPict->Write( pPix, nDstRowBytes );
-            }
-            else
-            {   // Packen (nPackType==0)
-
-                // Anfang der Zeile im Ziel merken:
-                nDstRowPos = pPict->Tell();
-
-                // ByteCount (das ist die Groesse der gepackten Zeile) zunaechst 0 (wird spaeter berichtigt):
-                if ( nDstRowBytes > 250 )
-                    *pPict << (USHORT)0;
-                else
-                    *pPict << (BYTE)0;
-
-                // Schleife ueber Bytes der Zeile:
-                nx=0;
-                while ( nx < nDstRowBytes && bStatus )
-                {
-                    // Die Position von 3 gleichen Bytes suchen und in nEqu3 merken.
-                    // wenn nicht gefunden, dann nEqu3=nDstRowBytes setzten.
-                    // Wenn doch gefunden, dann in nEquData den Wert der Bytes merken.
-                    nEqu3 = nx;
-                    for (;;)
-                    {
-                        if ( nEqu3 + 2 >= nDstRowBytes )
-                        {
-                            nEqu3 = nDstRowBytes;
-                            break;
-                        }
-                        nEquData = pPix[ nEqu3 ];
-                        if ( nEquData == pPix[ nEqu3 + 1 ] && nEquData == pPix[ nEqu3 + 2 ] )
-                            break;
-                        nEqu3++;
-                    }
-
-                    // Die Daten von nx bis nEqu3 unkomprimiert schreiben (ggf. in mehreren Records):
-                    while ( nEqu3 > nx )
-                    {
-                        nCount = nEqu3 - nx;
-                        if ( nCount > 128 )
-                            nCount = 128;
-                        nFlagCounterByte = (BYTE)( nCount - 1 );
-                        *pPict << nFlagCounterByte;
-                        do
-                        {
-                            *pPict << pPix[ nx++ ];
-                            nCount--;
-                        } while ( nCount > 0 );
-                    }
-
-                    // Jetzt einen Komprimierungs-Record erzeugen (falls oben mindestens 3
-                    // gleiche Bytes gefunden):
-                    if ( nx < nDstRowBytes )
-                    {   // Hinweis: es gilt nx==nEqu3 (hoffentlich)
-                        nCount = 3; // Drei Bytes sind gleich, wie weiter oben herausgefunden.
-                        // Pruefen, ob es weitere gleiche Bytes gibts (dabei Max.-Record-Groesse beachten):
-                        while ( nx + nCount < nDstRowBytes && nCount < 128 )
-                        {
-                            if ( nEquData != pPix[ nx + nCount ] )
-                                break;
-                            nCount++;
-                        }
-                        // nCount gleiche Bytes komprimiert schreiben:
-                        nFlagCounterByte = (BYTE)( 1 - (long)nCount );
-                        *pPict << nFlagCounterByte << nEquData;
-                        nx += nCount;
-                    }
-                }
-
-                // ByteCount berichtigen:
-                nPos = pPict->Tell();
-                pPict->Seek( nDstRowPos );
-                if ( nDstRowBytes > 250 )
-                    *pPict << ( (USHORT)( nPos - nDstRowPos - 2 ) );
-                else
-                    *pPict << ( (BYTE)( nPos - nDstRowPos - 1 ) );
-                pPict->Seek( nPos );
-            }
-
-            // Prozente zaehlen, Callback, Fehler pruefen:
-            nActBitmapPercent =( ny * 70 / nHeight ) + 30; // (30% machten schon das Schreiben der Win-BMP-Datei aus)
-            MayCallback();
-            if ( pPict->GetError() )
-                bStatus = FALSE;
-        }
-        // Aufraeumen:
-        delete[] pPix;
-    }
-
-    // Map-Daten muessen gerade Anzahl von Bytes sein:
-    if ( ( ( pPict->Tell() - nDstMapPos ) & 1 ) != 0 )
-        *pPict << (BYTE)0;
-
-    // Bitmaps zaehlen:
-    nWrittenBitmaps++;
-    nActBitmapPercent = 0;
-    if ( pAcc )
-        aBitmap.ReleaseAccess( pAcc );
-}
-
-void PictWriter::WriteOpcode_EndOfFile()
-{
-    *pPict << (USHORT)0x00ff;
-}
-
-
-void PictWriter::SetAttrForPaint()
-{
-    WriteOpcode_PnMode(eSrcRasterOp);
-    WriteOpcode_RGBFgCol(aFillColor);
-    WriteOpcode_RGBBkCol(aFillColor);
-    WriteOpcode_PnFillPat(aFillColor!=Color( COL_TRANSPARENT ));
-}
-
-
-void PictWriter::SetAttrForFrame()
-{
-    WriteOpcode_PnMode(eSrcRasterOp);
-    WriteOpcode_PnSize(0);
-    WriteOpcode_RGBFgCol(aLineColor);
-    WriteOpcode_PnLinePat(aLineColor!=Color( COL_TRANSPARENT ));
-}
-
-
-void PictWriter::SetAttrForText()
-{
-    WriteOpcode_RGBFgCol(aSrcFont.GetColor());
-    WriteOpcode_RGBBkCol(aSrcFont.GetFillColor());
-    WriteOpcode_PnLinePat(TRUE);
-    WriteOpcode_FontName(aSrcFont);
-    WriteOpcode_TxSize((USHORT)(aSrcFont.GetSize().Height()));
-    WriteOpcode_TxMode(eSrcRasterOp);
-    WriteOpcode_TxFace(aSrcFont);
-}
-
-
-void PictWriter::WriteTextArray(Point & rPoint, const String& rString, const sal_Int32 * pDXAry)
-{
-    USHORT i,nLen;
-    sal_Unicode c;
-    BOOL bDelta;
-    Point aPt;
-
-    if ( pDXAry == NULL )
-        WriteOpcode_Text( rPoint, rString, FALSE );
-    else
-    {
-        bDelta = FALSE;
-        nLen = rString.Len();
-        for ( i = 0; i < nLen; i++ )
-        {
-            c = rString.GetChar( i );
-            if ( c && ( c != 0x20 ) )
-            {
-                aPt = rPoint;
-                if ( i > 0 )
-                    aPt.X() += pDXAry[ i - 1 ];
-
-                WriteOpcode_Text( aPt, String( c ), bDelta );
-                bDelta = TRUE;
-            }
-        }
-    }
-}
-
-void PictWriter::HandleLineInfoPolyPolygons(const LineInfo& rInfo, const basegfx::B2DPolygon& rLinePolygon)
-{
-    if(rLinePolygon.count())
-    {
-        basegfx::B2DPolyPolygon aLinePolyPolygon(rLinePolygon);
-        basegfx::B2DPolyPolygon aFillPolyPolygon;
-
-        rInfo.applyToB2DPolyPolygon(aLinePolyPolygon, aFillPolyPolygon);
-
-        if(aLinePolyPolygon.count())
-        {
-            aLinePolyPolygon = aLinePolyPolygon.getDefaultAdaptiveSubdivision();
-            const sal_uInt32 nPolyCount(aLinePolyPolygon.count());
-            SetAttrForFrame();
-
-            for(sal_uInt32 a(0); a < nPolyCount; a++)
-            {
-                const basegfx::B2DPolygon aCandidate(aLinePolyPolygon.getB2DPolygon(a));
-                const sal_uInt32 nPointCount(aCandidate.count());
-
-                if(nPointCount)
-                {
-                    const sal_uInt32 nEdgeCount(aCandidate.isClosed() ? nPointCount + 1 : nPointCount);
-                    const basegfx::B2DPoint aCurr(aCandidate.getB2DPoint(0));
-                    Point nCurr(basegfx::fround(aCurr.getX()), basegfx::fround(aCurr.getY()));
-
-                    for(sal_uInt32 b(0); b < nEdgeCount; b++)
-                    {
-                        const sal_uInt32 nNextIndex((b + 1) % nPointCount);
-                        const basegfx::B2DPoint aNext(aCandidate.getB2DPoint(nNextIndex));
-                        const Point nNext(basegfx::fround(aNext.getX()), basegfx::fround(aNext.getY()));
-
-                        WriteOpcode_Line(nCurr, nNext);
-                        nCurr = nNext;
-                    }
-                }
-            }
-        }
-
-        if(aFillPolyPolygon.count())
-        {
-            const Color aOldLineColor(aLineColor);
-            const Color aOldFillColor(aFillColor);
-
-            aLineColor = Color( COL_TRANSPARENT );
-            aFillColor = aOldLineColor;
-            SetAttrForPaint();
-
-            for(sal_uInt32 a(0); a < aFillPolyPolygon.count(); a++)
-            {
-                const Polygon aPolygon(aFillPolyPolygon.getB2DPolygon(a).getDefaultAdaptiveSubdivision());
-                WriteOpcode_Poly(PDM_PAINT, aPolygon);
-            }
-
-            aLineColor = aOldLineColor;
-            aFillColor = aOldFillColor;
-        }
-    }
-}
-
-void PictWriter::WriteOpcodes( const GDIMetaFile & rMTF )
-{
-    ULONG nA, nACount;
-    const MetaAction* pMA;
-
-    if( !bStatus)
-        return;
-
-    nACount=rMTF.GetActionCount();
-
-    for (nA=0; nA<nACount; nA++)
-    {
-        pMA = rMTF.GetAction(nA);
-
-        switch (pMA->GetType())
-        {
-            case META_PIXEL_ACTION:
-            {
-                const MetaPixelAction* pA = (const MetaPixelAction*) pMA;
-                WriteOpcode_PnMode(eSrcRasterOp);
-                WriteOpcode_PnSize(1);
-                WriteOpcode_RGBFgCol(pA->GetColor());
-                WriteOpcode_PnLinePat(TRUE);
-                WriteOpcode_Line(pA->GetPoint(),pA->GetPoint());
-            }
-            break;
-
-            case META_POINT_ACTION:
-            {
-                const MetaPointAction* pA = (const MetaPointAction*) pMA;
-
-                if( aLineColor != Color( COL_TRANSPARENT ) )
-                {
-                    SetAttrForFrame();
-                    WriteOpcode_Line( pA->GetPoint(),pA->GetPoint() );
-                }
-            }
-            break;
-
-            case META_LINE_ACTION:
-            {
-                const MetaLineAction* pA = (const MetaLineAction*) pMA;
-
-                if( aLineColor != Color( COL_TRANSPARENT ) )
-                {
-                    if(pA->GetLineInfo().IsDefault())
-                    {
-                        SetAttrForFrame();
-                        WriteOpcode_Line( pA->GetStartPoint(),pA->GetEndPoint() );
-                    }
-                    else
-                    {
-                        // LineInfo used; handle Dash/Dot and fat lines
-                        basegfx::B2DPolygon aPolygon;
-                        aPolygon.append(basegfx::B2DPoint(pA->GetStartPoint().X(), pA->GetStartPoint().Y()));
-                        aPolygon.append(basegfx::B2DPoint(pA->GetEndPoint().X(), pA->GetEndPoint().Y()));
-                        HandleLineInfoPolyPolygons(pA->GetLineInfo(), aPolygon);
-                    }
-                }
-                break;
-            }
-
-            case META_RECT_ACTION:
-            {
-                const MetaRectAction* pA = (const MetaRectAction*) pMA;
-
-                if (aFillColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForPaint();
-                    WriteOpcode_Rect(PDM_PAINT,pA->GetRect());
-                    if (aLineColor!=Color( COL_TRANSPARENT ))
-                    {
-                        SetAttrForFrame();
-                        WriteOpcode_SameRect(PDM_FRAME);
-                    }
-                }
-                else if (aLineColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForFrame();
-                    WriteOpcode_Rect(PDM_FRAME,pA->GetRect());
-                }
-            }
-            break;
-
-            case META_ROUNDRECT_ACTION:
-            {
-                const MetaRoundRectAction* pA = (const MetaRoundRectAction*) pMA;
-
-                WriteOpcode_OvSize( Size( pA->GetHorzRound(), pA->GetVertRound() ) );
-
-                if (aFillColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForPaint();
-                    WriteOpcode_RRect(PDM_PAINT,pA->GetRect());
-                    if (aLineColor!=Color( COL_TRANSPARENT ))
-                    {
-                        SetAttrForFrame();
-                        WriteOpcode_SameRRect(PDM_FRAME);
-                    }
-                }
-                else if (aLineColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForFrame();
-                    WriteOpcode_RRect(PDM_FRAME,pA->GetRect());
-                }
-            }
-            break;
-
-            case META_ELLIPSE_ACTION:
-            {
-                const MetaEllipseAction* pA = (const MetaEllipseAction*) pMA;
-
-                if (aFillColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForPaint();
-                    WriteOpcode_Oval(PDM_PAINT,pA->GetRect());
-                    if (aLineColor!=Color( COL_TRANSPARENT ))
-                    {
-                        SetAttrForFrame();
-                        WriteOpcode_SameOval(PDM_FRAME);
-                    }
-                }
-                else if (aLineColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForFrame();
-                    WriteOpcode_Oval(PDM_FRAME,pA->GetRect());
-                }
-            }
-            break;
-
-            case META_ARC_ACTION:
-            {
-                const MetaArcAction* pA = (const MetaArcAction*) pMA;
-
-                if (aLineColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForFrame();
-                    WriteOpcode_Arc(PDM_FRAME,pA->GetRect(),pA->GetStartPoint(),pA->GetEndPoint());
-                }
-            }
-            break;
-
-            case META_PIE_ACTION:
-            {
-                const MetaPieAction* pA = (const MetaPieAction *) pMA;
-
-                if (aFillColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForPaint();
-                    WriteOpcode_Arc(PDM_PAINT,pA->GetRect(),pA->GetStartPoint(),pA->GetEndPoint());
-
-                    if (aLineColor!=Color( COL_TRANSPARENT ))
-                    {
-                        SetAttrForFrame();
-                        WriteOpcode_SameArc(PDM_FRAME,pA->GetRect(),pA->GetStartPoint(),pA->GetEndPoint());
-                    }
-                }
-                else if (aLineColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForFrame();
-                    WriteOpcode_Arc(PDM_FRAME,pA->GetRect(),pA->GetStartPoint(),pA->GetEndPoint());
-                }
-
-                if (aLineColor!=Color( COL_TRANSPARENT ))
-                {
-                    double fxc,fyc,fxr,fyr,fx1,fy1,fx2,fy2,l1,l2;
-
-                    fxc=((double)(pA->GetRect().Left()+pA->GetRect().Right()))/2.0;
-                    fyc=((double)(pA->GetRect().Top()+pA->GetRect().Bottom()))/2.0;
-                    fxr=((double)pA->GetRect().GetWidth())/2.0;
-                    fyr=((double)pA->GetRect().GetHeight())/2.0;
-                    fx1=((double)pA->GetStartPoint().X())-fxc;
-                    fy1=((double)pA->GetStartPoint().Y())-fyc;
-                    fx2=((double)pA->GetEndPoint().X())-fxc;
-                    fy2=((double)pA->GetEndPoint().Y())-fyc;
-                    l1=sqrt(fx1*fx1+fy1*fy1);
-                    l2=sqrt(fx2*fx2+fy2*fy2);
-
-                    if (l1>0)
-                    {
-                        fx1=fx1/l1*fxr;
-                        fy1=fy1/l1*fyr;
-                    }
-
-                    if (l2>0)
-                    {
-                        fx2=fx2/l2*fxr;
-                        fy2=fy2/l2*fyr;
-                    }
-                    fx1+=fxc; fy1+=fyc; fx2+=fxc; fy2+=fyc;
-                    WriteOpcode_Line(Point((long)(fx1+0.5),(long)(fy1+0.5)), Point((long)(fxc+0.5),(long)(fyc+0.5)));
-                    WriteOpcode_LineFrom(Point((long)(fx2+0.5),(long)(fy2+0.5)));
-                }
-            }
-            break;
-
-            case META_CHORD_ACTION:
-            {
-//                DBG_ERROR( "Unsupported PICT-Action: META_CHORD_ACTION!" );
-            }
-            break;
-
-            case META_POLYLINE_ACTION:
-            {
-                const MetaPolyLineAction* pA = (const MetaPolyLineAction*) pMA;
-
-                if( aLineColor!=Color( COL_TRANSPARENT ) )
-                {
-                    const Polygon&  rPoly = pA->GetPolygon();
-
-                    if( rPoly.GetSize() )
-                    {
-                        if(pA->GetLineInfo().IsDefault())
-                        {
-                            Polygon aSimplePoly;
-                            if ( rPoly.HasFlags() )
-                                rPoly.AdaptiveSubdivide( aSimplePoly );
-                            else
-                                aSimplePoly = rPoly;
-
-                            const USHORT    nSize = aSimplePoly.GetSize();
-                            Point           aLast;
-
-                            if ( nSize )
-                            {
-                                SetAttrForFrame();
-                                aLast = aSimplePoly[0];
-
-                                for ( USHORT i = 1; i < nSize; i++ )
-                                {
-                                    WriteOpcode_Line( aLast, aSimplePoly[i] );
-                                    aLast = aSimplePoly[i];
-                                }
-                            }
-                        }
-                        else
-                        {
-                            // LineInfo used; handle Dash/Dot and fat lines
-                            HandleLineInfoPolyPolygons(pA->GetLineInfo(), rPoly.getB2DPolygon());
-                        }
-                    }
-                }
-            }
-            break;
-
-            case META_POLYGON_ACTION:
-            {
-                const MetaPolygonAction* pA = (const MetaPolygonAction*) pMA;
-
-                const Polygon& rPoly = pA->GetPolygon();
-
-                Polygon aSimplePoly;
-                if ( rPoly.HasFlags() )
-                    rPoly.AdaptiveSubdivide( aSimplePoly );
-                else
-                    aSimplePoly = rPoly;
-
-                if (aFillColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForPaint();
-                    WriteOpcode_Poly( PDM_PAINT, aSimplePoly );
-                }
-                if (aLineColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForFrame();
-                    WriteOpcode_Poly( PDM_FRAME, aSimplePoly );
-                }
-            }
-            break;
-
-            case META_POLYPOLYGON_ACTION:
-            {
-                const MetaPolyPolygonAction* pA = (const MetaPolyPolygonAction*) pMA;
-
-                const PolyPolygon& rPolyPoly = pA->GetPolyPolygon();
-                sal_uInt16 nPolyCount = rPolyPoly.Count();
-                PolyPolygon aSimplePolyPoly( rPolyPoly );
-                for ( sal_uInt16 i = 0; i < nPolyCount; i++ )
-                {
-                    if ( aSimplePolyPoly[ i ].HasFlags() )
-                    {
-                        Polygon aSimplePoly;
-                        aSimplePolyPoly[ i ].AdaptiveSubdivide( aSimplePoly );
-                        aSimplePolyPoly[ i ] = aSimplePoly;
-                    }
-                }
-                if (aFillColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForPaint();
-                    WriteOpcode_Poly( PDM_PAINT, PolyPolygonToPolygon( aSimplePolyPoly ));
-                }
-
-                if (aLineColor!=Color( COL_TRANSPARENT ))
-                {
-                    USHORT nCount,i;
-                    SetAttrForFrame();
-                    nCount = aSimplePolyPoly.Count();
-                    for ( i = 0; i < nCount; i++ )
-                        WriteOpcode_Poly( PDM_FRAME, aSimplePolyPoly.GetObject( i ) );
-                }
-            }
-            break;
-
-            case META_TEXT_ACTION:
-            {
-                const MetaTextAction*   pA = (const MetaTextAction*) pMA;
-                Point                   aPt( pA->GetPoint() );
-
-                if ( aSrcFont.GetAlign() != ALIGN_BASELINE )
-                {
-                    VirtualDevice aVirDev;
-
-                    if (aSrcFont.GetAlign()==ALIGN_TOP)
-                        aPt.Y()+=(long)aVirDev.GetFontMetric(aSrcFont).GetAscent();
-                    else
-                        aPt.Y()-=(long)aVirDev.GetFontMetric(aSrcFont).GetDescent();
-                }
-
-                SetAttrForText();
-                String aStr( pA->GetText(),pA->GetIndex(),pA->GetLen() );
-                WriteOpcode_Text( aPt, aStr, FALSE );
-            }
-            break;
-
-            case META_TEXTARRAY_ACTION:
-            {
-                const MetaTextArrayAction*  pA = (const MetaTextArrayAction*) pMA;
-                Point                       aPt( pA->GetPoint() );
-
-                if (aSrcFont.GetAlign()!=ALIGN_BASELINE)
-                {
-                    VirtualDevice aVirDev;
-
-                    if (aSrcFont.GetAlign()==ALIGN_TOP)
-                        aPt.Y()+=(long)aVirDev.GetFontMetric(aSrcFont).GetAscent();
-                    else
-                        aPt.Y()-=(long)aVirDev.GetFontMetric(aSrcFont).GetDescent();
-                }
-                SetAttrForText();
-                String aStr( pA->GetText(),pA->GetIndex(),pA->GetLen() );
-                WriteTextArray( aPt, aStr, pA->GetDXArray() );
-                break;
-            }
-
-            case META_STRETCHTEXT_ACTION:
-            {
-                const MetaStretchTextAction*    pA = (const MetaStretchTextAction*) pMA;
-                Point                           aPt( pA->GetPoint() );
-                String                          aStr( pA->GetText(),pA->GetIndex(),pA->GetLen() );
-                VirtualDevice                   aVirDev;
-                sal_Int32*                      pDXAry = new sal_Int32[ aStr.Len() ];
-                sal_Int32                       nNormSize( aVirDev.GetTextArray( aStr,pDXAry ) );
-                USHORT                          i;
-
-                if (aSrcFont.GetAlign()!=ALIGN_BASELINE)
-                {
-                    if (aSrcFont.GetAlign()==ALIGN_TOP)
-                        aPt.Y()+=(long)aVirDev.GetFontMetric(aSrcFont).GetAscent();
-                    else
-                        aPt.Y()-=(long)aVirDev.GetFontMetric(aSrcFont).GetDescent();
-                }
-
-                for ( i = 0; i < aStr.Len() - 1; i++ )
-                    pDXAry[ i ] = pDXAry[ i ] * ( (long)pA->GetWidth() ) / nNormSize;
-
-                SetAttrForText();
-                WriteTextArray( aPt, aStr, pDXAry );
-                delete[] pDXAry;
-            }
-            break;
-
-            case META_TEXTRECT_ACTION:
-            {
-//                DBG_ERROR( "Unsupported PICT-Action: META_TEXTRECT_ACTION!" );
-            }
-            break;
-
-            case META_BMP_ACTION:
-            {
-                const MetaBmpAction* pA = (const MetaBmpAction*) pMA;
-                WriteOpcode_BitsRect( pA->GetPoint(),pA->GetBitmap().GetSizePixel(), pA->GetBitmap() );
-            }
-            break;
-
-            case META_BMPSCALE_ACTION:
-            {
-                const MetaBmpScaleAction* pA = (const MetaBmpScaleAction*) pMA;
-                WriteOpcode_BitsRect( pA->GetPoint(), pA->GetSize(), pA->GetBitmap() );
-            }
-            break;
-
-            case META_BMPSCALEPART_ACTION:
-            {
-                const MetaBmpScalePartAction*   pA = (const MetaBmpScalePartAction*) pMA;
-                Bitmap                          aBmp( pA->GetBitmap() );
-
-                aBmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) );
-                WriteOpcode_BitsRect( pA->GetDestPoint(), pA->GetDestSize(), aBmp );
-            }
-            break;
-
-            case META_BMPEX_ACTION:
-            {
-                const MetaBmpExAction*  pA = (const MetaBmpExAction*) pMA;
-                const Bitmap            aBmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
-
-                WriteOpcode_BitsRect( pA->GetPoint(), aBmp.GetSizePixel(), aBmp );
-            }
-            break;
-
-            case META_BMPEXSCALE_ACTION:
-            {
-                const MetaBmpExScaleAction* pA = (const MetaBmpExScaleAction*) pMA;
-                const Bitmap                aBmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
-
-                WriteOpcode_BitsRect( pA->GetPoint(), pA->GetSize(), aBmp );
-            }
-            break;
-
-            case META_BMPEXSCALEPART_ACTION:
-            {
-                const MetaBmpExScalePartAction* pA = (const MetaBmpExScalePartAction*) pMA;
-                Bitmap                          aBmp( Graphic( pA->GetBitmapEx() ).GetBitmap() );
-
-                aBmp.Crop( Rectangle( pA->GetSrcPoint(), pA->GetSrcSize() ) );
-                WriteOpcode_BitsRect( pA->GetDestPoint(), pA->GetDestSize(), aBmp );
-            }
-            break;
-
-            case META_EPS_ACTION :
-            {
-                const MetaEPSAction* pA = (const MetaEPSAction*)pMA;
-                const GDIMetaFile aGDIMetaFile( pA->GetSubstitute() );
-
-                INT32 nCount = aGDIMetaFile.GetActionCount();
-                for ( INT32 i = 0; i < nCount; i++ )
-                {
-                    const MetaAction* pMetaAct = aGDIMetaFile.GetAction( i );
-                    if ( pMetaAct->GetType() == META_BMPSCALE_ACTION )
-                    {
-                        const MetaBmpScaleAction* pBmpScaleAction = (const MetaBmpScaleAction*)pMetaAct;
-                        WriteOpcode_BitsRect( pA->GetPoint(), pA->GetSize(), pBmpScaleAction->GetBitmap() );
-                        break;
-                    }
-                }
-            }
-            break;
-
-            case META_MASK_ACTION:
-            case META_MASKSCALE_ACTION:
-            case META_MASKSCALEPART_ACTION:
-            {
-//                DBG_ERROR( "Unsupported PICT-Action: META_MASK..._ACTION!" );
-            }
-            break;
-
-            case META_GRADIENT_ACTION:
-            {
-                VirtualDevice               aVDev;
-                GDIMetaFile                 aTmpMtf;
-                const MetaGradientAction*   pA = (const MetaGradientAction*) pMA;
-
-                aVDev.SetMapMode( aTargetMapMode );
-                aVDev.AddGradientActions( pA->GetRect(), pA->GetGradient(), aTmpMtf );
-                WriteOpcodes( aTmpMtf );
-            }
-            break;
-
-            case META_HATCH_ACTION:
-            {
-                VirtualDevice           aVDev;
-                GDIMetaFile             aTmpMtf;
-                const MetaHatchAction*  pA = (const MetaHatchAction*) pMA;
-
-                aVDev.SetMapMode( aTargetMapMode );
-                aVDev.AddHatchActions( pA->GetPolyPolygon(), pA->GetHatch(), aTmpMtf );
-                WriteOpcodes( aTmpMtf );
-            }
-            break;
-
-            case META_WALLPAPER_ACTION:
-            {
-//                DBG_ERROR( "Unsupported PICT-Action: META_WALLPAPER_ACTION!" );
-            }
-            break;
-
-            case META_CLIPREGION_ACTION:
-            {
-//                DBG_ERROR( "Unsupported PICT-Action: META_CLIPREGION_ACTION!" );
-            }
-            break;
-
-            case META_ISECTRECTCLIPREGION_ACTION:
-            {
-                const MetaISectRectClipRegionAction* pA = (const MetaISectRectClipRegionAction*) pMA;
-                WriteOpcode_ClipRect( pA->GetRect() );
-            }
-            break;
-
-            case META_ISECTREGIONCLIPREGION_ACTION:
-            {
-//                DBG_ERROR( "Unsupported PICT-Action: META_ISECTREGIONCLIPREGION_ACTION!" );
-            }
-            break;
-
-            case META_MOVECLIPREGION_ACTION:
-            {
-//                DBG_ERROR( "Unsupported PICT-Action: META_MOVECLIPREGION_ACTION!" );
-            }
-            break;
-
-            case META_LINECOLOR_ACTION:
-            {
-                const MetaLineColorAction* pA = (const MetaLineColorAction*) pMA;
-
-                if( pA->IsSetting() )
-                    aLineColor = pA->GetColor();
-                else
-                    aLineColor = Color( COL_TRANSPARENT );
-            }
-            break;
-
-            case META_FILLCOLOR_ACTION:
-            {
-                const MetaFillColorAction* pA = (const MetaFillColorAction*) pMA;
-
-                if( pA->IsSetting() )
-                    aFillColor = pA->GetColor();
-                else
-                    aFillColor = Color( COL_TRANSPARENT );
-            }
-            break;
-
-            case META_TEXTCOLOR_ACTION:
-            {
-                const MetaTextColorAction* pA = (const MetaTextColorAction*) pMA;
-                aSrcFont.SetColor( pA->GetColor() );
-            }
-            break;
-
-            case META_TEXTFILLCOLOR_ACTION:
-            {
-                const MetaTextFillColorAction* pA = (const MetaTextFillColorAction*) pMA;
-
-                if( pA->IsSetting() )
-                    aSrcFont.SetFillColor( pA->GetColor() );
-                else
-                    aSrcFont.SetFillColor( Color( COL_TRANSPARENT ) );
-            }
-            break;
-
-            case META_TEXTALIGN_ACTION:
-            {
-//                DBG_ERROR( "Unsupported PICT-Action: META_TEXTALIGN_ACTION!" );
-            }
-            break;
-
-            case META_MAPMODE_ACTION:
-            {
-                const MetaMapModeAction* pA = (const MetaMapModeAction*) pMA;
-
-                if (aSrcMapMode!=pA->GetMapMode())
-                {
-                    if( pA->GetMapMode().GetMapUnit() == MAP_RELATIVE )
-                    {
-                        MapMode aMM = pA->GetMapMode();
-                        Fraction aScaleX = aMM.GetScaleX();
-                        Fraction aScaleY = aMM.GetScaleY();
-
-                        Point aOrigin = aSrcMapMode.GetOrigin();
-                        BigInt aX( aOrigin.X() );
-                        aX *= BigInt( aScaleX.GetDenominator() );
-                        if( aOrigin.X() >= 0 )
-                        {
-                            if( aScaleX.GetNumerator() >= 0 )
-                                aX += BigInt( aScaleX.GetNumerator()/2 );
-                            else
-                                aX -= BigInt( (aScaleX.GetNumerator()+1)/2 );
-                        }
-                        else
-                        {
-                            if( aScaleX.GetNumerator() >= 0 )
-                                aX -= BigInt( (aScaleX.GetNumerator()-1)/2 );
-                            else
-                                aX += BigInt( aScaleX.GetNumerator()/2 );
-                        }
-
-                        aX /= BigInt( aScaleX.GetNumerator() );
-                        aOrigin.X() = (long)aX + aMM.GetOrigin().X();
-                        BigInt aY( aOrigin.Y() );
-                        aY *= BigInt( aScaleY.GetDenominator() );
-
-                        if( aOrigin.Y() >= 0 )
-                        {
-                            if( aScaleY.GetNumerator() >= 0 )
-                                aY += BigInt( aScaleY.GetNumerator()/2 );
-                            else
-                                aY -= BigInt( (aScaleY.GetNumerator()+1)/2 );
-                        }
-                        else
-                        {
-                            if( aScaleY.GetNumerator() >= 0 )
-                                aY -= BigInt( (aScaleY.GetNumerator()-1)/2 );
-                            else
-                                aY += BigInt( aScaleY.GetNumerator()/2 );
-                        }
-
-                        aY /= BigInt( aScaleY.GetNumerator() );
-                        aOrigin.Y() = (long)aY + aMM.GetOrigin().Y();
-                        aSrcMapMode.SetOrigin( aOrigin );
-
-                        aScaleX *= aSrcMapMode.GetScaleX();
-                        aScaleY *= aSrcMapMode.GetScaleY();
-                        aSrcMapMode.SetScaleX( aScaleX );
-                        aSrcMapMode.SetScaleY( aScaleY );
-                    }
-                    else
-                        aSrcMapMode = pA->GetMapMode();
-                }
-            }
-            break;
-
-            case META_FONT_ACTION:
-            {
-                const MetaFontAction* pA = (const MetaFontAction*) pMA;
-                aSrcFont=pA->GetFont();
-            }
-            break;
-
-            case META_PUSH_ACTION:
-            {
-                PictWriterAttrStackMember * pAt = new PictWriterAttrStackMember;
-                pAt->aLineColor=aLineColor;
-                pAt->aFillColor=aFillColor;
-                pAt->eRasterOp=eSrcRasterOp;
-                pAt->aFont=aSrcFont;
-                pAt->aMapMode=aSrcMapMode;
-                pAt->aClipRect=aClipRect;
-                pAt->pSucc=pAttrStack;
-                pAttrStack=pAt;
-            }
-            break;
-
-            case META_POP_ACTION:
-            {
-                PictWriterAttrStackMember* pAt=pAttrStack;
-
-                if( pAt )
-                {
-                    aLineColor=pAt->aLineColor;
-                    aFillColor=pAt->aFillColor;
-                    eSrcRasterOp=pAt->eRasterOp;
-                    aSrcFont=pAt->aFont;
-                    aSrcMapMode=pAt->aMapMode;
-                    if ( pAt->aClipRect != aClipRect )
-                    {
-                        Rectangle aRect( pAt->aClipRect );
-                        *pPict  << (sal_uInt16)1    // opcode 1
-                                << (sal_uInt16)10   // data size
-                                << (sal_Int16)aRect.Top() << (sal_Int16)aRect.Left()
-                                << (sal_Int16)aRect.Bottom() << (sal_Int16)aRect.Right();
-                    }
-                    aClipRect=pAt->aClipRect;
-                    pAttrStack=pAt->pSucc;
-                    delete pAt;
-                }
-            }
-            break;
-
-            case META_RASTEROP_ACTION:
-            {
-                const MetaRasterOpAction* pA = (const MetaRasterOpAction*) pMA;
-                eSrcRasterOp=pA->GetRasterOp();
-            }
-            break;
-
-            case META_TRANSPARENT_ACTION:
-            {
-                const PolyPolygon& rPolyPoly = ( (const MetaTransparentAction*) pMA )->GetPolyPolygon();
-
-                if (aFillColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForPaint();
-                    WriteOpcode_Poly( PDM_PAINT, PolyPolygonToPolygon( rPolyPoly ) );
-                }
-
-                if (aLineColor!=Color( COL_TRANSPARENT ))
-                {
-                    SetAttrForFrame();
-                    for( USHORT i = 0, nCount = rPolyPoly.Count(); i < nCount; i++ )
-                        WriteOpcode_Poly( PDM_FRAME, rPolyPoly.GetObject( i ) );
-                }
-            }
-            break;
-
-            case META_FLOATTRANSPARENT_ACTION:
-            {
-                const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pMA;
-
-                GDIMetaFile     aTmpMtf( pA->GetGDIMetaFile() );
-                Point           aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
-                const Size      aSrcSize( aTmpMtf.GetPrefSize() );
-                const Point     aDestPt( pA->GetPoint() );
-                const Size      aDestSize( pA->GetSize() );
-                const double    fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0;
-                const double    fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0;
-                long            nMoveX, nMoveY;
-
-                if( fScaleX != 1.0 || fScaleY != 1.0 )
-                {
-                    aTmpMtf.Scale( fScaleX, fScaleY );
-                    aSrcPt.X() = FRound( aSrcPt.X() * fScaleX ), aSrcPt.Y() = FRound( aSrcPt.Y() * fScaleY );
-                }
-
-                nMoveX = aDestPt.X() - aSrcPt.X(), nMoveY = aDestPt.Y() - aSrcPt.Y();
-
-                if( nMoveX || nMoveY )
-                    aTmpMtf.Move( nMoveX, nMoveY );
-
-                WriteOpcodes( aTmpMtf );
-            }
-            break;
-        }
-
-        nWrittenActions++;
-        MayCallback();
-
-        if (pPict->GetError())
-        bStatus=FALSE;
-
-        if (bStatus==FALSE)
-        break;
-    }
-}
-
-
-void PictWriter::WriteHeader(const GDIMetaFile & rMTF)
-{
-    USHORT  i;
-    Size aSize( rMTF.GetPrefSize() );
-    Point aPoint;
-    Rectangle   aRect( aPoint, aSize );
-
-    // 512 Bytes "Muell" am Anfang:
-    for (i=0;i<128;i++) *pPict << (sal_uInt32)0;
-
-    // Lo-16-Bits der Groesse der Datei ohne die 512 Bytes Muell:
-    *pPict << (USHORT)0; // wird spaeter durch UpdateHeader() berichtigt
-
-    // Das Bounding-Rectangle (y1,x1,y2,x2 !):
-    WriteRectangle( aRect );
-
-    // Version 2:
-    *pPict << (sal_uInt32)0x001102ff;
-
-    // Extended-Version-2-Header:
-    *pPict << (USHORT)0x0c00                            // Opcode
-           << (USHORT)0xfffe                            // Version (?)
-           << (USHORT)0x0000                            // Reserved
-           << (sal_uInt32) 0x00480000                        // hRes
-           << (sal_uInt32) 0x00480000;
-    WriteRectangle( aRect );
-    *pPict << (sal_uInt32)0x00000000;                        // Reserved
-
-    // viele Import-Filter verlangen die Angabe eines
-    // Clipping-Bereichs am Anfang
-
-    WriteOpcode_ClipRect( aRect );
-}
-
-
-void PictWriter::UpdateHeader()
-{
-    ULONG nPos;
-
-    // Lo-16-Bits der Groesse der Datei ohne die 512 Bytes Muell berichtigen:
-    nPos=pPict->Tell();
-    pPict->Seek(512);
-    *pPict << (USHORT)((nPos-512)&0x0000ffff);
-    pPict->Seek(nPos);
-}
-
-
-BOOL PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStream, FilterConfigItem* pFilterConfigItem )
-{
-    PictWriterAttrStackMember*  pAt;
-    MapMode                     aMap72( MAP_INCH );
-    Fraction                    aDPIFrac( 1, 72 );
-
-    bStatus=TRUE;
-    nLastPercent=0;
-
-    if ( pFilterConfigItem )
-    {
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    pPict=&rTargetStream;
-    pPict->SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN);
-
-    aLineColor=Color( COL_BLACK );
-    aFillColor=Color( COL_WHITE );
-    eSrcRasterOp=ROP_OVERPAINT;
-    aSrcFont=Font();
-    aSrcMapMode = rMTF.GetPrefMapMode();
-
-    aMap72.SetScaleX( aDPIFrac );
-    aMap72.SetScaleY( aDPIFrac );
-    aTargetMapMode = aMap72;
-
-    pAttrStack=NULL;
-
-    bDstBkPatValid=FALSE;
-    bDstTxFaceValid=FALSE;
-    bDstTxModeValid=FALSE;
-    bDstPnSizeValid=FALSE;
-    bDstPnModeValid=FALSE;
-    bDstPnPatValid=FALSE;
-    bDstFillPatValid=FALSE;
-    bDstTxSizeValid=FALSE;
-    bDstFgColValid=FALSE;
-    bDstBkColValid=FALSE;
-    bDstPenPositionValid=FALSE;
-    bDstTextPositionValid=FALSE;
-    bDstFontNameValid=FALSE;
-
-    nNumberOfActions=0;
-    nNumberOfBitmaps=0;
-    nWrittenActions=0;
-    nWrittenBitmaps=0;
-    nActBitmapPercent=0;
-
-    CountActionsAndBitmaps(rMTF);
-
-    WriteHeader(rMTF);
-    WriteOpcodes(rMTF);
-    WriteOpcode_EndOfFile();
-    UpdateHeader();
-
-    while (pAttrStack!=NULL) {
-        pAt=pAttrStack;
-        pAttrStack=pAt->pSucc;
-        delete pAt;
-    }
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return bStatus;
-}
-
-//================== GraphicExport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, BOOL)
-{
-    PictWriter      aPictWriter;
-
-    if (rGraphic.GetType()==GRAPHIC_GDIMETAFILE)
-    {
-        GDIMetaFile aScaledMtf( rGraphic.GetGDIMetaFile() );
-
-/*
-        MapMode     aMap72( MAP_INCH );
-        Fraction    aDPIFrac( 1, 72 );
-        Size        aOldSize = aScaledMtf.GetPrefSize();
-
-        aMap72.SetScaleX( aDPIFrac );
-        aMap72.SetScaleY( aDPIFrac );
-
-        Size aNewSize = OutputDevice::LogicToLogic( aOldSize,
-                                                    aScaledMtf.GetPrefMapMode(),
-                                                    aMap72 );
-
-        aScaledMtf.Scale( Fraction( aNewSize.Width(), aOldSize.Width() ),
-                          Fraction( aNewSize.Height(), aOldSize.Height() ) );
-        aScaledMtf.SetPrefMapMode( aMap72 );
-        aScaledMtf.SetPrefSize( aNewSize );
-*/
-
-        return aPictWriter.WritePict( aScaledMtf, rStream, pFilterConfigItem );
-    }
-    else
-    {
-        Bitmap aBmp=rGraphic.GetBitmap();
-        GDIMetaFile aMTF;
-        VirtualDevice aVirDev;
-
-        aMTF.Record(&aVirDev);
-        aVirDev.DrawBitmap(Point(),aBmp);
-        aMTF.Stop();
-        aMTF.SetPrefSize(aBmp.GetSizePixel());
-        return aPictWriter.WritePict( aMTF, rStream, pFilterConfigItem );
-    }
-}
-
-//================== GraphicDialog - die exportierte Funktion ================
-
-extern "C" BOOL SAL_CALL DoExportDialog( FltCallDialogParameter& rPara )
-{
-    BOOL    bRet = FALSE;
-
-    if ( rPara.pWindow )
-    {
-        ByteString  aResMgrName( "ept" );
-        ResMgr* pResMgr;
-
-        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
-        if( pResMgr )
-        {
-            rPara.pResMgr = pResMgr;
-            bRet = ( DlgExportEPCT( rPara ).Execute() == RET_OK );
-            delete pResMgr;
-        }
-        else
-            bRet = TRUE;
-    }
-
-    return bRet;
-}
-
-
-//=============================== fuer Windows ==============================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/goodies/source/filter.vcl/epict/epictstr.src b/goodies/source/filter.vcl/epict/epictstr.src
deleted file mode 100644
index 69cf2909f47c..000000000000
--- a/goodies/source/filter.vcl/epict/epictstr.src
+++ /dev/null
@@ -1,41 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: epictstr.src,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.
- *
- ************************************************************************/
-
-#include "strings.hrc"
-
-String KEY_MODE
-{
-    Text = "ExportMode";
-};
-
-String KEY_SIZE
-{
-    Text = "Size";
-};
diff --git a/goodies/source/filter.vcl/epict/exports.map b/goodies/source/filter.vcl/epict/exports.map
deleted file mode 100644
index 2f21c5c04b53..000000000000
--- a/goodies/source/filter.vcl/epict/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-PICTEXPORTER_1_0 {
-        global:
-                GraphicExport;
-                DoExportDialog;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/epict/makefile.mk b/goodies/source/filter.vcl/epict/makefile.mk
deleted file mode 100644
index 9f25a562488a..000000000000
--- a/goodies/source/filter.vcl/epict/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=epict
-TARGET2=ept
-DEPTARGET=vepict
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	dlgepct.src	\
-            epictstr.src
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/epict.obj \
-            $(SLO)$/dlgepct.obj
-.ENDIF
-# ==========================================================================
-
-RESLIB1NAME=$(TARGET2)
-RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
-.IF "$(L10N_framework)"==""
-SHL1TARGET=     ept$(DLLPOSTFIX)
-SHL1IMPLIB=     epict
-SHL1STDLIBS=    $(TOOLSLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB) $(BASEGFXLIB)
-
-SHL1LIBS=       $(SLB)$/epict.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/epict.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/goodies/source/filter.vcl/epict/strings.hrc b/goodies/source/filter.vcl/epict/strings.hrc
deleted file mode 100644
index fe559eb8a2a9..000000000000
--- a/goodies/source/filter.vcl/epict/strings.hrc
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: strings.hrc,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.
- *
- ************************************************************************/
-#define KEY_MODE            260
-#define KEY_SIZE            261
-
diff --git a/goodies/source/filter.vcl/eppm/dlgeppm.cxx b/goodies/source/filter.vcl/eppm/dlgeppm.cxx
deleted file mode 100644
index ce7f6e45f2d9..000000000000
--- a/goodies/source/filter.vcl/eppm/dlgeppm.cxx
+++ /dev/null
@@ -1,99 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeppm.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#ifndef GCC
-#endif
-#include <tools/ref.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include <vcl/msgbox.hxx>
-#include "dlgeppm.hxx"
-#include "dlgeppm.hrc"
-#include "strings.hrc"
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportEPPM::DlgExportEPPM( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_EPPM, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aGrpFormat          ( this, ResId( GRP_FORMAT, *rPara.pResMgr ) ),
-                aRBRaw              ( this, ResId( RB_RAW, *rPara.pResMgr ) ),
-                aRBASCII            ( this, ResId( RB_ASCII, *rPara.pResMgr ) ),
-                aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr )
-{
-    FreeResource();
-
-    // Config-Parameter lesen
-
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/PPM" ) );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-    sal_Int32   nFormat = pConfigItem->ReadInt32( String( ResId( KEY_FORMAT, *pMgr ) ), 0 );
-
-    BOOL bCheck = FALSE;
-    if ( !nFormat )
-        bCheck ^= TRUE;
-    aRBRaw.Check( bCheck );
-    bCheck ^= TRUE;
-    aRBASCII.Check( bCheck );
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportEPPM, OK ) );
-}
-
-DlgExportEPPM::~DlgExportEPPM()
-{
-    delete pConfigItem;
-}
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEPPM, OK, void *, EMPTYARG )
-{
-    // Config-Parameter schreiben
-    sal_Int32   nFormat = 0;
-    if ( aRBASCII.IsChecked() )
-        nFormat++;
-    pConfigItem->WriteInt32( String( ResId( KEY_FORMAT, *pMgr ) ), nFormat );
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
diff --git a/goodies/source/filter.vcl/eppm/dlgeppm.hrc b/goodies/source/filter.vcl/eppm/dlgeppm.hrc
deleted file mode 100644
index 67a392c7eb12..000000000000
--- a/goodies/source/filter.vcl/eppm/dlgeppm.hrc
+++ /dev/null
@@ -1,37 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeppm.hrc,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.
- *
- ************************************************************************/
-#include "goodies.hrc"
-
-#define BTN_OK      1
-#define BTN_CANCEL  1
-#define BTN_HELP    1
-#define GRP_FORMAT  1
-#define RB_RAW      1
-#define RB_ASCII    2
diff --git a/goodies/source/filter.vcl/eppm/dlgeppm.hxx b/goodies/source/filter.vcl/eppm/dlgeppm.hxx
deleted file mode 100644
index 8114f1575784..000000000000
--- a/goodies/source/filter.vcl/eppm/dlgeppm.hxx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeppm.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.
- *
- ************************************************************************/
-
-
-#ifndef _DLGEPPM_HXX_
-#define _DLGEPPM_HXX_
-#include <svtools/fltcall.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <svtools/stdctrl.hxx>
-
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen
-|*
-\************************************************************************/
-
-class FilterConfigItem;
-class ResMgr;
-
-class DlgExportEPPM : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    FixedLine           aGrpFormat;
-    RadioButton         aRBRaw;
-    RadioButton         aRBASCII;
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
-
-    DECL_LINK( OK, void * );
-
-public:
-            DlgExportEPPM( FltCallDialogParameter& rPara );
-            ~DlgExportEPPM();
-};
-
-#endif // _DLGEPPM_HXX_
diff --git a/goodies/source/filter.vcl/eppm/dlgeppm.src b/goodies/source/filter.vcl/eppm/dlgeppm.src
deleted file mode 100644
index e6d8e687a6aa..000000000000
--- a/goodies/source/filter.vcl/eppm/dlgeppm.src
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeppm.src,v $
- * $Revision: 1.22 $
- *
- * 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 "dlgeppm.hrc"
-ModalDialog DLG_EXPORT_EPPM
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 133 , 63 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Text [ en-US ] = "PPM Options" ;
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 73 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 73 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 73 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine GRP_FORMAT
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 60 , 8 ) ;
-        Text [ en-US ] = "File format";
-    };
-    RadioButton RB_RAW
-    {
-        Pos = MAP_APPFONT ( 12 , 14 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Binary";
-    };
-    RadioButton RB_ASCII
-    {
-        Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 45 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Text";
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/goodies/source/filter.vcl/eppm/eppm.cxx b/goodies/source/filter.vcl/eppm/eppm.cxx
deleted file mode 100644
index d17b4f7777ae..000000000000
--- a/goodies/source/filter.vcl/eppm/eppm.cxx
+++ /dev/null
@@ -1,308 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: eppm.cxx,v $
- * $Revision: 1.12 $
- *
- * 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_goodies.hxx"
-
-#include <vcl/svapp.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <vcl/msgbox.hxx>
-#include <svl/solar.hrc>
-#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include "strings.hrc"
-#include "dlgeppm.hrc"
-#include "dlgeppm.hxx"
-
-//============================ PPMWriter ==================================
-
-class PPMWriter {
-
-private:
-
-    SvStream*           mpOStm;             // Die auszugebende PPM-Datei
-    USHORT              mpOStmOldModus;
-
-    BOOL                mbStatus;
-    sal_Int32           mnMode;
-    BitmapReadAccess*   mpAcc;
-    ULONG               mnWidth, mnHeight;  // Bildausmass in Pixeln
-
-    BOOL                ImplWriteHeader();
-    void                ImplWriteBody();
-    void                ImplWriteNumber( sal_Int32 );
-
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-public:
-                        PPMWriter();
-                        ~PPMWriter();
-
-    BOOL                WritePPM( const Graphic& rGraphic, SvStream& rPPM, FilterConfigItem* pFilterConfigItem );
-};
-
-//=================== Methoden von PPMWriter ==============================
-
-PPMWriter::PPMWriter() :
-    mbStatus    ( TRUE ),
-    mpAcc       ( NULL )
-{
-}
-
-// ------------------------------------------------------------------------
-
-PPMWriter::~PPMWriter()
-{
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PPMWriter::WritePPM( const Graphic& rGraphic, SvStream& rPPM, FilterConfigItem* pFilterConfigItem )
-{
-
-    mpOStm = &rPPM;
-
-    if ( pFilterConfigItem )
-    {
-        mnMode = pFilterConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "FileFormat" ) ), 0 );
-
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    BitmapEx    aBmpEx( rGraphic.GetBitmapEx() );
-    Bitmap      aBmp = aBmpEx.GetBitmap();
-    aBmp.Convert( BMP_CONVERSION_24BIT );
-
-    mpOStmOldModus = mpOStm->GetNumberFormatInt();
-    mpOStm->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-
-    mpAcc = aBmp.AcquireReadAccess();
-    if( mpAcc )
-    {
-        if ( ImplWriteHeader() )
-        {
-            ImplWriteBody();
-        }
-        aBmp.ReleaseAccess( mpAcc );
-    }
-    else
-        mbStatus = FALSE;
-
-    mpOStm->SetNumberFormatInt( mpOStmOldModus );
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PPMWriter::ImplWriteHeader()
-{
-    mnWidth = mpAcc->Width();
-    mnHeight = mpAcc->Height();
-    if ( mnWidth && mnHeight )
-    {
-        if ( mnMode == 0 )
-            *mpOStm << "P6\x0a";
-        else
-            *mpOStm << "P3\x0a";
-
-        ImplWriteNumber( mnWidth );
-        *mpOStm << (BYTE)32;
-        ImplWriteNumber( mnHeight );
-        *mpOStm << (BYTE)32;
-        ImplWriteNumber( 255 );         // max. col.
-        *mpOStm << (BYTE)10;
-    }
-    else
-        mbStatus = FALSE;
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void PPMWriter::ImplWriteBody()
-{
-    if ( mnMode == 0 )
-    {
-        for ( ULONG y = 0; y < mnHeight; y++ )
-        {
-            for ( ULONG x = 0; x < mnWidth; x++ )
-            {
-                const BitmapColor& rColor = mpAcc->GetPixel( y, x );
-                *mpOStm << rColor.GetRed();
-                *mpOStm << rColor.GetGreen();
-                *mpOStm << rColor.GetBlue();
-            }
-        }
-    }
-    else
-    {
-        for ( ULONG y = 0; y < mnHeight; y++ )
-        {
-            int nCount = 70;
-            for ( ULONG x = 0; x < mnWidth; x++ )
-            {
-                BYTE i, nDat[3], nNumb;
-                if ( nCount < 0 )
-                {
-                    nCount = 69;
-                    *mpOStm << (BYTE)10;
-                }
-                nDat[0] = mpAcc->GetPixel( y, x ).GetRed();
-                nDat[1] = mpAcc->GetPixel( y, x ).GetGreen();
-                nDat[2] = mpAcc->GetPixel( y, x ).GetBlue();
-                for ( i = 0; i < 3; i++ )
-                {
-                    nNumb = nDat[ i ] / 100;
-                    if ( nNumb )
-                    {
-                        *mpOStm << (BYTE)( nNumb + '0' );
-                        nDat[ i ] -= ( nNumb * 100 );
-                        nNumb = nDat[ i ] / 10;
-                        *mpOStm << (BYTE)( nNumb + '0' );
-                        nDat[ i ] -= ( nNumb * 10 );
-                        *mpOStm << (BYTE)( nDat[ i ] + '0' );
-                        nCount -= 4;
-                    }
-                    else
-                    {
-                        nNumb = nDat[ i ] / 10;
-                        if ( nNumb )
-                        {
-                            *mpOStm << (BYTE)( nNumb + '0' );
-                            nDat[ i ] -= ( nNumb * 10 );
-                            *mpOStm << (BYTE)( nDat[ i ] + '0' );
-                            nCount -= 3;
-                        }
-                        else
-                        {
-                            *mpOStm << (BYTE)( nDat[ i ] + '0' );
-                            nCount -= 2;
-                        }
-                    }
-                    *mpOStm << (BYTE)' ';
-                }
-            }
-            *mpOStm << (BYTE)10;
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-
-void PPMWriter::ImplWriteNumber( sal_Int32 nNumber )
-{
-    const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
-    for( sal_Int16 n = 0, nLen = aNum.Len(); n < nLen; n++  )
-        *mpOStm << aNum.GetChar( n );
-
-}
-
-// ------------------------------------------------------------------------
-
-// ---------------------
-// - exported function -
-// ---------------------
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, BOOL )
-{
-    PPMWriter aPPMWriter;
-    return aPPMWriter.WritePPM( rGraphic, rStream, pFilterConfigItem );
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" BOOL __LOADONCALLAPI DoExportDialog( FltCallDialogParameter& rPara )
-{
-    BOOL bRet = FALSE;
-
-    if ( rPara.pWindow )
-    {
-        ByteString  aResMgrName( "epp" );
-        ResMgr* pResMgr;
-
-        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
-        if( pResMgr )
-        {
-            rPara.pResMgr = pResMgr;
-            bRet = ( DlgExportEPPM( rPara ).Execute() == RET_OK );
-            delete pResMgr;
-        }
-        else
-            bRet = TRUE;
-    }
-
-    return bRet;
-}
-
-#ifndef GCC
-#endif
-
-// ------------------------------------------------------------------------
-
-// ---------------
-// - Win16 trash -
-// ---------------
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-    if ( nHeap )
-        UnlockData( 0 );
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/eppm/eppmstr.src b/goodies/source/filter.vcl/eppm/eppmstr.src
deleted file mode 100644
index 2cf556cf0bc1..000000000000
--- a/goodies/source/filter.vcl/eppm/eppmstr.src
+++ /dev/null
@@ -1,38 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: eppmstr.src,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.
- *
- ************************************************************************/
-
-
-#include "strings.hrc"
-
-// Key fuer den Dialog
-String KEY_FORMAT
-{
-    Text = "FileFormat";
-};
diff --git a/goodies/source/filter.vcl/eppm/exports.map b/goodies/source/filter.vcl/eppm/exports.map
deleted file mode 100644
index 0462b75b7b43..000000000000
--- a/goodies/source/filter.vcl/eppm/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-PPMEXPORTER_1_0 {
-        global:
-                GraphicExport;
-                DoExportDialog;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/eppm/makefile.mk b/goodies/source/filter.vcl/eppm/makefile.mk
deleted file mode 100644
index b40f9d897b8a..000000000000
--- a/goodies/source/filter.vcl/eppm/makefile.mk
+++ /dev/null
@@ -1,80 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=eppm
-TARGET2=epp
-DEPTARGET=veppm
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES=	dlgeppm.src \
-            eppmstr.src
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/eppm.obj \
-            $(SLO)$/dlgeppm.obj
-.ENDIF
-# ==========================================================================
-
-RESLIB1NAME=$(TARGET2)
-RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
-.IF "$(L10N_framework)"==""
-SHL1TARGET= 	epp$(DLLPOSTFIX)
-SHL1IMPLIB= 	eppm
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(CPPULIB) $(SVTOOLLIB) $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/eppm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/eppm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/goodies/source/filter.vcl/eps/dlgeps.cxx b/goodies/source/filter.vcl/eps/dlgeps.cxx
deleted file mode 100644
index 042b979f4ecd..000000000000
--- a/goodies/source/filter.vcl/eps/dlgeps.cxx
+++ /dev/null
@@ -1,209 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeps.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#ifndef GCC
-#endif
-
-#include <tools/ref.hxx>
-#include <vcl/msgbox.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include "dlgeps.hxx"
-#include "dlgeps.hrc"
-#include "strings.hrc"
-
-/*************************************************************************
-|*
-|* Ctor
-|*
-\************************************************************************/
-
-DlgExportEPS::DlgExportEPS( FltCallDialogParameter& rPara ) :
-                ModalDialog         ( rPara.pWindow, ResId( DLG_EXPORT_EPS, *rPara.pResMgr ) ),
-                rFltCallPara        ( rPara ),
-                aGrpPreview         ( this, ResId( GRP_PREVIEW, *rPara.pResMgr ) ),
-                aCBPreviewTiff      ( this, ResId( CB_PREVIEW_TIFF, *rPara.pResMgr ) ),
-                aCBPreviewEPSI      ( this, ResId( CB_PREVIEW_EPSI, *rPara.pResMgr ) ),
-                aGrpVersion         ( this, ResId( GRP_VERSION, *rPara.pResMgr ) ),
-                aRBLevel1           ( this, ResId( RB_LEVEL1, *rPara.pResMgr ) ),
-                aRBLevel2           ( this, ResId( RB_LEVEL2, *rPara.pResMgr ) ),
-                aGrpColor           ( this, ResId( GRP_COLOR, *rPara.pResMgr ) ),
-                aRBColor            ( this, ResId( RB_COLOR, *rPara.pResMgr ) ),
-                aRBGrayscale        ( this, ResId( RB_GRAYSCALE, *rPara.pResMgr ) ),
-                aGrpCompression     ( this, ResId( GRP_COMPRESSION, *rPara.pResMgr ) ),
-                aRBCompressionLZW   ( this, ResId( RB_COMPRESSION_LZW, *rPara.pResMgr ) ),
-                aRBCompressionNone  ( this, ResId( RB_COMPRESSION_NONE, *rPara.pResMgr ) ),
-                aBtnOK              ( this, ResId( BTN_OK, *rPara.pResMgr ) ),
-                aBtnCancel          ( this, ResId( BTN_CANCEL, *rPara.pResMgr ) ),
-                aBtnHelp            ( this, ResId( BTN_HELP, *rPara.pResMgr ) ),
-                pMgr                ( rPara.pResMgr )
-{
-    FreeResource();
-
-    String  aFilterConfigPath( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Filter/Graphic/Export/EPS" ) );
-    pConfigItem = new FilterConfigItem( aFilterConfigPath, &rPara.aFilterData );
-
-    // Config-Parameter lesen
-    String sPreview( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) );
-    String sVersion( RTL_CONSTASCII_USTRINGPARAM( "Version" ) );
-    String sColorFormat( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) );
-    String sCompressionMode( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) );
-    String sTextMode( RTL_CONSTASCII_USTRINGPARAM( "TextMode" ) );
-
-    sal_Int32   nPreview = pConfigItem->ReadInt32( sPreview, 0 );
-    sal_Int32   nVersion = pConfigItem->ReadInt32( sVersion, 2 );
-    sal_Int32   nColor = pConfigItem->ReadInt32( sColorFormat, 0 );
-    sal_Int32   nCompr = pConfigItem->ReadInt32( sCompressionMode, 2 );
-
-    /* SJ: The following line is not superfluous, reading the item will also    #106652#
-       create the corresponding FilterData Property. Since all filter
-       are no longer accessing the configuration itself, we have fill the
-       FilterData sequence with all available configuration items */
-    pConfigItem->ReadInt32( sTextMode, 0 );
-
-    BOOL bCheck = FALSE;
-    if ( nPreview & 1 )
-        bCheck = TRUE;
-    aCBPreviewTiff.Check( bCheck );
-    if ( nPreview & 2 )
-        bCheck = TRUE;
-    aCBPreviewEPSI.Check( bCheck );
-
-    bCheck = FALSE;
-    if ( nVersion == 1 )
-        bCheck ^= TRUE;
-    aRBLevel1.Check( bCheck );
-    bCheck ^= TRUE;
-    aRBLevel2.Check( bCheck );
-
-    bCheck = FALSE;
-    if ( nColor == 1 )
-        bCheck ^= TRUE;
-    aRBColor.Check( bCheck );
-    bCheck ^= TRUE;
-    aRBGrayscale.Check( bCheck );
-
-    bCheck = FALSE;
-    if ( nCompr == 1 )
-        bCheck ^= TRUE;
-    aRBCompressionLZW.Check( bCheck );
-    bCheck ^= TRUE;
-    aRBCompressionNone.Check( bCheck );
-
-    if ( aRBLevel1.IsChecked() )
-    {
-        aRBColor.Disable();
-        aRBGrayscale.Disable();
-        aRBCompressionNone.Disable();
-        aRBCompressionLZW.Disable();
-        aRBCompressionNone.Disable();
-    }
-
-    aBtnOK.SetClickHdl( LINK( this, DlgExportEPS, OK ) );
-    aRBLevel1.SetClickHdl( LINK( this, DlgExportEPS, LEVEL1 ) );
-    aRBLevel2.SetClickHdl( LINK( this, DlgExportEPS, LEVEL2 ) );
-}
-
-DlgExportEPS::~DlgExportEPS()
-{
-    delete pConfigItem;
-}
-
-/*************************************************************************
-|*
-|* Speichert eingestellte Werte in ini-Datei
-|*
-\************************************************************************/
-
-IMPL_LINK( DlgExportEPS, OK, void *, EMPTYARG )
-{
-
-    // Config-Parameter schreiben
-    sal_Int32 nCheck = 0;
-    if ( aCBPreviewTiff.IsChecked() )
-        nCheck++;
-    if ( aCBPreviewEPSI.IsChecked() )
-        nCheck += 2;
-
-    String sPreview( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) );
-    pConfigItem->WriteInt32( sPreview, nCheck );
-
-    nCheck = 1;
-    if ( aRBLevel2.IsChecked() )
-        nCheck++;
-    String sVersion( RTL_CONSTASCII_USTRINGPARAM( "Version" ) );
-    pConfigItem->WriteInt32( sVersion, nCheck );
-
-    nCheck = 1;
-    if ( aRBGrayscale.IsChecked() )
-        nCheck++;
-    String sColorFormat( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) );
-    pConfigItem->WriteInt32( sColorFormat, nCheck );
-
-    nCheck = 1;
-    if ( aRBCompressionNone.IsChecked() )
-        nCheck++;
-    String sCompressionMode( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) );
-    pConfigItem->WriteInt32( sCompressionMode, nCheck );
-
-    rFltCallPara.aFilterData = pConfigItem->GetFilterData();
-    EndDialog( RET_OK );
-
-    return 0;
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( DlgExportEPS, LEVEL1, void*, EMPTYARG )
-{
-    if ( aRBLevel1.IsChecked() )
-    {
-        aRBColor.Disable();
-        aRBGrayscale.Disable();
-        aRBCompressionLZW.Disable();
-        aRBCompressionNone.Disable();
-    }
-    return 0;
-}
-
-//------------------------------------------------------------------------
-
-IMPL_LINK( DlgExportEPS, LEVEL2, void*, EMPTYARG )
-{
-    if ( aRBLevel2.IsChecked() )
-    {
-        aRBColor.Enable();
-        aRBGrayscale.Enable();
-        aRBCompressionLZW.Enable();
-        aRBCompressionNone.Enable();
-    }
-    return 0;
-}
diff --git a/goodies/source/filter.vcl/eps/dlgeps.hrc b/goodies/source/filter.vcl/eps/dlgeps.hrc
deleted file mode 100644
index c2c357cf62d3..000000000000
--- a/goodies/source/filter.vcl/eps/dlgeps.hrc
+++ /dev/null
@@ -1,46 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeps.hrc,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.
- *
- ************************************************************************/
-#include "goodies.hrc"
-
-#define BTN_OK 1
-#define BTN_CANCEL 1
-#define BTN_HELP 1
-#define GRP_PREVIEW 1
-#define GRP_VERSION 2
-#define GRP_COLOR 3
-#define GRP_COMPRESSION 4
-#define CB_PREVIEW_TIFF 1
-#define CB_PREVIEW_EPSI 2
-#define RB_LEVEL1 1
-#define RB_LEVEL2 2
-#define RB_COLOR  3
-#define RB_GRAYSCALE 4
-#define RB_COMPRESSION_LZW 5
-#define RB_COMPRESSION_NONE 6
diff --git a/goodies/source/filter.vcl/eps/dlgeps.hxx b/goodies/source/filter.vcl/eps/dlgeps.hxx
deleted file mode 100644
index 804c539766fa..000000000000
--- a/goodies/source/filter.vcl/eps/dlgeps.hxx
+++ /dev/null
@@ -1,85 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeps.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _DLGEPS_HXX_
-#define _DLGEPS_HXX_
-#include <svtools/fltcall.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <vcl/lstbox.hxx>
-#include <svtools/stdctrl.hxx>
-
-
-/*************************************************************************
-|*
-|* Dialog zum Einstellen von Filteroptionen
-|*
-\************************************************************************/
-
-class FilterConfigItem;
-class ResMgr;
-
-class DlgExportEPS : public ModalDialog
-{
-private:
-
-    FltCallDialogParameter& rFltCallPara;
-
-    FixedLine           aGrpPreview;
-    CheckBox            aCBPreviewTiff;
-    CheckBox            aCBPreviewEPSI;
-    FixedLine           aGrpVersion;
-    RadioButton         aRBLevel1;
-    RadioButton         aRBLevel2;
-    FixedLine           aGrpColor;
-    RadioButton         aRBColor;
-    RadioButton         aRBGrayscale;
-    FixedLine           aGrpCompression;
-    RadioButton         aRBCompressionLZW;
-    RadioButton         aRBCompressionNone;
-    OKButton            aBtnOK;
-    CancelButton        aBtnCancel;
-    HelpButton          aBtnHelp;
-
-    FilterConfigItem*   pConfigItem;
-    ResMgr*             pMgr;
-
-    DECL_LINK( OK, void * );
-    DECL_LINK( LEVEL1, void* );
-    DECL_LINK( LEVEL2, void* );
-
-public:
-            DlgExportEPS( FltCallDialogParameter& rPara );
-            ~DlgExportEPS();
-};
-
-#endif // _DLGEPS_HXX_
diff --git a/goodies/source/filter.vcl/eps/dlgeps.src b/goodies/source/filter.vcl/eps/dlgeps.src
deleted file mode 100644
index 278518762441..000000000000
--- a/goodies/source/filter.vcl/eps/dlgeps.src
+++ /dev/null
@@ -1,163 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dlgeps.src,v $
- * $Revision: 1.47 $
- *
- * 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 "dlgeps.hrc"
-ModalDialog DLG_EXPORT_EPS
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 230, 161 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Text [ en-US ] = "EPS Export Options";
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 174 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 174, 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 174 , 43 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-
-    FixedLine GRP_PREVIEW
-    {
-        Pos = MAP_APPFONT ( 6 , 3  ) ;
-        Size = MAP_APPFONT ( 162 , 8 ) ;
-        Text [ en-US ] = "Preview";
-    };
-    CheckBox CB_PREVIEW_TIFF
-    {
-        Pos = MAP_APPFONT ( 12, 14 ) ;
-        Size = MAP_APPFONT ( 150 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Image ~preview (TIFF)";
-    };
-    CheckBox CB_PREVIEW_EPSI
-    {
-        Pos = MAP_APPFONT ( 12 , 28 ) ;
-        Size = MAP_APPFONT ( 150, 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Interchange (EPSI)";
-    };
-    FixedLine GRP_VERSION
-    {
-        Pos = MAP_APPFONT ( 6, 41 ) ;
-        Size = MAP_APPFONT ( 162 , 8 ) ;
-        Text [ en-US ] = "Version";
-    };
-    RadioButton RB_LEVEL1
-    {
-        Pos = MAP_APPFONT ( 12 , 52 ) ;
-        Size = MAP_APPFONT ( 150 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Level ~1";
-    };
-    RadioButton RB_LEVEL2
-    {
-        Pos = MAP_APPFONT ( 12 , 66 ) ;
-        Size = MAP_APPFONT ( 150, 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Level ~2";
-    };
-
-    FixedLine GRP_COLOR
-    {
-        Pos = MAP_APPFONT ( 6 , 79 ) ;
-        Size = MAP_APPFONT ( 162 , 8 ) ;
-        Text [ en-US ] = "Color format";
-    };
-    RadioButton RB_COLOR
-    {
-        Pos = MAP_APPFONT ( 12 , 90 ) ;
-        Size = MAP_APPFONT ( 150, 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Color";
-    };
-    RadioButton RB_GRAYSCALE
-    {
-        Pos = MAP_APPFONT ( 12 , 104 ) ;
-        Size = MAP_APPFONT ( 150, 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Grayscale";
-    };
-
-    FixedLine  GRP_COMPRESSION
-    {
-        Pos = MAP_APPFONT ( 6 , 117 ) ;
-        Size = MAP_APPFONT ( 162 , 8 ) ;
-        Text [ en-US ] = "Compression";
-    };
-    RadioButton RB_COMPRESSION_LZW
-    {
-        Pos = MAP_APPFONT ( 12, 128 );
-        Size = MAP_APPFONT ( 150, 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "LZW encoding";
-    };
-    RadioButton RB_COMPRESSION_NONE
-    {
-        Pos = MAP_APPFONT ( 12, 141 ) ;
-        Size = MAP_APPFONT ( 150, 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "None";
-    };
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/goodies/source/filter.vcl/eps/eps.cxx b/goodies/source/filter.vcl/eps/eps.cxx
deleted file mode 100644
index 83b5a94f97f2..000000000000
--- a/goodies/source/filter.vcl/eps/eps.cxx
+++ /dev/null
@@ -1,2796 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: eps.cxx,v $
- * $Revision: 1.37 $
- *
- * 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_goodies.hxx"
-
-#include <vcl/sv.h>
-#include <tools/stream.hxx>
-#include <tools/bigint.hxx>
-#include <tools/poly.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <vcl/region.hxx>
-#include <vcl/metric.hxx>
-#include <vcl/font.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/cvtgrf.hxx>
-#include <vcl/gradient.hxx>
-#include <svl/solar.hrc>
-#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
-#include <vcl/graphictools.hxx>
-#include "strings.hrc"
-#include "dlgeps.hrc"
-#include "dlgeps.hxx"
-
-#include <math.h>
-
-#define POSTSCRIPT_BOUNDINGSEARCH   0x1000  // we only try to get the BoundingBox
-                                            // in the first 4096 bytes
-
-#define EPS_PREVIEW_TIFF    1
-#define EPS_PREVIEW_EPSI    2
-
-#define PS_LINESIZE         70      // maximum number of characters a line in the output
-
-#define PS_NONE             0       // formating mode: action which is inserted behind the output
-#define PS_SPACE            1
-#define PS_RET              2
-#define PS_WRAP             4
-
-// -----------------------------Feld-Typen-------------------------------
-
-struct ChrSet
-{
-    struct ChrSet * pSucc;
-    BYTE nSet;
-    String aName;
-    FontWeight eWeight;
-};
-
-struct StackMember
-{
-    struct      StackMember * pSucc;
-    Color       aGlobalCol;
-    BOOL        bLineCol;
-    Color       aLineCol;
-    BOOL        bFillCol;
-    Color       aFillCol;
-    Color       aTextCol;
-    BOOL        bTextFillCol;
-    Color       aTextFillCol;
-    Color       aBackgroundCol;
-    Font        aFont;
-    TextAlign   eTextAlign;
-
-    double                      fLineWidth;
-    double                      fMiterLimit;
-    SvtGraphicStroke::CapType   eLineCap;
-    SvtGraphicStroke::JoinType  eJoinType;
-    SvtGraphicStroke::DashArray aDashArray;
-};
-
-struct PSLZWCTreeNode
-{
-
-    PSLZWCTreeNode*     pBrother;       // naechster Knoten, der den selben Vater hat
-    PSLZWCTreeNode*     pFirstChild;    // erster Sohn
-    USHORT              nCode;          // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
-    USHORT              nValue;         // Der Pixelwert
-};
-
-class PSWriter
-{
-private:
-    BOOL                mbStatus;
-    ULONG               mnLevelWarning;     // number of embedded eps files which was not exported
-    ULONG               mnLastPercent;      // Mit welcher Zahl pCallback zuletzt aufgerufen wurde.
-    UINT32              mnLatestPush;       // offset auf streamposition, an der zuletzt gepusht wurde
-
-    long                mnLevel;            // dialog options
-    sal_Bool            mbGrayScale;
-    sal_Bool            mbCompression;
-    sal_Int32           mnPreview;
-    sal_Int32           mnTextMode;
-
-    SvStream*           mpPS;
-    const GDIMetaFile*  pMTF;
-    GDIMetaFile*        pAMTF;              // only created if Graphics is not a Metafile
-    VirtualDevice       aVDev;
-
-    double              nBoundingX1;        // this represents the bounding box
-    double              nBoundingY1;
-    double              nBoundingX2;
-    double              nBoundingY2;
-                                            //
-    StackMember*        pGDIStack;
-    ULONG               mnCursorPos;        // aktuelle Cursorposition im Output
-    Color               aColor;             // aktuelle Farbe die fuer den Output benutzt wird
-    BOOL                bLineColor;
-    Color               aLineColor;         // aktuelle GDIMetafile Farbeinstellungen
-    BOOL                bFillColor;         //
-    Color               aFillColor;         //
-    Color               aTextColor;         //
-    BOOL                bTextFillColor;     //
-    Color               aTextFillColor;     //
-    Color               aBackgroundColor;   //
-    BOOL                bRegionChanged;
-    TextAlign           eTextAlign;         //
-
-    double                      fLineWidth;
-    double                      fMiterLimit;
-    SvtGraphicStroke::CapType   eLineCap;
-    SvtGraphicStroke::JoinType  eJoinType;
-    SvtGraphicStroke::DashArray aDashArray;
-
-    Font                maFont;
-    Font                maLastFont;
-    BYTE                nChrSet;
-    ChrSet*             pChrSetList;        // Liste der Character-Sets
-    BYTE                nNextChrSetId;      // die erste unbenutzte ChrSet-Id
-
-    PSLZWCTreeNode*     pTable;             // LZW compression data
-    PSLZWCTreeNode*     pPrefix;            // the compression is as same as the TIFF compression
-    USHORT              nDataSize;
-    USHORT              nClearCode;
-    USHORT              nEOICode;
-    USHORT              nTableSize;
-    USHORT              nCodeSize;
-    ULONG               nOffset;
-    ULONG               dwShift;
-
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-    void                ImplWriteProlog( const Graphic* pPreviewEPSI = NULL );
-    void                ImplWriteEpilog();
-    void                ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev );
-
-                        // this method makes LF's, space inserting and word wrapping as used in all nMode
-                        // parameters
-    inline void         ImplExecMode( ULONG nMode );
-
-                        // writes char[] + LF to stream
-    inline void         ImplWriteLine( const char*, ULONG nMode = PS_RET );
-
-                        // writes ( nNumb / 10^nCount ) in ASCII format to stream
-    void                ImplWriteF( sal_Int32 nNumb, ULONG nCount = 3, ULONG nMode = PS_SPACE );
-
-                        // writes a double in ASCII format to stream
-    void                ImplWriteDouble( double, ULONG nMode = PS_SPACE );
-
-                        // writes a long in ASCII format to stream
-    void                ImplWriteLong( sal_Int32 nNumb, ULONG nMode = PS_SPACE );
-
-                        // writes a byte in ASCII format to stream
-    void                ImplWriteByte( BYTE nNumb, ULONG nMode = PS_SPACE );
-
-                        // writes a byte in ASCII (hex) format to stream
-    void                ImplWriteHexByte( BYTE nNumb, ULONG nMode = PS_WRAP );
-
-                        // writes nNumb as number from 0.000 till 1.000 in ASCII format to stream
-    void                ImplWriteB1( BYTE nNumb, ULONG nMode = PS_SPACE );
-
-    inline void         ImplWritePoint( const Point&, sal_uInt32 nMode = PS_SPACE );
-    void                ImplMoveTo( const Point&, sal_uInt32 nMode = PS_SPACE );
-    void                ImplLineTo( const Point&, sal_uInt32 nMode = PS_SPACE );
-    void                ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3, sal_uInt32 nMode = PS_SPACE );
-    void                ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMode = PS_RET );
-    void                ImplScale( const double& fX, const double& fY, sal_uInt32 nMode = PS_RET );
-
-    void                ImplWriteLine( const Polygon & rPolygon );
-    void                ImplAddPath( const Polygon & rPolygon );
-    void                ImplWriteLineInfo( double fLineWidth, double fMiterLimit, SvtGraphicStroke::CapType eLineCap,
-                                    SvtGraphicStroke::JoinType eJoinType, SvtGraphicStroke::DashArray& rDashArray );
-    void                ImplWriteLineInfo( const LineInfo& rLineInfo );
-    void                ImplRect( const Rectangle & rRectangle );
-    void                ImplRectFill ( const Rectangle & rRectangle );
-    void                ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev );
-    void                ImplIntersect( const PolyPolygon& rPolyPoly );
-    void                ImplPolyPoly( const PolyPolygon & rPolyPolygon, sal_Bool bTextOutline = sal_False );
-    void                ImplPolyLine( const Polygon & rPolygon );
-
-    void                ImplSetClipRegion( Region& rRegion );
-    void                ImplBmp( Bitmap*, Bitmap*, const Point &, double nWidth, double nHeight );
-    void                ImplText( const String& rUniString, const Point& rPos, const INT32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev );
-    void                ImplSetAttrForText( const Point & rPoint );
-    void                ImplWriteCharacter( sal_Char );
-    void                ImplWriteString( const ByteString&, VirtualDevice& rVDev, const INT32* pDXArry = NULL, BOOL bStretch = FALSE );
-    void                ImplDefineFont( const char*, const char* );
-
-    void                ImplClosePathDraw( ULONG nMode = PS_RET );
-    void                ImplPathDraw();
-
-    inline void         ImplWriteLineColor( ULONG nMode = PS_RET );
-    inline void         ImplWriteFillColor( ULONG nMode = PS_RET );
-    inline void         ImplWriteTextColor( ULONG nMode = PS_RET );
-    inline void         ImplWriteTextFillColor( ULONG nMode = PS_RET );
-    void                ImplWriteColor( ULONG nMode );
-
-    double              ImplGetScaling( const MapMode& );
-    void                ImplGetMapMode( const MapMode& );
-    BOOL                ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize );
-    BYTE*               ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSize );
-                        // LZW methods
-    void                StartCompression();
-    void                Compress( BYTE nSrc );
-    void                EndCompression();
-    inline void         WriteBits( USHORT nCode, USHORT nCodeLen );
-
-public:
-    BOOL                WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* );
-    PSWriter();
-    ~PSWriter();
-};
-
-//========================== Methoden von PSWriter ==========================
-
-//---------------------------------------------------------------------------------
-
-PSWriter::PSWriter()
-{
-    pAMTF = NULL;
-}
-
-
-PSWriter::~PSWriter()
-{
-    delete pAMTF;
-}
-
-//---------------------------------------------------------------------------------
-
-BOOL PSWriter::WritePS( const Graphic& rGraphic, SvStream& rTargetStream, FilterConfigItem* pFilterConfigItem )
-{
-    UINT32 nStreamPosition = 0, nPSPosition = 0; // -Wall warning, unset, check
-
-    mbStatus = TRUE;
-    mnPreview = 0;
-    mnLevelWarning = 0;
-    mnLastPercent = 0;
-    mnLatestPush = 0xEFFFFFFE;
-
-    if ( pFilterConfigItem )
-    {
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    mpPS = &rTargetStream;
-    mpPS->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-
-    // default values for the dialog options
-    mnLevel = 2;
-    mbGrayScale = FALSE;
-    mbCompression = TRUE;
-    mnTextMode = 0;         // default0 : export glyph outlines
-
-    // try to get the dialog selection
-    if ( pFilterConfigItem )
-    {
-        ByteString  aResMgrName( "eps" );
-        ResMgr*     pResMgr;
-
-        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
-        if( pResMgr )
-        {
-            String aPreviewStr( RTL_CONSTASCII_USTRINGPARAM( "Preview" ) );
-            String aVersionStr( RTL_CONSTASCII_USTRINGPARAM( "Version" ) );
-            String aColorStr( RTL_CONSTASCII_USTRINGPARAM( "ColorFormat" ) );
-            String aComprStr( RTL_CONSTASCII_USTRINGPARAM( "CompressionMode" ) );
-            mnPreview = pFilterConfigItem->ReadInt32( aPreviewStr, 1 );
-            mnLevel = pFilterConfigItem->ReadInt32( aVersionStr, 2 );
-            if ( mnLevel != 1 )
-                mnLevel = 2;
-            mbGrayScale = pFilterConfigItem->ReadInt32( aColorStr, 1 ) == 2;
-            mbCompression = pFilterConfigItem->ReadInt32( aComprStr, 1 ) == 1;
-            String sTextMode( RTL_CONSTASCII_USTRINGPARAM( "TextMode" ) );
-            mnTextMode = pFilterConfigItem->ReadInt32( sTextMode, 0 );
-            if ( mnTextMode > 2 )
-                mnTextMode = 0;
-            delete pResMgr;
-        }
-    }
-
-    // compression is not available for Level 1
-    if ( mnLevel == 1 )
-    {
-        mbGrayScale = TRUE;
-        mbCompression = FALSE;
-    }
-
-    if ( mnPreview & EPS_PREVIEW_TIFF )
-    {
-        rTargetStream << (UINT32)0xC6D3D0C5;
-        nStreamPosition = rTargetStream.Tell();
-        rTargetStream << (UINT32)0 << (UINT32)0 << (UINT32)0 << (UINT32)0
-            << nStreamPosition + 26 << (UINT32)0 << (UINT16)0xffff;
-
-        UINT32 nErrCode;
-        if ( mbGrayScale )
-        {
-            BitmapEx aTempBitmapEx( rGraphic.GetBitmapEx() );
-            aTempBitmapEx.Convert( BMP_CONVERSION_8BIT_GREYS );
-            nErrCode = GraphicConverter::Export( rTargetStream, aTempBitmapEx, CVT_TIF ) ;
-        }
-        else
-            nErrCode = GraphicConverter::Export( rTargetStream, rGraphic, CVT_TIF ) ;
-
-        if ( nErrCode == ERRCODE_NONE )
-        {
-            rTargetStream.Seek( STREAM_SEEK_TO_END );
-            nPSPosition = rTargetStream.Tell();
-            rTargetStream.Seek( nStreamPosition + 20 );
-            rTargetStream << nPSPosition - 30;  // size of tiff gfx
-            rTargetStream.Seek( nPSPosition );
-        }
-        else
-        {
-            mnPreview &=~ EPS_PREVIEW_TIFF;
-            rTargetStream.Seek( nStreamPosition - 4 );
-        }
-    }
-
-    // global default value setting
-    ChrSet*         pCS;
-    StackMember*    pGS;
-
-    if ( rGraphic.GetType() == GRAPHIC_GDIMETAFILE )
-        pMTF = &rGraphic.GetGDIMetaFile();
-    else
-        pMTF = pAMTF = new GDIMetaFile( rGraphic.GetGDIMetaFile() );
-    aVDev.SetMapMode( pMTF->GetPrefMapMode() );
-    nBoundingX1 = nBoundingY1 = 0;
-    nBoundingX2 = pMTF->GetPrefSize().Width();
-    nBoundingY2 = pMTF->GetPrefSize().Height();
-
-    pGDIStack = NULL;
-    aColor = Color( COL_TRANSPARENT );
-    bLineColor = TRUE;
-    aLineColor = Color( COL_BLACK );
-    bFillColor = TRUE;
-    aFillColor = Color( COL_WHITE );
-    bTextFillColor = TRUE;
-    aTextFillColor = Color( COL_BLACK );
-    fLineWidth = 1;
-    fMiterLimit = 15; // use same limit as most graphic systems and basegfx
-    eLineCap = SvtGraphicStroke::capButt;
-    eJoinType = SvtGraphicStroke::joinMiter;
-    aBackgroundColor = Color( COL_WHITE );
-    eTextAlign = ALIGN_BASELINE;
-    bRegionChanged = FALSE;
-
-    nChrSet = 0x00;
-    pChrSetList = NULL;
-    nNextChrSetId = 1;
-
-    if( pMTF->GetActionCount() )
-    {
-        ImplWriteProlog( ( mnPreview & EPS_PREVIEW_EPSI ) ? &rGraphic : NULL );
-        mnCursorPos = 0;
-        ImplWriteActions( *pMTF, aVDev );
-        ImplWriteEpilog();
-        if ( mnPreview & EPS_PREVIEW_TIFF )
-        {
-            UINT32 nPosition = rTargetStream.Tell();
-            rTargetStream.Seek( nStreamPosition );
-            rTargetStream << nPSPosition;
-            rTargetStream << nPosition - nPSPosition;
-            rTargetStream.Seek( nPosition );
-        }
-        while( pChrSetList )
-        {
-            pCS=pChrSetList;
-            pChrSetList=pCS->pSucc;
-            delete pCS;
-        }
-        while( pGDIStack )
-        {
-            pGS=pGDIStack;
-            pGDIStack=pGS->pSucc;
-            delete pGS;
-        }
-    }
-    else
-        mbStatus = FALSE;
-
-    if ( mbStatus && mnLevelWarning && pFilterConfigItem )
-    {
-        ByteString  aResMgrName( "eps" );
-        ResMgr* pResMgr;
-        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-        if( pResMgr )
-        {
-            InfoBox aInfoBox( NULL, String( ResId( KEY_VERSION_CHECK, *pResMgr ) ) );
-            aInfoBox.Execute();
-            delete pResMgr;
-        }
-    }
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return mbStatus;
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteProlog( const Graphic* pPreview )
-{
-    ImplWriteLine( "%!PS-Adobe-3.0 EPSF-3.0 " );
-    *mpPS << "%%BoundingBox: ";                         // BoundingBox
-    ImplWriteLong( 0 );
-    ImplWriteLong( 0 );
-    Size aSizePoint = Application::GetDefaultDevice()->LogicToLogic( pMTF->GetPrefSize(),
-                        pMTF->GetPrefMapMode(), MAP_POINT );
-    ImplWriteLong( aSizePoint.Width() );
-    ImplWriteLong( aSizePoint.Height() ,PS_RET );
-    ImplWriteLine( "%%Pages: 0" );
-    ImplWriteLine( "%%Creator: Sun Microsystems, Inc." );
-    ImplWriteLine( "%%Title: none" );
-    ImplWriteLine( "%%CreationDate: none" );
-
-// defaults
-
-    *mpPS << "%%LanguageLevel: ";                       // Language level
-    ImplWriteLong( mnLevel, PS_RET );
-    if ( !mbGrayScale && mnLevel == 1 )
-        ImplWriteLine( "%%Extensions: CMYK" );          // CMYK extension is to set in color mode in level 1
-    ImplWriteLine( "%%EndComments" );
-    if ( pPreview && aSizePoint.Width() && aSizePoint.Height() )
-    {
-        Size aSizeBitmap( ( aSizePoint.Width() + 7 ) & ~7, aSizePoint.Height() );
-        Bitmap aTmpBitmap( pPreview->GetBitmap() );
-        aTmpBitmap.Scale( aSizeBitmap, BMP_SCALE_INTERPOLATE );
-        aTmpBitmap.Convert( BMP_CONVERSION_1BIT_THRESHOLD );
-        BitmapReadAccess* pAcc = aTmpBitmap.AcquireReadAccess();
-        if ( pAcc )
-        {
-            *mpPS << "%%BeginPreview: ";                    // BoundingBox
-            ImplWriteLong( aSizeBitmap.Width() );
-            ImplWriteLong( aSizeBitmap.Height() );
-            *mpPS << "1 ";
-            INT32 nLines = aSizeBitmap.Width() / 312;
-            if ( ( nLines * 312 ) != aSizeBitmap.Width() )
-                nLines++;
-            nLines *= aSizeBitmap.Height();
-            ImplWriteLong( nLines );
-            char  nVal;
-            INT32 nX, nY, nCount2, nCount = 4;
-            const BitmapColor aBlack( pAcc->GetBestMatchingColor( Color( COL_BLACK ) ) );
-            for ( nY = 0; nY < aSizeBitmap.Height(); nY++ )
-            {
-                nCount2 = 0;
-                nVal = 0;
-                for ( nX = 0; nX < aSizeBitmap.Width(); nX++ )
-                {
-                    if ( !nCount2 )
-                    {
-                        ImplExecMode( PS_RET );
-                        *mpPS << "%";
-                        nCount2 = 312;
-                    }
-                    nVal <<= 1;
-                    if ( pAcc->GetPixel( nY, nX ) == aBlack )
-                        nVal |= 1;
-                    if ( ! ( --nCount ) )
-                    {
-                        if ( nVal > 9 )
-                            nVal += 'A' - 10;
-                        else
-                            nVal += '0';
-                        *mpPS << nVal;
-                        nVal = 0;
-                        nCount += 4;
-                    }
-                    nCount2--;
-                }
-            }
-            aTmpBitmap.ReleaseAccess( pAcc );
-            ImplExecMode( PS_RET );
-            ImplWriteLine( "%%EndPreview" );
-        }
-    }
-    ImplWriteLine( "%%BeginProlog" );
-    ImplWriteLine( "%%BeginResource: procset SDRes-Prolog 1.0 0" );
-
-//  BEGIN EPSF
-    ImplWriteLine( "/b4_inc_state save def\n/dict_count countdictstack def\n/op_count count 1 sub def\nuserdict begin" );
-    ImplWriteLine( "0 setgray 0 setlinecap 1 setlinewidth 0 setlinejoin 10 setmiterlimit[] 0 setdash newpath" );
-    ImplWriteLine( "/languagelevel where {pop languagelevel 1 ne {false setstrokeadjust false setoverprint} if} if" );
-
-    ImplWriteLine( "/bdef {bind def} bind def" );       // der neue operator bdef wird erzeugt
-    if ( mbGrayScale )
-        ImplWriteLine( "/c {setgray} bdef" );
-    else
-        ImplWriteLine( "/c {setrgbcolor} bdef" );
-    ImplWriteLine( "/l {neg lineto} bdef" );
-    ImplWriteLine( "/rl {neg rlineto} bdef" );
-    ImplWriteLine( "/lc {setlinecap} bdef" );
-    ImplWriteLine( "/lj {setlinejoin} bdef" );
-    ImplWriteLine( "/lw {setlinewidth} bdef" );
-    ImplWriteLine( "/ml {setmiterlimit} bdef" );
-    ImplWriteLine( "/ld {setdash} bdef" );
-    ImplWriteLine( "/m {neg moveto} bdef" );
-    ImplWriteLine( "/ct {6 2 roll neg 6 2 roll neg 6 2 roll neg curveto} bdef" );
-    ImplWriteLine( "/r {rotate} bdef" );
-    ImplWriteLine( "/t {neg translate} bdef" );
-    ImplWriteLine( "/s {scale} bdef" );
-    ImplWriteLine( "/sw {show} bdef" );
-    ImplWriteLine( "/gs {gsave} bdef" );
-    ImplWriteLine( "/gr {grestore} bdef" );
-
-    ImplWriteLine( "/f {findfont dup length dict begin" );  // Setfont
-    ImplWriteLine( "{1 index /FID ne {def} {pop pop} ifelse} forall /Encoding ISOLatin1Encoding def" );
-    ImplWriteLine( "currentdict end /NFont exch definefont pop /NFont findfont} bdef" );
-
-    ImplWriteLine( "/p {closepath} bdef" );
-    ImplWriteLine( "/sf {scalefont setfont} bdef" );
-
-    ImplWriteLine( "/ef {eofill}bdef"           );      // close path and fill
-    ImplWriteLine( "/pc {closepath stroke}bdef" );      // close path and draw
-    ImplWriteLine( "/ps {stroke}bdef" );                // draw current path
-    ImplWriteLine( "/pum {matrix currentmatrix}bdef" ); // pushes the current matrix
-    ImplWriteLine( "/pom {setmatrix}bdef" );            // pops the matrix
-    ImplWriteLine( "/bs {/aString exch def /nXOfs exch def /nWidth exch def currentpoint nXOfs 0 rmoveto pum nWidth aString stringwidth pop div 1 scale aString show pom moveto} bdef" );
-    ImplWriteLine( "%%EndResource" );
-    ImplWriteLine( "%%EndProlog" );
-    ImplWriteLine( "%%BeginSetup" );
-    ImplWriteLine( "%%EndSetup" );
-    ImplWriteLine( "%%Page: 1 1" );
-    ImplWriteLine( "%%BeginPageSetup" );
-    ImplWriteLine( "%%EndPageSetup" );
-    ImplWriteLine( "pum" );
-    ImplScale( (double)aSizePoint.Width() / (double)pMTF->GetPrefSize().Width(), (double)aSizePoint.Height() / (double)pMTF->GetPrefSize().Height() );
-    ImplWriteDouble( 0 );
-    ImplWriteDouble( -pMTF->GetPrefSize().Height() );
-    ImplWriteLine( "t" );
-    ImplWriteLine( "/tm matrix currentmatrix def" );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteEpilog()
-{
-    ImplTranslate( 0, nBoundingY2 );
-    ImplWriteLine( "pom" );
-    ImplWriteLine( "count op_count sub {pop} repeat countdictstack dict_count sub {end} repeat b4_inc_state restore" );
-
-    ImplWriteLine( "%%PageTrailer" );
-    ImplWriteLine( "%%Trailer" );
-
-    ImplWriteLine( "%%EOF" );
-}
-
-//---------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteActions( const GDIMetaFile& rMtf, VirtualDevice& rVDev )
-{
-    PolyPolygon aFillPath;
-
-    for( ULONG nCurAction = 0, nCount = rMtf.GetActionCount(); nCurAction < nCount; nCurAction++ )
-    {
-        MetaAction* pMA = rMtf.GetAction( nCurAction );
-
-        switch( pMA->GetType() )
-        {
-            case META_NULL_ACTION :
-            break;
-
-            case META_PIXEL_ACTION :
-            {
-                Color aOldLineColor( aLineColor );
-                aLineColor = ( (const MetaPixelAction*) pMA )->GetColor();
-                ImplWriteLineColor( PS_SPACE );
-                ImplMoveTo( ( (const MetaPixelAction*)pMA )->GetPoint() );
-                ImplLineTo( ( (const MetaPixelAction*)pMA )->GetPoint() );
-                ImplPathDraw();
-                aLineColor = aOldLineColor;
-            }
-            break;
-
-            case META_POINT_ACTION :
-            {
-                ImplWriteLineColor( PS_SPACE );
-                ImplMoveTo( ( (const MetaPointAction*)pMA )->GetPoint() );
-                ImplLineTo( ( (const MetaPointAction*)pMA )->GetPoint() );
-                ImplPathDraw();
-            }
-            break;
-
-            case META_LINE_ACTION :
-            {
-                const LineInfo& rLineInfo = ( ( const MetaLineAction*)pMA )->GetLineInfo();
-                ImplWriteLineInfo( rLineInfo );
-                if ( bLineColor )
-                {
-                    ImplWriteLineColor( PS_SPACE );
-                    ImplMoveTo( ( (const MetaLineAction*) pMA )->GetStartPoint() );
-                    ImplLineTo( ( (const MetaLineAction*) pMA )->GetEndPoint() );
-                    ImplPathDraw();
-                }
-            }
-            break;
-
-            case META_RECT_ACTION :
-            {
-                ImplRect( ( (const MetaRectAction*) pMA )->GetRect() );
-            }
-            break;
-
-            case META_ROUNDRECT_ACTION :
-                ImplRect( ( (const MetaRoundRectAction*) pMA )->GetRect() );
-            break;
-
-            case META_ELLIPSE_ACTION :
-            {
-                Rectangle   aRect = ( ( (const MetaEllipseAction*) pMA )->GetRect() );
-                Point       aCenter = aRect.Center();
-                Polygon     aPoly( aCenter, aRect.GetWidth() / 2, aRect.GetHeight() / 2 );
-                PolyPolygon aPolyPoly( aPoly );
-                ImplPolyPoly( aPolyPoly );
-            }
-            break;
-
-            case META_ARC_ACTION :
-            {
-                Polygon aPoly( ( (const MetaArcAction*)pMA )->GetRect(), ( (const MetaArcAction*)pMA )->GetStartPoint(),
-                    ( (const MetaArcAction*)pMA )->GetEndPoint(), POLY_ARC );
-                PolyPolygon aPolyPoly( aPoly );
-                ImplPolyPoly( aPolyPoly );
-            }
-            break;
-
-            case META_PIE_ACTION :
-            {
-                Polygon aPoly( ( (const MetaPieAction*)pMA )->GetRect(), ( (const MetaPieAction*)pMA )->GetStartPoint(),
-                    ( (const MetaPieAction*)pMA )->GetEndPoint(), POLY_PIE );
-                PolyPolygon aPolyPoly( aPoly );
-                ImplPolyPoly( aPolyPoly );
-            }
-            break;
-
-            case META_CHORD_ACTION :
-            {
-                Polygon aPoly( ( (const MetaChordAction*)pMA )->GetRect(), ( (const MetaChordAction*)pMA )->GetStartPoint(),
-                    ( (const MetaChordAction*)pMA )->GetEndPoint(), POLY_CHORD );
-                PolyPolygon aPolyPoly( aPoly );
-                ImplPolyPoly( aPolyPoly );
-            }
-            break;
-
-            case META_POLYLINE_ACTION :
-            {
-                Polygon aPoly( ( (const MetaPolyLineAction*) pMA )->GetPolygon() );
-                const LineInfo& rLineInfo = ( ( const MetaPolyLineAction*)pMA )->GetLineInfo();
-                ImplWriteLineInfo( rLineInfo );
-
-                if(basegfx::B2DLINEJOIN_NONE == rLineInfo.GetLineJoin()
-                    && rLineInfo.GetWidth() > 1)
-                {
-                    // emulate B2DLINEJOIN_NONE by creating single edges
-                    const sal_uInt16 nPoints(aPoly.GetSize());
-                    const bool bCurve(aPoly.HasFlags());
-
-                    for(sal_uInt16 a(0); a + 1 < nPoints; a++)
-                    {
-                        if(bCurve
-                            && POLY_NORMAL != aPoly.GetFlags(a + 1)
-                            && a + 2 < nPoints
-                            && POLY_NORMAL != aPoly.GetFlags(a + 2)
-                            && a + 3 < nPoints)
-                        {
-                            const Polygon aSnippet(4,
-                                aPoly.GetConstPointAry() + a,
-                                aPoly.GetConstFlagAry() + a);
-                            ImplPolyLine(aSnippet);
-                            a += 2;
-                        }
-                        else
-                        {
-                            const Polygon aSnippet(2,
-                                aPoly.GetConstPointAry() + a);
-                            ImplPolyLine(aSnippet);
-                        }
-                    }
-                }
-                else
-                {
-                    ImplPolyLine( aPoly );
-                }
-            }
-            break;
-
-            case META_POLYGON_ACTION :
-            {
-                PolyPolygon aPolyPoly( ( (const MetaPolygonAction*) pMA )->GetPolygon() );
-                ImplPolyPoly( aPolyPoly );
-            }
-            break;
-
-            case META_POLYPOLYGON_ACTION :
-            {
-                ImplPolyPoly( ( (const MetaPolyPolygonAction*) pMA )->GetPolyPolygon() );
-            }
-            break;
-
-            case META_TEXT_ACTION:
-            {
-                const MetaTextAction * pA = (const MetaTextAction*) pMA;
-
-                String  aUniStr( pA->GetText(), pA->GetIndex(), pA->GetLen() );
-                Point   aPoint( pA->GetPoint() );
-
-                ImplText( aUniStr, aPoint, NULL, 0, rVDev );
-            }
-            break;
-
-            case META_TEXTRECT_ACTION:
-            {
-                DBG_ERROR( "Unsupported action: TextRect...Action!" );
-            }
-            break;
-
-            case META_STRETCHTEXT_ACTION :
-            {
-                const MetaStretchTextAction* pA = (const MetaStretchTextAction*)pMA;
-                String  aUniStr( pA->GetText(), pA->GetIndex(), pA->GetLen() );
-                Point   aPoint( pA->GetPoint() );
-
-                ImplText( aUniStr, aPoint, NULL, pA->GetWidth(), rVDev );
-            }
-            break;
-
-            case META_TEXTARRAY_ACTION:
-            {
-                const MetaTextArrayAction* pA = (const MetaTextArrayAction*)pMA;
-                String  aUniStr( pA->GetText(), pA->GetIndex(), pA->GetLen() );
-                Point   aPoint( pA->GetPoint() );
-
-                ImplText( aUniStr, aPoint, pA->GetDXArray(), 0, rVDev );
-            }
-            break;
-
-            case META_BMP_ACTION :
-            {
-                Bitmap aBitmap = ( (const MetaBmpAction*)pMA )->GetBitmap();
-                if ( mbGrayScale )
-                    aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
-                Point aPoint = ( (const MetaBmpAction*) pMA )->GetPoint();
-                Size aSize = aBitmap.GetSizePixel();
-                ImplBmp( &aBitmap, NULL, aPoint, aSize.Width(), aSize.Height() );
-            }
-            break;
-
-            case META_BMPSCALE_ACTION :
-            {
-                Bitmap aBitmap = ( (const MetaBmpScaleAction*)pMA )->GetBitmap();
-                if ( mbGrayScale )
-                    aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
-                Point aPoint = ( (const MetaBmpScaleAction*) pMA )->GetPoint();
-                Size aSize = ( (const MetaBmpScaleAction*)pMA )->GetSize();
-                ImplBmp( &aBitmap, NULL, aPoint, aSize.Width(), aSize.Height() );
-            }
-            break;
-
-            case META_BMPSCALEPART_ACTION :
-            {
-                Bitmap  aBitmap( ( (const MetaBmpScalePartAction*)pMA )->GetBitmap() );
-                aBitmap.Crop( Rectangle( ( (const MetaBmpScalePartAction*)pMA )->GetSrcPoint(),
-                    ( (const MetaBmpScalePartAction*)pMA )->GetSrcSize() ) );
-                if ( mbGrayScale )
-                    aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
-                Point aPoint = ( (const MetaBmpScalePartAction*) pMA)->GetDestPoint();
-                Size aSize = ( (const MetaBmpScalePartAction*)pMA )->GetDestSize();
-                ImplBmp( &aBitmap, NULL, aPoint, aSize.Width(), aSize.Height() );
-            }
-            break;
-
-            case META_BMPEX_ACTION :
-            {
-                BitmapEx aBitmapEx( ( (MetaBmpExAction*)pMA)->GetBitmapEx() );
-                Bitmap aBitmap( aBitmapEx.GetBitmap() );
-                if ( mbGrayScale )
-                    aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
-                Bitmap aMask( aBitmapEx.GetMask() );
-                Point aPoint = ( (const MetaBmpExAction*) pMA)->GetPoint();
-                Size aSize = ( aBitmap.GetSizePixel() );
-                ImplBmp( &aBitmap, &aMask, aPoint, aSize.Width(), aSize.Height() );
-            }
-            break;
-
-            case META_BMPEXSCALE_ACTION :
-            {
-                BitmapEx aBitmapEx( ( (MetaBmpExScaleAction*)pMA)->GetBitmapEx() );
-                Bitmap aBitmap( aBitmapEx.GetBitmap() );
-                if ( mbGrayScale )
-                    aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
-                Bitmap aMask( aBitmapEx.GetMask() );
-                Point aPoint = ( (const MetaBmpExScaleAction*) pMA)->GetPoint();
-                Size aSize( ( (const MetaBmpExScaleAction*)pMA )->GetSize() );
-                ImplBmp( &aBitmap, &aMask, aPoint, aSize.Width(), aSize.Height() );
-            }
-            break;
-
-            case META_BMPEXSCALEPART_ACTION :
-            {
-                BitmapEx    aBitmapEx( ( (const MetaBmpExScalePartAction*)pMA )->GetBitmapEx() );
-                aBitmapEx.Crop( Rectangle( ( (const MetaBmpExScalePartAction*)pMA )->GetSrcPoint(),
-                    ( (const MetaBmpExScalePartAction*)pMA )->GetSrcSize() ) );
-                Bitmap      aBitmap( aBitmapEx.GetBitmap() );
-                if ( mbGrayScale )
-                    aBitmap.Convert( BMP_CONVERSION_8BIT_GREYS );
-                Bitmap      aMask( aBitmapEx.GetMask() );
-                Point aPoint = ( (const MetaBmpExScalePartAction*) pMA)->GetDestPoint();
-                Size aSize = ( (const MetaBmpExScalePartAction*)pMA )->GetDestSize();
-                ImplBmp( &aBitmap, &aMask, aPoint, aSize.Width(), aSize.Height() );
-            }
-            break;
-
-            // Unsupported Actions
-            case META_MASK_ACTION:
-            case META_MASKSCALE_ACTION:
-            case META_MASKSCALEPART_ACTION:
-            {
-                DBG_ERROR( "Unsupported action: MetaMask...Action!" );
-            }
-            break;
-
-            case META_GRADIENT_ACTION :
-            {
-                PolyPolygon aPolyPoly( ( (const MetaGradientAction*)pMA)->GetRect() );
-                ImplWriteGradient( aPolyPoly, ( (const MetaGradientAction*) pMA )->GetGradient(), rVDev );
-            }
-            break;
-
-            case META_GRADIENTEX_ACTION :
-            {
-                PolyPolygon aPolyPoly( ( (const MetaGradientExAction*)pMA)->GetPolyPolygon() );
-                ImplWriteGradient( aPolyPoly, ( (const MetaGradientExAction*) pMA )->GetGradient(), rVDev );
-            }
-            break;
-
-            case META_HATCH_ACTION :
-            {
-                VirtualDevice   l_aVDev;
-                GDIMetaFile     aTmpMtf;
-
-                l_aVDev.SetMapMode( rVDev.GetMapMode() );
-                l_aVDev.AddHatchActions( ( (const MetaHatchAction*)pMA)->GetPolyPolygon(),
-                                         ( (const MetaHatchAction*)pMA )->GetHatch(), aTmpMtf );
-                ImplWriteActions( aTmpMtf, rVDev );
-            }
-            break;
-
-            case META_WALLPAPER_ACTION :
-            {
-                const MetaWallpaperAction* pA = (const MetaWallpaperAction*)pMA;
-                Rectangle   aRect = pA->GetRect();
-                Wallpaper   aWallpaper = pA->GetWallpaper();
-
-                if ( aWallpaper.IsBitmap() )
-                {
-                    BitmapEx aBitmapEx = aWallpaper.GetBitmap();
-                    Bitmap aBitmap( aBitmapEx.GetBitmap() );
-                    if ( aBitmapEx.IsTransparent() )
-                    {
-                        if ( aWallpaper.IsGradient() )
-                        {
-
-                        // gradient action
-
-                        }
-                        Bitmap aMask( aBitmapEx.GetMask() );
-                        ImplBmp( &aBitmap, &aMask, Point( aRect.Left(), aRect.Top() ), aRect.GetWidth(), aRect.GetHeight() );
-                    }
-                    else
-                        ImplBmp( &aBitmap, NULL, Point( aRect.Left(), aRect.Top() ), aRect.GetWidth(), aRect.GetHeight() );
-
-                        // wallpaper Style
-
-                }
-                else if ( aWallpaper.IsGradient() )
-                {
-
-                // gradient action
-
-                }
-                else
-                {
-                    aColor = aWallpaper.GetColor();
-                    ImplRectFill( aRect );
-                }
-            }
-            break;
-
-            case META_ISECTRECTCLIPREGION_ACTION:
-            {
-                const MetaISectRectClipRegionAction* pA = (const MetaISectRectClipRegionAction*) pMA;
-                Region aRegion( pA->GetRect() );
-                ImplSetClipRegion( aRegion );
-            }
-            break;
-
-            case META_CLIPREGION_ACTION:
-            {
-                const MetaClipRegionAction* pA = (const MetaClipRegionAction*) pMA;
-                Region aRegion( pA->GetRegion() );
-                ImplSetClipRegion( aRegion );
-            }
-            break;
-
-            case META_ISECTREGIONCLIPREGION_ACTION:
-            {
-                const MetaISectRegionClipRegionAction* pA = (const MetaISectRegionClipRegionAction*) pMA;
-                Region aRegion( pA->GetRegion() );
-                ImplSetClipRegion( aRegion );
-            }
-            break;
-
-            case META_MOVECLIPREGION_ACTION:
-            {
-/*
-                if ( !aClipRegion.IsEmpty() )
-                {
-                    const MetaMoveClipRegionAction* pA = (const MetaMoveClipRegionAction*) pMA;
-                    aClipRegion.Move( pA->GetHorzMove(), pA->GetVertMove() );
-                    ImplSetClipRegion();
-                }
-*/
-            }
-            break;
-
-            case META_LINECOLOR_ACTION :
-            {
-                if ( ( (const MetaLineColorAction*) pMA)->IsSetting() )
-                {
-                    bLineColor = TRUE;
-                    aLineColor = ( (const MetaLineColorAction*) pMA )->GetColor();
-                }
-                else
-                    bLineColor = FALSE;
-            }
-            break;
-
-            case META_FILLCOLOR_ACTION :
-            {
-                if ( ( (const MetaFillColorAction*) pMA )->IsSetting() )
-                {
-                    bFillColor = TRUE;
-                    aFillColor =  ( (const MetaFillColorAction*) pMA )->GetColor();
-                }
-                else
-                    bFillColor = FALSE;
-            }
-            break;
-
-            case META_TEXTCOLOR_ACTION :
-            {
-                aTextColor = ( (const MetaTextColorAction*) pMA )->GetColor();
-            }
-            break;
-
-            case META_TEXTFILLCOLOR_ACTION :
-            {
-                if ( ( (const MetaTextFillColorAction*) pMA )->IsSetting() )
-                {
-                    bTextFillColor = TRUE;
-                    aTextFillColor = ( (const MetaTextFillColorAction*) pMA )->GetColor();
-                }
-                else
-                    bTextFillColor = FALSE;
-            }
-            break;
-
-            case META_TEXTALIGN_ACTION :
-            {
-                eTextAlign = ( (const MetaTextAlignAction*) pMA )->GetTextAlign();
-            }
-            break;
-
-            case META_MAPMODE_ACTION :
-            {
-                pMA->Execute( &rVDev );
-                ImplGetMapMode( rVDev.GetMapMode() );
-            }
-            break;
-
-            case META_FONT_ACTION :
-            {
-                maFont = ((const MetaFontAction*)pMA)->GetFont();
-                rVDev.SetFont( maFont );
-            }
-            break;
-
-            case META_PUSH_ACTION :
-            {
-                rVDev.Push(((const MetaPushAction*)pMA)->GetFlags() );
-                StackMember* pGS = new StackMember;
-                pGS->pSucc = pGDIStack;
-                pGDIStack = pGS;
-                pGS->aDashArray = aDashArray;
-                pGS->eJoinType = eJoinType;
-                pGS->eLineCap = eLineCap;
-                pGS->fLineWidth = fLineWidth;
-                pGS->fMiterLimit = fMiterLimit;
-                pGS->eTextAlign = eTextAlign;
-                pGS->aGlobalCol = aColor;
-                pGS->bLineCol = bLineColor;
-                pGS->aLineCol = aLineColor;
-                pGS->bFillCol = bFillColor;
-                pGS->aFillCol = aFillColor;
-                pGS->aTextCol = aTextColor;
-                pGS->bTextFillCol = bTextFillColor;
-                pGS->aTextFillCol = aTextFillColor;
-                pGS->aBackgroundCol = aBackgroundColor;
-                bRegionChanged = FALSE;
-                pGS->aFont = maFont;
-                mnLatestPush = mpPS->Tell();
-                ImplWriteLine( "gs" );
-            }
-            break;
-
-            case META_POP_ACTION :
-            {
-                rVDev.Pop();
-                StackMember* pGS;
-                if( pGDIStack )
-                {
-                    pGS = pGDIStack;
-                    pGDIStack = pGS->pSucc;
-                    aDashArray = pGS->aDashArray;
-                    eJoinType = pGS->eJoinType;
-                    eLineCap = pGS->eLineCap;
-                    fLineWidth = pGS->fLineWidth;
-                    fMiterLimit = pGS->fMiterLimit;
-                    eTextAlign = pGS->eTextAlign;
-                    aColor = pGS->aGlobalCol;
-                    bLineColor = pGS->bLineCol;
-                    aLineColor = pGS->aLineCol;
-                    bFillColor = pGS->bFillCol;
-                    aFillColor = pGS->aFillCol;
-                    aTextColor = pGS->aTextCol;
-                    bTextFillColor = pGS->bTextFillCol;
-                    aTextFillColor = pGS->aTextFillCol;
-                    aBackgroundColor = pGS->aBackgroundCol;
-                    maFont = pGS->aFont;
-                    maLastFont = Font();                // set maLastFont != maFont -> so that
-                    delete pGS;
-                    sal_uInt32 nCurrentPos = mpPS->Tell();
-                    if ( nCurrentPos - 3 == mnLatestPush )
-                    {
-                        mpPS->Seek( mnLatestPush );
-                        ImplWriteLine( "  " );
-                        mpPS->Seek( mnLatestPush );
-                    }
-                    else
-                        ImplWriteLine( "gr" );
-                }
-            }
-            break;
-
-            case META_EPS_ACTION :
-            {
-                GfxLink aGfxLink = ( (const MetaEPSAction*) pMA )->GetLink();
-                const GDIMetaFile aSubstitute( ( ( const MetaEPSAction*) pMA )->GetSubstitute() );
-
-                BOOL    bLevelConflict = FALSE;
-                BYTE*   pSource = (BYTE*) aGfxLink.GetData();
-                ULONG   nSize = aGfxLink.GetDataSize();
-                ULONG   nParseThis = POSTSCRIPT_BOUNDINGSEARCH;
-                if ( nSize < 64 )                       // assuming eps is larger than 64 bytes
-                    pSource = NULL;
-                if ( nParseThis > nSize )
-                    nParseThis = nSize;
-
-                if ( pSource && ( mnLevel == 1 ) )
-                {
-                    BYTE* pFound = ImplSearchEntry( pSource, (BYTE*)"%%LanguageLevel:", nParseThis - 10, 16 );
-                    if ( pFound )
-                    {
-                        BYTE    k, i = 10;
-                        pFound += 16;
-                        while ( --i )
-                        {
-                            k = *pFound++;
-                            if ( ( k > '0' ) && ( k <= '9' ) )
-                            {
-                                if ( k != '1' )
-                                {
-                                    bLevelConflict = TRUE;
-                                    mnLevelWarning++;
-                                }
-                                break;
-                            }
-                        }
-                    }
-                }
-                if ( !bLevelConflict )
-                {
-                    double  nBoundingBox[4];
-                    if ( pSource && ImplGetBoundingBox( nBoundingBox, pSource, nParseThis ) )
-                    {
-                        Point   aPoint = ( (const MetaEPSAction*) pMA )->GetPoint();
-                        Size    aSize = ( (const MetaEPSAction*) pMA )->GetSize();
-
-                        MapMode aMapMode( aSubstitute.GetPrefMapMode() );
-                        Size aOutSize( rVDev.LogicToLogic( aSize, rVDev.GetMapMode(), aMapMode ) );
-                        Point aOrigin( rVDev.LogicToLogic( aPoint, rVDev.GetMapMode(), aMapMode ) );
-                        aOrigin.Y() += aOutSize.Height();
-                        aMapMode.SetOrigin( aOrigin );
-                        aMapMode.SetScaleX( aOutSize.Width() / ( nBoundingBox[ 2 ] - nBoundingBox[ 0 ] ) );
-                        aMapMode.SetScaleY( aOutSize.Height() / ( nBoundingBox[ 3 ] - nBoundingBox[ 1 ] ) );
-                        ImplWriteLine( "gs" );
-                        ImplGetMapMode( aMapMode );
-                        ImplWriteLine( "%%BeginDocument:" );
-                        mpPS->Write( pSource, aGfxLink.GetDataSize() );
-                        ImplWriteLine( "%%EndDocument\ngr" );
-                    }
-                }
-            }
-            break;
-
-            case META_TRANSPARENT_ACTION:
-            {
-//              ImplLine( ( (const MetaTransparentAction*) pMA )->GetPolyPolygon() );
-            }
-            break;
-
-            case META_RASTEROP_ACTION:
-            {
-                pMA->Execute( &rVDev );
-            }
-            break;
-
-            case META_FLOATTRANSPARENT_ACTION:
-            {
-                const MetaFloatTransparentAction* pA = (const MetaFloatTransparentAction*) pMA;
-
-                GDIMetaFile     aTmpMtf( pA->GetGDIMetaFile() );
-                Point           aSrcPt( aTmpMtf.GetPrefMapMode().GetOrigin() );
-                const Size      aSrcSize( aTmpMtf.GetPrefSize() );
-                const Point     aDestPt( pA->GetPoint() );
-                const Size      aDestSize( pA->GetSize() );
-                const double    fScaleX = aSrcSize.Width() ? (double) aDestSize.Width() / aSrcSize.Width() : 1.0;
-                const double    fScaleY = aSrcSize.Height() ? (double) aDestSize.Height() / aSrcSize.Height() : 1.0;
-                long            nMoveX, nMoveY;
-
-                if( fScaleX != 1.0 || fScaleY != 1.0 )
-                {
-                    aTmpMtf.Scale( fScaleX, fScaleY );
-                    aSrcPt.X() = FRound( aSrcPt.X() * fScaleX ), aSrcPt.Y() = FRound( aSrcPt.Y() * fScaleY );
-                }
-
-                nMoveX = aDestPt.X() - aSrcPt.X(), nMoveY = aDestPt.Y() - aSrcPt.Y();
-
-                if( nMoveX || nMoveY )
-                    aTmpMtf.Move( nMoveX, nMoveY );
-
-                ImplWriteActions( aTmpMtf, rVDev );
-            }
-            break;
-
-            case META_COMMENT_ACTION:
-            {
-                const MetaCommentAction* pA = (const MetaCommentAction*) pMA;
-                if ( pA->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_BEGIN" ) == COMPARE_EQUAL )
-                {
-                    const MetaGradientExAction* pGradAction = NULL;
-                    while( ++nCurAction < nCount )
-                    {
-                        MetaAction* pAction = rMtf.GetAction( nCurAction );
-                        if( pAction->GetType() == META_GRADIENTEX_ACTION )
-                            pGradAction = (const MetaGradientExAction*) pAction;
-                        else if( ( pAction->GetType() == META_COMMENT_ACTION ) &&
-                                 ( ( (const MetaCommentAction*) pAction )->GetComment().CompareIgnoreCaseToAscii( "XGRAD_SEQ_END" ) == COMPARE_EQUAL ) )
-                        {
-                            break;
-                        }
-                    }
-                    if( pGradAction )
-                        ImplWriteGradient( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), rVDev );
-                }
-                else if ( pA->GetComment().Equals( "XPATHFILL_SEQ_END" ) )
-                {
-                    if ( aFillPath.Count() )
-                    {
-                        aFillPath = PolyPolygon();
-                        ImplWriteLine( "gr" );
-                    }
-                }
-                else
-                {
-                    const BYTE* pData = pA->GetData();
-                    if ( pData )
-                    {
-                        SvMemoryStream  aMemStm( (void*)pData, pA->GetDataSize(), STREAM_READ );
-                        sal_Bool        bSkipSequence = sal_False;
-                        ByteString      sSeqEnd;
-
-                        if( pA->GetComment().Equals( "XPATHSTROKE_SEQ_BEGIN" ) )
-                        {
-                            sSeqEnd = ByteString( "XPATHSTROKE_SEQ_END" );
-                            SvtGraphicStroke aStroke;
-                            aMemStm >> aStroke;
-
-                            Polygon aPath;
-                            aStroke.getPath( aPath );
-
-                            PolyPolygon aStartArrow;
-                            PolyPolygon aEndArrow;
-//                          double fTransparency( aStroke.getTransparency() );
-                            double fStrokeWidth( aStroke.getStrokeWidth() );
-                            SvtGraphicStroke::JoinType eJT( aStroke.getJoinType() );
-                            SvtGraphicStroke::DashArray l_aDashArray;
-
-                            aStroke.getStartArrow( aStartArrow );
-                            aStroke.getEndArrow( aEndArrow );
-                            aStroke.getDashArray( l_aDashArray );
-
-                            bSkipSequence = sal_True;
-                            if ( l_aDashArray.size() > 11 ) // ps dasharray limit is 11
-                                bSkipSequence = sal_False;
-                            if ( aStartArrow.Count() || aEndArrow.Count() )
-                                bSkipSequence = sal_False;
-                            if ( (sal_uInt32)eJT > 2 )
-                                bSkipSequence = sal_False;
-                            if ( l_aDashArray.size() && ( fStrokeWidth != 0.0 ) )
-                                bSkipSequence = sal_False;
-                            if ( bSkipSequence )
-                            {
-                                ImplWriteLineInfo( fStrokeWidth, aStroke.getMiterLimit(),
-                                                    aStroke.getCapType(), eJT, l_aDashArray );
-                                ImplPolyLine( aPath );
-                            }
-                        }
-                        else if( pA->GetComment().Equals( "XPATHFILL_SEQ_BEGIN" ) )
-                        {
-                            sSeqEnd = ByteString( "XPATHFILL_SEQ_END" );
-                            SvtGraphicFill aFill;
-                            aMemStm >> aFill;
-                            switch( aFill.getFillType() )
-                            {
-                                case SvtGraphicFill::fillSolid :
-                                {
-                                    bSkipSequence = sal_True;
-                                    PolyPolygon aPolyPoly;
-                                    aFill.getPath( aPolyPoly );
-                                    sal_uInt16 i, nPolyCount = aPolyPoly.Count();
-                                    if ( nPolyCount )
-                                    {
-                                        aFillColor = aFill.getFillColor();
-                                        ImplWriteFillColor( PS_SPACE );
-                                        for ( i = 0; i < nPolyCount; )
-                                        {
-                                            ImplAddPath( aPolyPoly.GetObject( i ) );
-                                            if ( ++i < nPolyCount )
-                                            {
-                                                *mpPS << "p";
-                                                mnCursorPos += 2;
-                                                ImplExecMode( PS_RET );
-                                            }
-                                        }
-                                        *mpPS << "p ef";
-                                        mnCursorPos += 4;
-                                        ImplExecMode( PS_RET );
-                                    }
-                                }
-                                break;
-
-                                case SvtGraphicFill::fillTexture :
-                                {
-                                    aFill.getPath( aFillPath );
-
-                                    /* normally an object filling is consisting of three MetaActions:
-                                        MetaBitmapAction        using RasterOp xor,
-                                        MetaPolyPolygonAction   using RasterOp rop_0
-                                        MetaBitmapAction        using RasterOp xor
-
-                                        Because RasterOps cannot been used in Postscript, we have to
-                                        replace these actions. The MetaComment "XPATHFILL_SEQ_BEGIN" is
-                                        providing the clippath of the object. The following loop is
-                                        trying to find the bitmap that is matching the clippath, so that
-                                        only one bitmap is exported, otherwise if the bitmap is not
-                                        locatable, all metaactions are played normally.
-                                    */
-                                    sal_uInt32 nCommentStartAction = nCurAction;
-                                    sal_uInt32 nBitmapCount = 0;
-                                    sal_uInt32 nBitmapAction = 0;
-
-                                    sal_Bool bOk = sal_True;
-                                    while( bOk && ( ++nCurAction < nCount ) )
-                                    {
-                                        MetaAction* pAction = rMtf.GetAction( nCurAction );
-                                        switch( pAction->GetType() )
-                                        {
-                                            case META_BMPSCALE_ACTION :
-                                            case META_BMPSCALEPART_ACTION :
-                                            case META_BMPEXSCALE_ACTION :
-                                            case META_BMPEXSCALEPART_ACTION :
-                                            {
-                                                nBitmapCount++;
-                                                nBitmapAction = nCurAction;
-                                            }
-                                            break;
-                                            case META_COMMENT_ACTION :
-                                            {
-                                                if (((const MetaCommentAction*)pAction)->GetComment().Equals( "XPATHFILL_SEQ_END" ))
-                                                    bOk = sal_False;
-                                            }
-                                            break;
-                                        }
-                                    }
-                                    if( nBitmapCount == 2 )
-                                    {
-                                        ImplWriteLine( "gs" );
-                                        ImplIntersect( aFillPath );
-                                        GDIMetaFile aTempMtf;
-                                        aTempMtf.AddAction( rMtf.GetAction( nBitmapAction )->Clone() );
-                                        ImplWriteActions( aTempMtf, rVDev );
-                                        ImplWriteLine( "gr" );
-                                        aFillPath = PolyPolygon();
-                                    }
-                                    else
-                                        nCurAction = nCommentStartAction + 1;
-                                }
-                                break;
-
-                                case SvtGraphicFill::fillGradient :
-                                    aFill.getPath( aFillPath );
-                                break;
-
-                                case SvtGraphicFill::fillHatch :
-                                break;
-                            }
-                            if ( aFillPath.Count() )
-                            {
-                                ImplWriteLine( "gs" );
-                                ImplIntersect( aFillPath );
-                            }
-                        }
-                        if ( bSkipSequence )
-                        {
-                            while( ++nCurAction < nCount )
-                            {
-                                pMA = rMtf.GetAction( nCurAction );
-                                if ( pMA->GetType() == META_COMMENT_ACTION )
-                                {
-                                    ByteString sComment( ((MetaCommentAction*)pMA)->GetComment() );
-                                    if ( sComment.Equals( sSeqEnd ) )
-                                        break;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            break;
-        }
-    }
-}
-
-
-
-//---------------------------------------------------------------------------------
-
-inline void PSWriter::ImplWritePoint( const Point& rPoint, sal_uInt32 nMode )
-{
-    ImplWriteDouble( rPoint.X() );
-    ImplWriteDouble( rPoint.Y(), nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplMoveTo( const Point& rPoint, sal_uInt32 nMode )
-{
-    ImplWritePoint( rPoint );
-    ImplWriteByte( 'm' );
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplLineTo( const Point& rPoint, sal_uInt32 nMode )
-{
-    ImplWritePoint( rPoint );
-    ImplWriteByte( 'l' );
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplCurveTo( const Point& rP1, const Point& rP2, const Point& rP3, sal_uInt32 nMode )
-{
-    ImplWritePoint( rP1 );
-    ImplWritePoint( rP2 );
-    ImplWritePoint( rP3 );
-    *mpPS << "ct ";
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplTranslate( const double& fX, const double& fY, sal_uInt32 nMode )
-{
-    ImplWriteDouble( fX );
-    ImplWriteDouble( fY );
-    ImplWriteByte( 't' );
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplScale( const double& fX, const double& fY, sal_uInt32 nMode )
-{
-    ImplWriteDouble( fX );
-    ImplWriteDouble( fY );
-    ImplWriteByte( 's' );
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplRect( const Rectangle & rRect )
-{
-    if ( bFillColor )
-        ImplRectFill( rRect );
-    if ( bLineColor )
-    {
-        double nWidth = rRect.GetWidth();
-        double nHeight = rRect.GetHeight();
-
-        ImplWriteLineColor( PS_SPACE );
-        ImplMoveTo( rRect.TopLeft() );
-        ImplWriteDouble( nWidth );
-        *mpPS << "0 rl 0 ";
-        ImplWriteDouble( nHeight );
-        *mpPS << "rl ";
-        ImplWriteDouble( nWidth );
-        *mpPS << "neg 0 rl ";
-        ImplClosePathDraw();
-    }
-    *mpPS << (BYTE)10;
-    mnCursorPos = 0;
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplRectFill( const Rectangle & rRect )
-{
-    double nWidth = rRect.GetWidth();
-    double nHeight = rRect.GetHeight();
-
-    ImplWriteFillColor( PS_SPACE );
-    ImplMoveTo( rRect.TopLeft() );
-    ImplWriteDouble( nWidth );
-    *mpPS << "0 rl 0 ";
-    ImplWriteDouble( nHeight );
-    *mpPS << "rl ";
-    ImplWriteDouble( nWidth );
-    *mpPS << "neg 0 rl ef ";
-    *mpPS << "p ef";
-    mnCursorPos += 2;
-    ImplExecMode( PS_RET );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplAddPath( const Polygon & rPolygon )
-{
-    USHORT i = 1;
-    USHORT nPointCount = rPolygon.GetSize();
-    if ( nPointCount > 1 )
-    {
-        ImplMoveTo( rPolygon.GetPoint( 0 ) );
-        while ( i < nPointCount )
-        {
-            if ( ( rPolygon.GetFlags( i ) == POLY_CONTROL )
-                    && ( ( i + 2 ) < nPointCount )
-                        && ( rPolygon.GetFlags( i + 1 ) == POLY_CONTROL )
-                            && ( rPolygon.GetFlags( i + 2 ) != POLY_CONTROL ) )
-            {
-                ImplCurveTo( rPolygon[ i ], rPolygon[ i + 1 ], rPolygon[ i + 2 ], PS_WRAP );
-                i += 3;
-            }
-            else
-                ImplLineTo( rPolygon.GetPoint( i++ ), PS_SPACE | PS_WRAP );
-        }
-    }
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplIntersect( const PolyPolygon& rPolyPoly )
-{
-    sal_uInt16 i, nPolyCount = rPolyPoly.Count();
-    for ( i = 0; i < nPolyCount; )
-    {
-        ImplAddPath( rPolyPoly.GetObject( i ) );
-        if ( ++i < nPolyCount )
-        {
-            *mpPS << "p";
-            mnCursorPos += 2;
-            ImplExecMode( PS_RET );
-        }
-    }
-    ImplWriteLine( "eoclip newpath" );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient, VirtualDevice& rVDev )
-{
-    VirtualDevice   l_aVDev;
-    GDIMetaFile     aTmpMtf;
-    l_aVDev.SetMapMode( rVDev.GetMapMode() );
-    l_aVDev.AddGradientActions( rPolyPoly.GetBoundRect(), rGradient, aTmpMtf );
-    ImplWriteActions( aTmpMtf, rVDev );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplPolyPoly( const PolyPolygon & rPolyPoly, sal_Bool bTextOutline )
-{
-    sal_uInt16 i, nPolyCount = rPolyPoly.Count();
-    if ( nPolyCount )
-    {
-        if ( bFillColor || bTextOutline )
-        {
-            if ( bTextOutline )
-                ImplWriteTextColor( PS_SPACE );
-            else
-                ImplWriteFillColor( PS_SPACE );
-            for ( i = 0; i < nPolyCount; )
-            {
-                ImplAddPath( rPolyPoly.GetObject( i ) );
-                if ( ++i < nPolyCount )
-                {
-                    *mpPS << "p";
-                    mnCursorPos += 2;
-                    ImplExecMode( PS_RET );
-                }
-            }
-            *mpPS << "p ef";
-            mnCursorPos += 4;
-            ImplExecMode( PS_RET );
-        }
-        if ( bLineColor )
-        {
-            ImplWriteLineColor( PS_SPACE );
-            for ( i = 0; i < nPolyCount; i++ )
-                ImplAddPath( rPolyPoly.GetObject( i ) );
-            ImplClosePathDraw( PS_RET );
-        }
-    }
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplPolyLine( const Polygon & rPoly )
-{
-    if ( bLineColor )
-    {
-        ImplWriteLineColor( PS_SPACE );
-        sal_uInt16 i, nPointCount = rPoly.GetSize();
-        if ( nPointCount )
-        {
-            if ( nPointCount > 1 )
-            {
-                ImplMoveTo( rPoly.GetPoint( 0 ) );
-                i = 1;
-                while ( i < nPointCount )
-                {
-                    if ( ( rPoly.GetFlags( i ) == POLY_CONTROL )
-                            && ( ( i + 2 ) < nPointCount )
-                                && ( rPoly.GetFlags( i + 1 ) == POLY_CONTROL )
-                                    && ( rPoly.GetFlags( i + 2 ) != POLY_CONTROL ) )
-                    {
-                        ImplCurveTo( rPoly[ i ], rPoly[ i + 1 ], rPoly[ i + 2 ], PS_WRAP );
-                        i += 3;
-                    }
-                    else
-                        ImplLineTo( rPoly.GetPoint( i++ ), PS_SPACE | PS_WRAP );
-                }
-            }
-
-            // #104645# explicitely close path if polygon is closed
-            if( rPoly[ 0 ] == rPoly[ nPointCount-1 ] )
-                ImplClosePathDraw( PS_RET );
-            else
-                ImplPathDraw();
-        }
-    }
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplSetClipRegion( Region& rClipRegion )
-{
-    if ( !rClipRegion.IsEmpty() )
-    {
-        Rectangle       aRect;
-        RegionHandle    hRegionHandle = rClipRegion.BeginEnumRects();
-
-        while ( rClipRegion.GetNextEnumRect( hRegionHandle, aRect ) )
-        {
-            double nX1 = aRect.Left();
-            double nY1 = aRect.Top();
-            double nX2 = aRect.Right();
-            double nY2 = aRect.Bottom();
-            ImplWriteDouble( nX1 );
-            ImplWriteDouble( nY1 );
-            ImplWriteByte( 'm' );
-            ImplWriteDouble( nX2 );
-            ImplWriteDouble( nY1 );
-            ImplWriteByte( 'l' );
-            ImplWriteDouble( nX2 );
-            ImplWriteDouble( nY2 );
-            ImplWriteByte( 'l' );
-            ImplWriteDouble( nX1 );
-            ImplWriteDouble( nY2 );
-            ImplWriteByte( 'l' );
-            ImplWriteDouble( nX1 );
-            ImplWriteDouble( nY1 );
-            ImplWriteByte( 'l', PS_SPACE | PS_WRAP );
-        };
-        rClipRegion.EndEnumRects( hRegionHandle );
-        ImplWriteLine( "eoclip newpath" );
-    }
-}
-
-//---------------------------------------------------------------------------------
-// possible gfx formats:
-//
-// level 1: grayscale   8 bit
-//          color      24 bit
-//
-// level 2: grayscale   8 bit
-//          color       1(pal), 4(pal), 8(pal), 24 Bit
-//
-
-void PSWriter::ImplBmp( Bitmap* pBitmap, Bitmap* pMaskBitmap, const Point & rPoint, double nXWidth, double nYHeightOrg )
-{
-    if ( !pBitmap )
-        return;
-
-    INT32   nHeightOrg = pBitmap->GetSizePixel().Height();
-    INT32   nHeightLeft = nHeightOrg;
-    long    nWidth = pBitmap->GetSizePixel().Width();
-    Point   aSourcePos( rPoint );
-
-    while ( nHeightLeft )
-    {
-        Bitmap  aTileBitmap( *pBitmap );
-        long    nHeight = nHeightLeft;
-        double  nYHeight = nYHeightOrg;
-
-        BOOL    bDoTrans = FALSE;
-
-        Rectangle   aRect;
-        Region      aRegion;
-
-        if ( pMaskBitmap )
-        {
-            bDoTrans = TRUE;
-            while (TRUE)
-            {
-                if ( mnLevel == 1 )
-                {
-                    if ( nHeight > 10 )
-                        nHeight = 8;
-                }
-                aRect = Rectangle( Point( 0, nHeightOrg - nHeightLeft ), Size( (long)nWidth, (long)nHeight ) );
-                aRegion = Region( pMaskBitmap->CreateRegion( COL_BLACK, aRect ) );
-
-                if ( ( mnLevel == 1 ) && ( aRegion.GetRectCount() * 5 > 1000 ) )
-                {
-                    nHeight >>= 1;
-                    if ( nHeight < 2 )
-                        return;
-                    continue;
-                }
-                break;
-            }
-        }
-        if ( nHeight != nHeightOrg )
-        {
-            nYHeight = nYHeightOrg * nHeight / nHeightOrg;
-            aTileBitmap.Crop( Rectangle( Point( 0, nHeightOrg - nHeightLeft ), Size( nWidth, nHeight ) ) );
-        }
-        if ( bDoTrans )
-        {
-            ImplWriteLine( "gs\npum" );
-            ImplTranslate( aSourcePos.X(), aSourcePos.Y() );
-            ImplScale( nXWidth / nWidth,  nYHeight / nHeight );
-            RegionHandle    hRegionHandle = aRegion.BeginEnumRects();
-
-            while ( aRegion.GetNextEnumRect( hRegionHandle, aRect ) )
-            {
-                aRect.Move( 0, - ( nHeightOrg - nHeightLeft ) );
-                ImplWriteLong( aRect.Left() );
-                ImplWriteLong( aRect.Top() );
-                ImplWriteByte( 'm' );
-                ImplWriteLong( aRect.Right() + 1 );
-                ImplWriteLong( aRect.Top() );
-                ImplWriteByte( 'l' );
-                ImplWriteLong( aRect.Right() + 1 );
-                ImplWriteLong( aRect.Bottom() + 1 );
-                ImplWriteByte( 'l' );
-                ImplWriteLong( aRect.Left() );
-                ImplWriteLong( aRect.Bottom() + 1 );
-                ImplWriteByte( 'l' );
-                ImplWriteByte( 'p', PS_SPACE | PS_WRAP );
-            };
-            aRegion.EndEnumRects( hRegionHandle );
-            ImplWriteLine( "eoclip newpath" );
-            ImplWriteLine( "pom" );
-        }
-        BitmapReadAccess* pAcc = aTileBitmap.AcquireReadAccess();
-
-        if (!bDoTrans )
-            ImplWriteLine( "pum" );
-
-        ImplTranslate( aSourcePos.X(), aSourcePos.Y() + nYHeight );
-        ImplScale( nXWidth, nYHeight );
-        if ( mnLevel == 1 )                 // level 1 is always grayscale !!!
-        {
-            ImplWriteLong( nWidth );
-            ImplWriteLong( nHeight );
-            *mpPS << "8 [";
-            ImplWriteLong( nWidth );
-            *mpPS << "0 0 ";
-            ImplWriteLong( -nHeight );
-            ImplWriteLong( 0 );
-            ImplWriteLong( nHeight );
-            ImplWriteLine( "]" );
-            *mpPS << "{currentfile ";
-            ImplWriteLong( nWidth );
-            ImplWriteLine( "string readhexstring pop}" );
-            ImplWriteLine( "image" );
-            for ( long y = 0; y < nHeight; y++ )
-            {
-                for ( long x = 0; x < nWidth; x++ )
-                {
-                    ImplWriteHexByte( (BYTE)pAcc->GetPixel( y, x ) );
-                }
-            }
-            *mpPS << (BYTE)10;
-        }
-        else    // Level 2
-        {
-            if ( mbGrayScale )
-            {
-                ImplWriteLine( "/DeviceGray setcolorspace" );
-                ImplWriteLine( "<<" );
-                ImplWriteLine( "/ImageType 1" );
-                *mpPS << "/Width ";
-                ImplWriteLong( nWidth, PS_RET );
-                *mpPS << "/Height ";
-                ImplWriteLong( nHeight, PS_RET );
-                ImplWriteLine( "/BitsPerComponent 8" );
-                ImplWriteLine( "/Decode[0 1]" );
-                *mpPS << "/ImageMatrix[";
-                ImplWriteLong( nWidth );
-                *mpPS << "0 0 ";
-                ImplWriteLong( -nHeight );
-                ImplWriteLong( 0 );
-                ImplWriteLong( nHeight, PS_NONE );
-                ImplWriteByte( ']', PS_RET );
-                ImplWriteLine( "/DataSource currentfile" );
-                ImplWriteLine( "/ASCIIHexDecode filter" );
-                if ( mbCompression )
-                    ImplWriteLine( "/LZWDecode filter" );
-                ImplWriteLine( ">>" );
-                ImplWriteLine( "image" );
-                if ( mbCompression )
-                {
-                    StartCompression();
-                    for ( long y = 0; y < nHeight; y++ )
-                    {
-                        for ( long x = 0; x < nWidth; x++ )
-                        {
-                            Compress( (BYTE)pAcc->GetPixel( y, x ) );
-                        }
-                    }
-                    EndCompression();
-                }
-                else
-                {
-                    for ( long y = 0; y < nHeight; y++ )
-                    {
-                        for ( long x = 0; x < nWidth; x++ )
-                        {
-                            ImplWriteHexByte( (BYTE)pAcc->GetPixel( y, x ) );
-                        }
-                    }
-                }
-            }
-            else
-            {
-                // have we to write a palette ?
-
-                if ( pAcc->HasPalette() )
-                {
-                    ImplWriteLine( "[/Indexed /DeviceRGB " );
-                    ImplWriteLong( pAcc->GetPaletteEntryCount() - 1, PS_RET );
-                    ImplWriteByte( '<', PS_NONE );
-                    for ( USHORT i = 0; i < pAcc->GetPaletteEntryCount(); i++ )
-                    {
-                        BitmapColor aBitmapColor = pAcc->GetPaletteColor( i );
-                        ImplWriteHexByte( aBitmapColor.GetRed(), PS_NONE );
-                        ImplWriteHexByte( aBitmapColor.GetGreen(), PS_NONE );
-                        ImplWriteHexByte( aBitmapColor.GetBlue(), PS_SPACE | PS_WRAP );
-                    }
-                    ImplWriteByte( '>', PS_RET );
-
-                    ImplWriteLine( "] setcolorspace" );
-                    ImplWriteLine( "<<" );
-                    ImplWriteLine( "/ImageType 1" );
-                    *mpPS << "/Width ";
-                    ImplWriteLong( nWidth, PS_RET );
-                    *mpPS << "/Height ";
-                    ImplWriteLong( nHeight, PS_RET );
-                    ImplWriteLine( "/BitsPerComponent 8" );
-                    ImplWriteLine( "/Decode[0 255]" );
-                    *mpPS << "/ImageMatrix[";
-                    ImplWriteLong( nWidth );
-                    *mpPS << "0 0 ";
-                    ImplWriteLong( -nHeight );
-                    ImplWriteLong( 0);
-                    ImplWriteLong( nHeight, PS_NONE );
-                    ImplWriteByte( ']', PS_RET );
-                    ImplWriteLine( "/DataSource currentfile" );
-                    ImplWriteLine( "/ASCIIHexDecode filter" );
-                    if ( mbCompression )
-                        ImplWriteLine( "/LZWDecode filter" );
-                    ImplWriteLine( ">>" );
-                    ImplWriteLine( "image" );
-                    if ( mbCompression )
-                    {
-                        StartCompression();
-                        for ( long y = 0; y < nHeight; y++ )
-                        {
-                            for ( long x = 0; x < nWidth; x++ )
-                            {
-                                Compress( (BYTE)pAcc->GetPixel( y, x ) );
-                            }
-                        }
-                        EndCompression();
-                    }
-                    else
-                    {
-                        for ( long y = 0; y < nHeight; y++ )
-                        {
-                            for ( long x = 0; x < nWidth; x++ )
-                            {
-                                ImplWriteHexByte( (BYTE)pAcc->GetPixel( y, x ) );
-                            }
-                        }
-                    }
-                }
-                else // 24 bit color
-                {
-                    ImplWriteLine( "/DeviceRGB setcolorspace" );
-                    ImplWriteLine( "<<" );
-                    ImplWriteLine( "/ImageType 1" );
-                    *mpPS << "/Width ";
-                    ImplWriteLong( nWidth, PS_RET );
-                    *mpPS << "/Height ";
-                    ImplWriteLong( nHeight, PS_RET );
-                    ImplWriteLine( "/BitsPerComponent 8" );
-                    ImplWriteLine( "/Decode[0 1 0 1 0 1]" );
-                    *mpPS << "/ImageMatrix[";
-                    ImplWriteLong( nWidth );
-                    *mpPS << "0 0 ";
-                    ImplWriteLong( -nHeight );
-                    ImplWriteLong( 0 );
-                    ImplWriteLong( nHeight, PS_NONE );
-                    ImplWriteByte( ']', PS_RET );
-                    ImplWriteLine( "/DataSource currentfile" );
-                    ImplWriteLine( "/ASCIIHexDecode filter" );
-                    if ( mbCompression )
-                        ImplWriteLine( "/LZWDecode filter" );
-                    ImplWriteLine( ">>" );
-                    ImplWriteLine( "image" );
-                    if ( mbCompression )
-                    {
-                        StartCompression();
-                        for ( long y = 0; y < nHeight; y++ )
-                        {
-                            for ( long x = 0; x < nWidth; x++ )
-                            {
-                                const BitmapColor aBitmapColor( pAcc->GetPixel( y, x ) );
-                                Compress( aBitmapColor.GetRed() );
-                                Compress( aBitmapColor.GetGreen() );
-                                Compress( aBitmapColor.GetBlue() );
-                            }
-                        }
-                        EndCompression();
-                    }
-                    else
-                    {
-                        for ( long y = 0; y < nHeight; y++ )
-                        {
-                            for ( long x = 0; x < nWidth; x++ )
-                            {
-                                const BitmapColor aBitmapColor( pAcc->GetPixel( y, x ) );
-                                ImplWriteHexByte( aBitmapColor.GetRed() );
-                                ImplWriteHexByte( aBitmapColor.GetGreen() );
-                                ImplWriteHexByte( aBitmapColor.GetBlue() );
-                            }
-                        }
-                    }
-                }
-            }
-            ImplWriteLine( ">" );       // in Level 2 the dictionary needs to be closed (eod)
-        }
-        if ( bDoTrans )
-            ImplWriteLine( "gr" );
-        else
-            ImplWriteLine( "pom" );
-
-        aTileBitmap.ReleaseAccess( pAcc );
-        nHeightLeft -= nHeight;
-        if ( nHeightLeft )
-        {
-            nHeightLeft++;
-            aSourcePos.Y() = (long) ( rPoint.Y() + ( nYHeightOrg * ( nHeightOrg - nHeightLeft ) ) / nHeightOrg );
-        }
-    }
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteCharacter( sal_Char nChar )
-{
-    switch( nChar )
-    {
-        case '(' :
-        case ')' :
-        case '\\' :
-            ImplWriteByte( (BYTE)'\\', PS_NONE );
-    }
-    ImplWriteByte( (BYTE)nChar, PS_NONE );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteString( const ByteString& rString, VirtualDevice& rVDev, const INT32* pDXArry, BOOL bStretch )
-{
-    USHORT nLen = rString.Len();
-    if ( nLen )
-    {
-        USHORT i;
-        if ( pDXArry )
-        {
-            double nx = 0;
-
-            for( i = 0; i < nLen; i++ )
-            {
-                if ( i > 0 )
-                    nx = pDXArry[ i - 1 ];
-                ImplWriteDouble( ( bStretch ) ? nx : rVDev.GetTextWidth( rString.GetChar( i ) ) );
-                ImplWriteDouble( nx );
-                ImplWriteLine( "(", PS_NONE );
-                ImplWriteCharacter( rString.GetChar( i ) );
-                ImplWriteLine( ") bs" );
-            }
-        }
-        else
-        {
-            ImplWriteByte( '(', PS_NONE );
-            for ( i = 0; i < nLen; i++ )
-                ImplWriteCharacter( rString.GetChar( i ) );
-            ImplWriteLine( ") sw" );
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void PSWriter::ImplText( const String& rUniString, const Point& rPos, const INT32* pDXArry, sal_Int32 nWidth, VirtualDevice& rVDev )
-{
-    sal_uInt16 nLen = rUniString.Len();
-    if ( !nLen )
-        return;
-    if ( mnTextMode == 0 )  // using glpyh outlines
-    {
-        Font    aNotRotatedFont( maFont );
-        aNotRotatedFont.SetOrientation( 0 );
-
-        VirtualDevice aVirDev( 1 );
-        aVirDev.SetMapMode( rVDev.GetMapMode() );
-        aVirDev.SetFont( aNotRotatedFont );
-        aVirDev.SetTextAlign( eTextAlign );
-
-        sal_Int16 nRotation = maFont.GetOrientation();
-        Polygon aPolyDummy( 1 );
-
-        PolyPolygon aPolyPoly;
-        Point aPos( rPos );
-        if ( nRotation )
-        {
-            aPolyDummy.SetPoint( aPos, 0 );
-            aPolyDummy.Rotate( rPos, nRotation );
-            aPos = aPolyDummy.GetPoint( 0 );
-        }
-        sal_Bool bOldLineColor = bLineColor;
-        bLineColor = sal_False;
-        std::vector<PolyPolygon> aPolyPolyVec;
-        if ( aVirDev.GetTextOutlines( aPolyPolyVec, rUniString, 0, 0, STRING_LEN, TRUE, nWidth, pDXArry ) )
-        {
-            // always adjust text position to match baseline alignment
-            ImplWriteLine( "pum" );
-            ImplWriteDouble( aPos.X() );
-            ImplWriteDouble( aPos.Y() );
-            ImplWriteLine( "t" );
-            if ( nRotation )
-            {
-                ImplWriteF( nRotation, 1 );
-                *mpPS << "r ";
-            }
-            std::vector<PolyPolygon>::iterator aIter( aPolyPolyVec.begin() );
-            while ( aIter != aPolyPolyVec.end() )
-                ImplPolyPoly( *aIter++, sal_True );
-            ImplWriteLine( "pom" );
-        }
-        bLineColor = bOldLineColor;
-    }
-    else if ( ( mnTextMode == 1 ) || ( mnTextMode == 2 ) )  // normal text output
-    {
-        if ( mnTextMode == 2 )  // forcing output one complete text packet, by
-            pDXArry = NULL;     // ignoring the kerning array
-        ImplSetAttrForText( rPos );
-        ByteString aStr( rUniString, maFont.GetCharSet() );
-        ImplWriteString( aStr, rVDev, pDXArry, nWidth != 0 );
-        if ( maFont.GetOrientation() )
-            ImplWriteLine( "gr" );
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void PSWriter::ImplSetAttrForText( const Point& rPoint )
-{
-    Point aPoint( rPoint );
-
-    long nRotation = maFont.GetOrientation();
-    ImplWriteTextColor();
-
-    Size aSize = maFont.GetSize();
-
-    if ( maLastFont != maFont )
-    {
-        if ( maFont.GetPitch() == PITCH_FIXED )         // a little bit font selection
-            ImplDefineFont( "Courier", "Oblique" );
-        else if ( maFont.GetCharSet() == RTL_TEXTENCODING_SYMBOL )
-            ImplWriteLine( "/Symbol findfont" );
-        else if ( maFont.GetFamily() == FAMILY_SWISS )
-            ImplDefineFont( "Helvetica", "Oblique" );
-        else
-            ImplDefineFont( "Times", "Italic" );
-
-        maLastFont = maFont;
-        aSize = maFont.GetSize();
-        ImplWriteDouble( aSize.Height() );
-        *mpPS << "sf ";
-    }
-    if ( eTextAlign != ALIGN_BASELINE )
-    {                                                       // PostScript kennt kein FontAlignment
-        if ( eTextAlign == ALIGN_TOP )                      // -> ich gehe daher davon aus, dass
-            aPoint.Y() += ( aSize.Height() * 4 / 5 );       // der Bereich unter der Baseline
-        else if ( eTextAlign == ALIGN_BOTTOM )              // in etwa 20% der Fontsize ausmacht
-            aPoint.Y() -= ( aSize.Height() / 5 );
-    }
-    ImplMoveTo( aPoint );
-    if ( nRotation )
-    {
-        *mpPS << "gs ";
-        ImplWriteF( nRotation, 1 );
-        *mpPS << "r ";
-    }
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplDefineFont( const char* pOriginalName, const char* pItalic )
-{
-    *mpPS << (BYTE)'/';             //convert the font pOriginalName using ISOLatin1Encoding
-    *mpPS << pOriginalName;
-    switch ( maFont.GetWeight() )
-    {
-        case WEIGHT_SEMIBOLD :
-        case WEIGHT_BOLD :
-        case WEIGHT_ULTRABOLD :
-        case WEIGHT_BLACK :
-            *mpPS << "-Bold";
-            if ( maFont.GetItalic() != ITALIC_NONE )
-                *mpPS << pItalic;
-            break;
-        default:
-            if ( maFont.GetItalic() != ITALIC_NONE )
-                *mpPS << pItalic;
-            break;
-    }
-    ImplWriteLine( " f" );
-}
-
-//---------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplClosePathDraw( ULONG nMode )
-{
-    *mpPS << "pc";
-    mnCursorPos += 2;
-    ImplExecMode( nMode );
-}
-
-void PSWriter::ImplPathDraw()
-{
-    *mpPS << "ps";
-    mnCursorPos += 2;
-    ImplExecMode( PS_RET );
-}
-
-//---------------------------------------------------------------------------------
-
-inline void PSWriter::ImplWriteLineColor( ULONG nMode )
-{
-    if ( aColor != aLineColor )
-    {
-        aColor = aLineColor;
-        ImplWriteColor( nMode );
-    }
-}
-inline void PSWriter::ImplWriteFillColor( ULONG nMode )
-{
-    if ( aColor != aFillColor )
-    {
-        aColor = aFillColor;
-        ImplWriteColor( nMode );
-    }
-}
-inline void PSWriter::ImplWriteTextColor( ULONG nMode )
-{
-    if ( aColor != aTextColor )
-    {
-        aColor = aTextColor;
-        ImplWriteColor( nMode );
-    }
-}
-inline void PSWriter::ImplWriteTextFillColor( ULONG nMode )
-{
-    if ( aColor != aTextFillColor )
-    {
-        aColor = aTextFillColor;
-        ImplWriteColor( nMode );
-    }
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteColor( ULONG nMode )
-{
-    if ( mbGrayScale )
-    {
-        // writes the Color (grayscale) as a Number from 0.000 up to 1.000
-
-        ImplWriteF( 1000 * ( (BYTE)aColor.GetRed() * 77 + (BYTE)aColor.GetGreen() * 151 +
-            (BYTE)aColor.GetBlue() * 28 + 1 ) / 65536, 3, nMode );
-    }
-    else
-    {
-        ImplWriteB1 ( (BYTE)aColor.GetRed() );
-        ImplWriteB1 ( (BYTE)aColor.GetGreen() );
-        ImplWriteB1 ( (BYTE)aColor.GetBlue() );
-    }
-    *mpPS << "c";                               // ( c is defined as setrgbcolor or setgray )
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-double PSWriter::ImplGetScaling( const MapMode& rMapMode )
-{
-    double  nMul;
-    switch ( rMapMode.GetMapUnit() )
-    {
-        case MAP_PIXEL :
-        case MAP_SYSFONT :
-        case MAP_APPFONT :
-
-        case MAP_100TH_MM :
-            nMul = 1;
-            break;
-        case MAP_10TH_MM :
-            nMul = 10;
-            break;
-        case MAP_MM :
-            nMul = 100;
-            break;
-        case MAP_CM :
-            nMul = 1000;
-            break;
-        case MAP_1000TH_INCH :
-            nMul = 2.54;
-            break;
-        case MAP_100TH_INCH :
-            nMul = 25.4;
-            break;
-        case MAP_10TH_INCH :
-            nMul = 254;
-            break;
-        case MAP_INCH :
-            nMul = 2540;
-            break;
-        case MAP_TWIP :
-            nMul = 1.76388889;
-            break;
-        case MAP_POINT :
-            nMul = 35.27777778;
-            break;
-        default:
-            nMul = 1.0;
-            break;
-    }
-    return nMul;
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplGetMapMode( const MapMode& rMapMode )
-{
-    ImplWriteLine( "tm setmatrix" );
-    double fMul = ImplGetScaling( rMapMode );
-    double fScaleX = (double)rMapMode.GetScaleX() * fMul;
-    double fScaleY = (double)rMapMode.GetScaleY() * fMul;
-    ImplTranslate( rMapMode.GetOrigin().X() * fScaleX, rMapMode.GetOrigin().Y() * fScaleY );
-    ImplScale( fScaleX, fScaleY );
-}
-
-//---------------------------------------------------------------------------------
-
-inline void PSWriter::ImplExecMode( ULONG nMode )
-{
-    if ( nMode & PS_WRAP )
-    {
-        if ( mnCursorPos >= PS_LINESIZE )
-        {
-            mnCursorPos = 0;
-            *mpPS << (BYTE)0xa;
-            return;
-        }
-    }
-    if ( nMode & PS_SPACE )
-    {
-            *mpPS << (BYTE)32;
-            mnCursorPos++;
-    }
-    if ( nMode & PS_RET )
-    {
-        *mpPS << (BYTE)0xa;
-        mnCursorPos = 0;
-    }
-}
-
-//---------------------------------------------------------------------------------
-
-inline void PSWriter::ImplWriteLine( const char* pString, ULONG nMode )
-{
-    ULONG i = 0;
-    while ( pString[ i ] )
-    {
-        *mpPS << (BYTE)pString[ i++ ];
-    }
-    mnCursorPos += i;
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteLineInfo( double fLWidth, double fMLimit,
-                                    SvtGraphicStroke::CapType eLCap,
-                                        SvtGraphicStroke::JoinType eJoin,
-                                            SvtGraphicStroke::DashArray& rLDash )
-{
-    if ( fLineWidth != fLWidth )
-    {
-        fLineWidth = fLWidth;
-        ImplWriteDouble( fLineWidth );
-        ImplWriteLine( "lw", PS_SPACE );
-    }
-    if ( eLineCap != eLCap )
-    {
-        eLineCap = eLCap;
-        ImplWriteLong( (sal_Int32)eLineCap, PS_SPACE );
-        ImplWriteLine( "lc", PS_SPACE );
-    }
-    if ( eJoinType != eJoin )
-    {
-        eJoinType = eJoin;
-        ImplWriteLong( (sal_Int32)eJoinType, PS_SPACE );
-        ImplWriteLine( "lj", PS_SPACE );
-    }
-    if ( eJoinType == SvtGraphicStroke::joinMiter )
-    {
-        if ( fMiterLimit != fMLimit )
-        {
-            fMiterLimit = fMLimit;
-            ImplWriteDouble( fMiterLimit );
-            ImplWriteLine( "ml", PS_SPACE );
-        }
-    }
-    if ( aDashArray != rLDash )
-    {
-        aDashArray = rLDash;
-        sal_uInt32 j, i = aDashArray.size();
-        ImplWriteLine( "[", PS_SPACE );
-        for ( j = 0; j < i; j++ )
-            ImplWriteDouble( aDashArray[ j ] );
-        ImplWriteLine( "] 0 ld" );
-    }
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteLineInfo( const LineInfo& rLineInfo )
-{
-    SvtGraphicStroke::DashArray l_aDashArray;
-    if ( rLineInfo.GetStyle() == LINE_DASH )
-        l_aDashArray.push_back( 2 );
-    const double fLWidth(( ( rLineInfo.GetWidth() + 1 ) + ( rLineInfo.GetWidth() + 1 ) ) * 0.5);
-    SvtGraphicStroke::JoinType aJoinType(SvtGraphicStroke::joinMiter);
-
-    switch(rLineInfo.GetLineJoin())
-    {
-        default: // B2DLINEJOIN_NONE, B2DLINEJOIN_MIDDLE
-            // do NOT use SvtGraphicStroke::joinNone here
-            // since it will be written as numerical value directly
-            // and is NOT a valid EPS value
-            break;
-        case basegfx::B2DLINEJOIN_MITER:
-            aJoinType = SvtGraphicStroke::joinMiter;
-            break;
-        case basegfx::B2DLINEJOIN_BEVEL:
-            aJoinType = SvtGraphicStroke::joinBevel;
-            break;
-        case basegfx::B2DLINEJOIN_ROUND:
-            aJoinType = SvtGraphicStroke::joinRound;
-            break;
-    }
-
-    ImplWriteLineInfo( fLWidth, fMiterLimit, SvtGraphicStroke::capButt, aJoinType, l_aDashArray );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteLong( sal_Int32 nNumber, ULONG nMode )
-{
-    const ByteString aNumber( ByteString::CreateFromInt32( nNumber ) );
-    ULONG nLen = aNumber.Len();
-    mnCursorPos += nLen;
-    for ( USHORT n = 0; n < nLen; n++ )
-        *mpPS << aNumber.GetChar( n );
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteDouble( double fNumber, ULONG nMode )
-{
-    sal_Int32 nLength;
-
-    sal_Int32   nPTemp = (sal_Int32)fNumber;
-    sal_Int32   nATemp = labs( (sal_Int32)( ( fNumber - nPTemp ) * 100000 ) );
-
-    if ( !nPTemp && nATemp && ( fNumber < 0.0 ) )
-        *mpPS << (sal_Char)'-';
-
-    ByteString aNumber1( ByteString::CreateFromInt32( nPTemp ) );
-    nLength = aNumber1.Len();
-    mnCursorPos += nLength;
-    for ( sal_Int32 n = 0; n < nLength; n++ )
-        *mpPS << aNumber1.GetChar( (sal_uInt16)n );
-
-    int zCount = 0;
-    if ( nATemp )
-    {
-        *mpPS << (BYTE)'.';
-        mnCursorPos++;
-        const ByteString aNumber2( ByteString::CreateFromInt32( nATemp ) );
-
-        sal_Int16 n, nLen = aNumber2.Len();
-        if ( nLen < 8 )
-        {
-            mnCursorPos += 6 - nLen;
-            for ( n = 0; n < ( 5 - nLen ); n++ )
-            {
-                *mpPS << (BYTE)'0';
-            }
-        }
-        mnCursorPos += nLen;
-        for ( n = 0; n < nLen; n++ )
-        {
-            *mpPS << aNumber2.GetChar( n );
-            zCount--;
-            if ( aNumber2.GetChar( n ) != '0' )
-                zCount = 0;
-        }
-        if ( zCount )
-            mpPS->SeekRel( zCount );
-    }
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-// writes the number to stream: nNumber / ( 10^nCount )
-
-void PSWriter::ImplWriteF( sal_Int32 nNumber, ULONG nCount, ULONG nMode )
-{
-    if ( nNumber < 0 )
-    {
-        *mpPS << (BYTE)'-';
-        nNumber = -nNumber;
-        mnCursorPos++;
-    }
-    const ByteString aScaleFactor( ByteString::CreateFromInt32( nNumber ) );
-    ULONG nLen = aScaleFactor.Len();
-    long nStSize =  ( nCount + 1 ) - nLen;
-    if ( nStSize >= 1 )
-    {
-        *mpPS << (BYTE)'0';
-        mnCursorPos++;
-    }
-    if ( nStSize >= 2 )
-    {
-        *mpPS << (BYTE)'.';
-        for ( long i = 1; i < nStSize; i++ )
-        {
-            *mpPS << (BYTE)'0';
-            mnCursorPos++;
-        }
-    }
-    mnCursorPos += nLen;
-    for( USHORT n = 0UL; n < nLen; n++  )
-    {
-        if ( n == nLen - nCount )
-        {
-            *mpPS << (BYTE)'.';
-            mnCursorPos++;
-        }
-        *mpPS << aScaleFactor.GetChar( n );
-    }
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteByte( BYTE nNumb, ULONG nMode )
-{
-    *mpPS << ( nNumb );
-    mnCursorPos++;
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-void PSWriter::ImplWriteHexByte( BYTE nNumb, ULONG nMode )
-{
-    if ( ( nNumb >> 4 ) > 9 )
-        *mpPS << (BYTE)( ( nNumb >> 4 ) + 'A' - 10 );
-    else
-        *mpPS << (BYTE)( ( nNumb >> 4 ) + '0' );
-
-    if ( ( nNumb & 0xf ) > 9 )
-        *mpPS << (BYTE)( ( nNumb & 0xf ) + 'A' - 10 );
-    else
-        *mpPS << (BYTE)( ( nNumb & 0xf ) + '0' );
-    mnCursorPos += 2;
-    ImplExecMode( nMode );
-}
-
-//---------------------------------------------------------------------------------
-
-// writes the BYTE nNumb as a Number from 0.000 up to 1.000
-
-void PSWriter::ImplWriteB1( BYTE nNumb, ULONG nMode )
-{
-    ImplWriteF( 1000 * ( nNumb + 1 ) / 256 , 3, nMode );
-}
-
-
-// ------------------------------------------------------------------------
-
-inline void PSWriter::WriteBits( USHORT nCode, USHORT nCodeLen )
-{
-    dwShift |= ( nCode << ( nOffset - nCodeLen ) );
-    nOffset -= nCodeLen;
-    while ( nOffset < 24 )
-    {
-        ImplWriteHexByte( (BYTE)( dwShift >> 24 ) );
-        dwShift <<= 8;
-        nOffset += 8;
-    }
-    if ( nCode == 257 && nOffset != 32 )
-        ImplWriteHexByte( (BYTE)( dwShift >> 24 ) );
-}
-
-// ------------------------------------------------------------------------
-
-void PSWriter::StartCompression()
-{
-    USHORT i;
-    nDataSize = 8;
-
-    nClearCode = 1 << nDataSize;
-    nEOICode = nClearCode + 1;
-    nTableSize = nEOICode + 1;
-    nCodeSize = nDataSize + 1;
-
-    nOffset = 32;                       // anzahl freier bits in dwShift
-    dwShift = 0;
-
-    pTable = new PSLZWCTreeNode[ 4096 ];
-
-    for ( i = 0; i < 4096; i++ )
-    {
-        pTable[ i ].pBrother = pTable[ i ].pFirstChild = NULL;
-        pTable[ i ].nValue = (BYTE)( pTable[ i ].nCode = i );
-    }
-    pPrefix = NULL;
-    WriteBits( nClearCode, nCodeSize );
-}
-
-// ------------------------------------------------------------------------
-
-void PSWriter::Compress( BYTE nCompThis )
-{
-    PSLZWCTreeNode*     p;
-    USHORT              i;
-    BYTE                nV;
-
-    if( !pPrefix )
-    {
-        pPrefix = pTable + nCompThis;
-    }
-    else
-    {
-        nV = nCompThis;
-        for( p = pPrefix->pFirstChild; p != NULL; p = p->pBrother )
-        {
-            if ( p->nValue == nV )
-                break;
-        }
-
-        if( p )
-            pPrefix = p;
-        else
-        {
-            WriteBits( pPrefix->nCode, nCodeSize );
-
-            if ( nTableSize == 409 )
-            {
-                WriteBits( nClearCode, nCodeSize );
-
-                for ( i = 0; i < nClearCode; i++ )
-                    pTable[ i ].pFirstChild = NULL;
-
-                nCodeSize = nDataSize + 1;
-                nTableSize = nEOICode + 1;
-            }
-            else
-            {
-                if( nTableSize == (USHORT)( ( 1 << nCodeSize ) - 1 ) )
-                    nCodeSize++;
-
-                p = pTable + ( nTableSize++ );
-                p->pBrother = pPrefix->pFirstChild;
-                pPrefix->pFirstChild = p;
-                p->nValue = nV;
-                p->pFirstChild = NULL;
-            }
-
-            pPrefix = pTable + nV;
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void PSWriter::EndCompression()
-{
-    if( pPrefix )
-        WriteBits( pPrefix->nCode, nCodeSize );
-
-    WriteBits( nEOICode, nCodeSize );
-    delete[] pTable;
-}
-
-// ------------------------------------------------------------------------
-
-BYTE* PSWriter::ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSize )
-{
-    while ( nComp-- >= nSize )
-    {
-        ULONG i;
-        for ( i = 0; i < nSize; i++ )
-        {
-            if ( ( pSource[i]&~0x20 ) != ( pDest[i]&~0x20 ) )
-                break;
-        }
-        if ( i == nSize )
-            return pSource;
-        pSource++;
-    }
-    return NULL;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PSWriter::ImplGetBoundingBox( double* nNumb, BYTE* pSource, ULONG nSize )
-{
-    BOOL    bRetValue = FALSE;
-    ULONG   nBytesRead;
-
-    if ( nSize < 256 )      // we assume that the file is greater than 256 bytes
-        return FALSE;
-
-    if ( nSize < POSTSCRIPT_BOUNDINGSEARCH )
-        nBytesRead = nSize;
-    else
-        nBytesRead = POSTSCRIPT_BOUNDINGSEARCH;
-
-    BYTE* pDest = ImplSearchEntry( pSource, (BYTE*)"%%BoundingBox:", nBytesRead, 14 );
-    if ( pDest )
-    {
-        int     nSecurityCount = 100;   // only 100 bytes following the bounding box will be checked
-        nNumb[0] = nNumb[1] = nNumb[2] = nNumb[3] = 0;
-        pDest += 14;
-        for ( int i = 0; ( i < 4 ) && nSecurityCount; i++ )
-        {
-            int     nDivision = 1;
-            BOOL    bDivision = FALSE;
-            BOOL    bNegative = FALSE;
-            BOOL    bValid = TRUE;
-
-            while ( ( --nSecurityCount ) && ( ( *pDest == ' ' ) || ( *pDest == 0x9 ) ) )
-                pDest++;
-            BYTE nByte = *pDest;
-            while ( nSecurityCount && ( nByte != ' ' ) && ( nByte != 0x9 ) && ( nByte != 0xd ) && ( nByte != 0xa ) )
-            {
-                switch ( nByte )
-                {
-                    case '.' :
-                        if ( bDivision )
-                            bValid = FALSE;
-                        else
-                            bDivision = TRUE;
-                        break;
-                    case '-' :
-                        bNegative = TRUE;
-                        break;
-                    default :
-                        if ( ( nByte < '0' ) || ( nByte > '9' ) )
-                            nSecurityCount = 1;     // error parsing the bounding box values
-                        else if ( bValid )
-                        {
-                            if ( bDivision )
-                                nDivision*=10;
-                            nNumb[i] *= 10;
-                            nNumb[i] += nByte - '0';
-                        }
-                        break;
-                }
-                nSecurityCount--;
-                nByte = *(++pDest);
-            }
-            if ( bNegative )
-                nNumb[i] = -nNumb[i];
-            if ( bDivision && ( nDivision != 1 ) )
-                nNumb[i] /= nDivision;
-        }
-        if ( nSecurityCount)
-            bRetValue = TRUE;
-    }
-    return bRetValue;
-}
-
-//================== GraphicExport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pFilterConfigItem, BOOL)
-{
-    PSWriter aPSWriter;
-    return aPSWriter.WritePS( rGraphic, rStream, pFilterConfigItem );
-}
-
-//---------------------------------------------------------------------------------
-
-extern "C" BOOL __LOADONCALLAPI DoExportDialog( FltCallDialogParameter& rPara )
-{
-    BOOL bRet = FALSE;
-
-    if ( rPara.pWindow )
-    {
-        ByteString  aResMgrName( "eps" );
-        ResMgr* pResMgr;
-
-        pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
-        if( pResMgr )
-        {
-            rPara.pResMgr = pResMgr;
-            bRet = ( DlgExportEPS( rPara ).Execute() == RET_OK );
-            delete pResMgr;
-        }
-        else
-            bRet = TRUE;
-    }
-
-    return bRet;
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/eps/epsstr.src b/goodies/source/filter.vcl/eps/epsstr.src
deleted file mode 100644
index c24a89b6e417..000000000000
--- a/goodies/source/filter.vcl/eps/epsstr.src
+++ /dev/null
@@ -1,73 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: epsstr.src,v $
- * $Revision: 1.43 $
- *
- * 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 "strings.hrc"
-
-String KEY_VERSION_CHECK
-{
-    Text [ en-US ] = "Warning: Not all of the imported EPS graphics could be saved at level1\nas some are at a higher level!";
-};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/goodies/source/filter.vcl/eps/exports.map b/goodies/source/filter.vcl/eps/exports.map
deleted file mode 100644
index 1b61354c2869..000000000000
--- a/goodies/source/filter.vcl/eps/exports.map
+++ /dev/null
@@ -1,8 +0,0 @@
-EPSEXPORTER_1_0 {
-        global:
-                GraphicExport;
-                DoExportDialog;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/eps/makefile.mk b/goodies/source/filter.vcl/eps/makefile.mk
deleted file mode 100644
index c5599344725a..000000000000
--- a/goodies/source/filter.vcl/eps/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=eps
-DEPTARGET=veps
-
-#GEN_HID=TRUE
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES =	dlgeps.src \
-            epsstr.src
-.IF "$(L10N_framework)"==""
-EXCEPTIONSFILES=$(SLO)$/eps.obj
-SLOFILES =	$(SLO)$/eps.obj \
-            $(SLO)$/dlgeps.obj
-.ENDIF
-
-# ==========================================================================
-
-RESLIB1NAME=$(TARGET)
-RESLIB1SRSFILES=$(SRS)$/$(TARGET).srs
-.IF "$(L10N_framework)"==""
-SHL1TARGET= 	eps$(DLLPOSTFIX)
-SHL1IMPLIB= 	eps
-SHL1STDLIBS=	$(TOOLSLIB) $(VCLLIB) $(VCLLIB) $(SVTOOLLIB) $(CPPULIB) $(SALLIB)
-
-SHL1LIBS=		$(SLB)$/eps.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/eps.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/goodies/source/filter.vcl/eras/eras.cxx b/goodies/source/filter.vcl/eras/eras.cxx
deleted file mode 100644
index 46307f2a56e0..000000000000
--- a/goodies/source/filter.vcl/eras/eras.cxx
+++ /dev/null
@@ -1,320 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: eras.cxx,v $
- * $Revision: 1.11.38.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_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
-
-//============================ RASWriter ==================================
-
-class RASWriter {
-
-private:
-
-    SvStream*           mpOStm;
-    USHORT              mpOStmOldModus;
-
-    BOOL                mbStatus;
-    BitmapReadAccess*   mpAcc;
-
-    ULONG               mnWidth, mnHeight;
-    USHORT              mnColors, mnDepth;
-
-    ULONG               mnRepCount;
-    BYTE                mnRepVal;
-
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-    void                ImplCallback( ULONG nCurrentYPos );
-    BOOL                ImplWriteHeader();
-    void                ImplWritePalette();
-    void                ImplWriteBody();
-    void                ImplPutByte( BYTE );    // RLE decoding
-
-public:
-                        RASWriter();
-                        ~RASWriter();
-
-    BOOL                WriteRAS( const Graphic& rGraphic, SvStream& rRAS, FilterConfigItem* pFilterConfigItem );
-};
-
-//=================== Methoden von RASWriter ==============================
-
-RASWriter::RASWriter() :
-    mbStatus    ( TRUE ),
-    mpAcc       ( NULL ),
-    mnRepCount  ( 0xffffffff )
-{
-}
-
-// ------------------------------------------------------------------------
-
-RASWriter::~RASWriter()
-{
-}
-
-// ------------------------------------------------------------------------
-
-void RASWriter::ImplCallback( ULONG nYPos )
-{
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->setValue( (USHORT)( ( 100 * nYPos ) / mnHeight ) );
-}
-
-//  ------------------------------------------------------------------------
-
-BOOL RASWriter::WriteRAS( const Graphic& rGraphic, SvStream& rRAS, FilterConfigItem* pFilterConfigItem)
-{
-    Bitmap  aBmp;
-
-    mpOStm = &rRAS;
-
-    if ( pFilterConfigItem )
-    {
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    BitmapEx    aBmpEx( rGraphic.GetBitmapEx() );
-    aBmp = aBmpEx.GetBitmap();
-
-    if ( aBmp.GetBitCount() == 4 )
-        aBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-
-    mnDepth = aBmp.GetBitCount();
-
-    // export code below only handles three discrete cases
-    mnDepth = mnDepth <= 1 ? 1 : mnDepth <= 8 ? 8 : 24;
-
-    mpAcc = aBmp.AcquireReadAccess();
-    if ( mpAcc )
-    {
-        mpOStmOldModus = mpOStm->GetNumberFormatInt();
-        mpOStm->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-
-        if ( ImplWriteHeader() )
-        {
-            if ( mnDepth <= 8 )
-                ImplWritePalette();
-            ImplWriteBody();
-        }
-        aBmp.ReleaseAccess( mpAcc );
-    }
-    else
-        mbStatus = FALSE;
-
-    mpOStm->SetNumberFormatInt( mpOStmOldModus );
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL RASWriter::ImplWriteHeader()
-{
-    mnWidth = mpAcc->Width();
-    mnHeight = mpAcc->Height();
-    if ( mnDepth <= 8 )
-    {
-        mnColors = mpAcc->GetPaletteEntryCount();
-        if (mnColors == 0)
-            mbStatus = FALSE;
-    }
-        if ( mbStatus && mnWidth && mnHeight && mnDepth )
-    {
-        *mpOStm << (UINT32)0x59a66a95 << (UINT32)mnWidth << (UINT32)mnHeight
-            << (UINT32)mnDepth
-            << (UINT32)(( ( ( ( mnWidth * mnDepth ) + 15 ) >> 4 ) << 1 ) * mnHeight)
-            << (UINT32)2;
-
-        if ( mnDepth > 8 )
-            *mpOStm << (UINT32)0 << (UINT32)0;
-        else
-        {
-
-            *mpOStm << (UINT32)1 << (UINT32)( mnColors * 3 );
-        }
-    }
-    else mbStatus = FALSE;
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void RASWriter::ImplWritePalette()
-{
-    USHORT i;
-
-    for ( i = 0; i < mnColors; *mpOStm << mpAcc->GetPaletteColor( i++ ).GetRed() ) ;
-    for ( i = 0; i < mnColors; *mpOStm << mpAcc->GetPaletteColor( i++ ).GetGreen() ) ;
-    for ( i = 0; i < mnColors; *mpOStm << mpAcc->GetPaletteColor( i++ ).GetBlue() ) ;
-}
-
-// ------------------------------------------------------------------------
-
-void RASWriter::ImplWriteBody()
-{
-    ULONG   x, y;
-
-    if ( mnDepth == 24 )
-    {
-        for ( y = 0; y < mnHeight; y++ )
-        {
-            ImplCallback( y );                              // processing output
-            for ( x = 0; x < mnWidth; x++ )
-            {
-                BitmapColor aColor( mpAcc->GetPixel( y, x ) );
-                ImplPutByte( aColor.GetBlue() );            // Format ist BGR
-                ImplPutByte( aColor.GetGreen() );
-                ImplPutByte( aColor.GetRed() );
-            }
-            if ( x & 1 ) ImplPutByte( 0 );      // WORD ALIGNMENT ???
-        }
-    }
-    else if ( mnDepth == 8 )
-    {
-        for ( y = 0; y < mnHeight; y++ )
-        {
-            ImplCallback( y );                              // processing output
-            for ( x = 0; x < mnWidth; x++ )
-            {
-                ImplPutByte ( mpAcc->GetPixel( y, x ) );
-            }
-            if ( x & 1 ) ImplPutByte( 0 );      // WORD ALIGNMENT ???
-        }
-    }
-    else if ( mnDepth == 1 )
-    {
-        BYTE nDat = 0;
-
-        for ( y = 0; y < mnHeight; y++ )
-        {
-            ImplCallback( y );                              // processing output
-            for ( x = 0; x < mnWidth; x++ )
-            {
-                nDat = ( ( nDat << 1 ) | ( mpAcc->GetPixel ( y, x ) & 1 ) );
-                if ( ( x & 7 ) == 7 )
-                    ImplPutByte( nDat );
-            }
-            if ( x & 7 )
-                ImplPutByte( sal::static_int_cast< BYTE >(nDat << ( ( ( x & 7 ) ^ 7 ) + 1)) );// write remaining bits
-            if (!( ( x - 1 ) & 0x8 ) )
-                ImplPutByte( 0 );               // WORD ALIGNMENT ???
-        }
-    }
-    ImplPutByte( mnRepVal + 1 );    // end of RLE decoding
-}
-
-// ------------------------------------------------------------------------
-
-void RASWriter::ImplPutByte( BYTE nPutThis )
-{
-    if ( mnRepCount == 0xffffffff )
-    {
-        mnRepCount = 0;
-        mnRepVal = nPutThis;
-    }
-    else
-    {
-        if ( ( nPutThis == mnRepVal ) && ( mnRepCount != 0xff ) )
-            mnRepCount++;
-        else
-        {
-            if ( mnRepCount == 0 )
-            {
-                *mpOStm << (BYTE)mnRepVal;
-                if ( mnRepVal == 0x80 )
-                    *mpOStm << (BYTE)0;
-            }
-            else
-            {
-                *mpOStm << (BYTE)0x80;
-                *mpOStm << (BYTE)mnRepCount;
-                *mpOStm << (BYTE)mnRepVal;
-            }
-            mnRepVal = nPutThis;
-            mnRepCount = 0;
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-
-// ---------------------
-// - exported function -
-// ---------------------
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, BOOL )
-{
-    RASWriter aRASWriter;
-
-    return aRASWriter.WriteRAS( rGraphic, rStream, pFilterConfigItem );
-}
-#ifndef GCC
-#endif
-
-// ---------------
-// - Win16 trash -
-// ---------------
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-    if ( nHeap )
-        UnlockData( 0 );
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/eras/exports.map b/goodies/source/filter.vcl/eras/exports.map
deleted file mode 100644
index 4a78a96ee951..000000000000
--- a/goodies/source/filter.vcl/eras/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-RASEXPORTER_1_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/eras/makefile.mk b/goodies/source/filter.vcl/eras/makefile.mk
deleted file mode 100644
index e6aeaeefb223..000000000000
--- a/goodies/source/filter.vcl/eras/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=eras
-DEPTARGET=veras
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-.IF "$(L10N_framework)"==""
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-
-SLOFILES =	$(SLO)$/eras.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	era$(DLLPOSTFIX)
-SHL1IMPLIB= 	eras
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
-SHL1LIBS=		$(SLB)$/eras.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/eras.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
diff --git a/goodies/source/filter.vcl/etiff/etiff.cxx b/goodies/source/filter.vcl/etiff/etiff.cxx
deleted file mode 100644
index 3cdec42d0978..000000000000
--- a/goodies/source/filter.vcl/etiff/etiff.cxx
+++ /dev/null
@@ -1,651 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: etiff.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/bmpacc.hxx>
-#include <svl/solar.hrc>
-#include <svtools/fltcall.hxx>
-#include <svtools/FilterConfigItem.hxx>
-
-#define NewSubfileType              254
-#define ImageWidth                  256
-#define ImageLength                 257
-#define BitsPerSample               258
-#define Compression                 259
-#define PhotometricInterpretation   262
-#define StripOffsets                273
-#define SamplesPerPixel             277
-#define RowsPerStrip                278
-#define StripByteCounts             279
-#define XResolution                 282
-#define YResolution                 283
-#define PlanarConfiguration         284
-#define ResolutionUnit              296
-#define ColorMap                    320
-#define ReferenceBlackWhite         532
-
-// -------------
-// - TIFFWriter -
-// -------------
-
-struct TIFFLZWCTreeNode
-{
-
-    TIFFLZWCTreeNode*   pBrother;       // naechster Knoten, der den selben Vater hat
-    TIFFLZWCTreeNode*   pFirstChild;    // erster Sohn
-    USHORT              nCode;          // Der Code fuer den String von Pixelwerten, der sich ergibt, wenn
-    USHORT              nValue;         // Der Pixelwert
-};
-
-class TIFFWriter
-{
-private:
-
-    SvStream*           mpOStm;
-    UINT32              mnStreamOfs;
-
-    BOOL                mbStatus;
-    BitmapReadAccess*   mpAcc;
-
-    UINT32              mnWidth, mnHeight, mnColors;
-    UINT32              mnCurAllPictHeight;
-    UINT32              mnSumOfAllPictHeight;
-    UINT32              mnBitsPerPixel;
-    UINT32              mnLastPercent;
-
-    UINT32              mnLatestIfdPos;
-    UINT16              mnTagCount;                 // number of tags already written
-    UINT32              mnCurrentTagCountPos;       // offset to the position where the current
-                                                    // tag count is to insert
-
-    UINT32              mnXResPos;                  // if != 0 this DWORDs stores the
-    UINT32              mnYResPos;                  // actual streamposition of the
-    UINT32              mnPalPos;                   // Tag Entry
-    UINT32              mnBitmapPos;
-    UINT32              mnStripByteCountPos;
-
-    TIFFLZWCTreeNode*   pTable;
-    TIFFLZWCTreeNode*   pPrefix;
-    USHORT              nDataSize;
-    USHORT              nClearCode;
-    USHORT              nEOICode;
-    USHORT              nTableSize;
-    USHORT              nCodeSize;
-    ULONG               nOffset;
-    ULONG               dwShift;
-
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-    void                ImplCallback( UINT32 nPercent );
-    BOOL                ImplWriteHeader( BOOL bMultiPage );
-    void                ImplWritePalette();
-    BOOL                ImplWriteBody();
-    void                ImplWriteTag( UINT16 TagID, UINT16 DataType, UINT32 NumberOfItems, UINT32 Value);
-    void                ImplWriteResolution( ULONG nStreamPos, sal_uInt32 nResolutionUnit );
-    void                StartCompression();
-    void                Compress( BYTE nSrc );
-    void                EndCompression();
-    inline void         WriteBits( USHORT nCode, USHORT nCodeLen );
-
-public:
-
-                        TIFFWriter();
-                        ~TIFFWriter();
-
-    BOOL                WriteTIFF( const Graphic& rGraphic, SvStream& rTIFF, FilterConfigItem* pFilterConfigItem );
-};
-
-// ------------------------------------------------------------------------
-
-TIFFWriter::TIFFWriter() :
-        mbStatus            ( TRUE ),
-        mpAcc               ( NULL ),
-        mnCurAllPictHeight  ( 0 ),
-        mnSumOfAllPictHeight( 0 ),
-        mnLastPercent       ( 0 ),
-        mnXResPos           ( 0 ),
-        mnYResPos           ( 0 ),
-        mnBitmapPos         ( 0 ),
-        mnStripByteCountPos ( 0 )
-{
-}
-
-// ------------------------------------------------------------------------
-
-TIFFWriter::~TIFFWriter()
-{
-}
-
-// ------------------------------------------------------------------------
-
-BOOL TIFFWriter::WriteTIFF( const Graphic& rGraphic, SvStream& rTIFF, FilterConfigItem* pFilterConfigItem)
-{
-    ULONG*  pDummy = new ULONG; delete pDummy; // damit unter OS/2
-                                               // das richtige (Tools-)new
-                                               // verwendet wird, da es sonst
-                                               // in dieser DLL nur Vector-news
-                                               // gibt;
-
-    if ( pFilterConfigItem )
-    {
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    // #i69169# copy stream
-    mpOStm = &rTIFF;
-
-    const UINT16    nOldFormat = mpOStm->GetNumberFormatInt();
-    mnStreamOfs = mpOStm->Tell();
-
-    // we will use the BIG Endian Mode
-    // TIFF header
-    mpOStm->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-    *mpOStm << (UINT32)0x4d4d002a;      // TIFF identifier
-    mnLatestIfdPos = mpOStm->Tell();
-    *mpOStm << (UINT32)0;
-
-    Animation   aAnimation;
-    Bitmap      aBmp;
-
-    if( mbStatus )
-    {
-        if ( rGraphic.IsAnimated() )
-            aAnimation = rGraphic.GetAnimation();
-        else
-        {
-            AnimationBitmap aAnimationBitmap( rGraphic.GetBitmap(), Point(), Size() );
-            aAnimation.Insert( aAnimationBitmap );
-        }
-
-        USHORT i;
-        for ( i = 0; i < aAnimation.Count(); i++ )
-            mnSumOfAllPictHeight += aAnimation.Get( i ).aBmpEx.GetSizePixel().Height();
-
-        for ( i = 0; mbStatus && ( i < aAnimation.Count() ); i++ )
-        {
-            mnPalPos = 0;
-            const AnimationBitmap& rAnimationBitmap = aAnimation.Get( i );
-            aBmp = rAnimationBitmap.aBmpEx.GetBitmap();
-            mpAcc = aBmp.AcquireReadAccess();
-            if ( mpAcc )
-            {
-                mnBitsPerPixel = aBmp.GetBitCount();
-
-                // export code below only handles four discrete cases
-                mnBitsPerPixel =
-                    mnBitsPerPixel <= 1 ? 1 : mnBitsPerPixel <= 4 ? 4 : mnBitsPerPixel <= 8 ? 8 : 24;
-
-                if ( ImplWriteHeader( ( aAnimation.Count() > 0 ) ) )
-                {
-                    Size aDestMapSize( 300, 300 );
-                    const MapMode aMapMode( aBmp.GetPrefMapMode() );
-                    if ( aMapMode.GetMapUnit() != MAP_PIXEL )
-                    {
-                        const Size aPrefSize( rGraphic.GetPrefSize() );
-                        aDestMapSize = OutputDevice::LogicToLogic( aPrefSize, aMapMode, MAP_INCH );
-                    }
-                    ImplWriteResolution( mnXResPos, aDestMapSize.Width() );
-                    ImplWriteResolution( mnYResPos, aDestMapSize.Height() );
-                    if  ( mnPalPos )
-                        ImplWritePalette();
-                    ImplWriteBody();
-                }
-                UINT32 nCurPos = mpOStm->Tell();
-                mpOStm->Seek( mnCurrentTagCountPos );
-                *mpOStm << mnTagCount;
-                mpOStm->Seek( nCurPos );
-
-                aBmp.ReleaseAccess( mpAcc );
-            }
-            else
-                mbStatus = FALSE;
-        }
-    }
-    mpOStm->SetNumberFormatInt( nOldFormat );
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void TIFFWriter::ImplCallback( UINT32 nPercent )
-{
-    if ( xStatusIndicator.is() )
-    {
-        if( nPercent >= mnLastPercent + 3 )
-        {
-            mnLastPercent = nPercent;
-            if ( nPercent <= 100 )
-                xStatusIndicator->setValue( nPercent );
-        }
-    }
-}
-
-
-// ------------------------------------------------------------------------
-
-BOOL TIFFWriter::ImplWriteHeader( BOOL bMultiPage )
-{
-    mnTagCount = 0;
-    mnWidth = mpAcc->Width();
-    mnHeight = mpAcc->Height();
-
-    if ( mnWidth && mnHeight && mnBitsPerPixel && mbStatus )
-    {
-        UINT32 nCurrentPos = mpOStm->Tell();
-        mpOStm->Seek( mnLatestIfdPos );
-        *mpOStm << (UINT32)( nCurrentPos - mnStreamOfs );   // offset to the IFD
-        mpOStm->Seek( nCurrentPos );
-
-        // (OFS8) TIFF image file directory (IFD)
-        mnCurrentTagCountPos = mpOStm->Tell();
-        *mpOStm << (UINT16)0;               // the number of tagentrys is to insert later
-
-        UINT32 nSubFileFlags = 0;
-        if ( bMultiPage )
-            nSubFileFlags |= 2;
-        ImplWriteTag( NewSubfileType, 4, 1, nSubFileFlags );
-        ImplWriteTag( ImageWidth, 4, 1, mnWidth );
-        ImplWriteTag( ImageLength, 4, 1, mnHeight);
-        ImplWriteTag( BitsPerSample, 3, 1, ( mnBitsPerPixel == 24 ) ? 8 : mnBitsPerPixel );
-        ImplWriteTag( Compression, 3, 1, 5 );
-        BYTE nTemp;
-        switch ( mnBitsPerPixel )
-        {
-            case 1 :
-                nTemp = 1;
-                break;
-            case 4 :
-            case 8 :
-                nTemp = 3;
-                break;
-            case 24:
-                nTemp = 2;
-                break;
-            default:
-                nTemp = 0;  // -Wall set a default...
-                break;
-        }
-        ImplWriteTag( PhotometricInterpretation, 3, 1, nTemp );
-        mnBitmapPos = mpOStm->Tell();
-        ImplWriteTag( StripOffsets, 4, 1, 0 );
-        ImplWriteTag( SamplesPerPixel, 3, 1, ( mnBitsPerPixel == 24 ) ? 3 : 1 );
-        ImplWriteTag( RowsPerStrip, 4, 1, mnHeight );   //0xffffffff );
-        mnStripByteCountPos = mpOStm->Tell();
-        ImplWriteTag( StripByteCounts, 4, 1, ( ( mnWidth * mnBitsPerPixel * mnHeight ) + 7 ) >> 3 );
-        mnXResPos = mpOStm->Tell();
-        ImplWriteTag( XResolution, 5, 1, 0 );
-        mnYResPos = mpOStm->Tell();
-        ImplWriteTag( YResolution, 5, 1, 0 );
-        if ( mnBitsPerPixel != 1 )
-            ImplWriteTag( PlanarConfiguration, 3, 1, 1 );   //  ( RGB ORDER )
-        ImplWriteTag( ResolutionUnit, 3, 1, 2);             // Resolution Unit is Inch
-        if ( ( mnBitsPerPixel == 4 ) || ( mnBitsPerPixel == 8 ) )
-        {
-            mnColors = mpAcc->GetPaletteEntryCount();
-            mnPalPos = mpOStm->Tell();
-            ImplWriteTag( ColorMap, 3, 3 * mnColors, 0 );
-        }
-
-        // and last we write zero to close the num dir entries list
-        mnLatestIfdPos = mpOStm->Tell();
-        *mpOStm << (UINT32)0;               // there are no more IFD
-    }
-    else
-        mbStatus = FALSE;
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void TIFFWriter::ImplWritePalette()
-{
-    USHORT i;
-    ULONG nCurrentPos = mpOStm->Tell();
-    mpOStm->Seek( mnPalPos + 8 );           // the palette tag entry needs the offset
-    *mpOStm << static_cast<sal_uInt32>(nCurrentPos - mnStreamOfs);  // to the palette colors
-    mpOStm->Seek( nCurrentPos );
-
-    for ( i = 0; i < mnColors; i++ )
-    {
-        const BitmapColor& rColor = mpAcc->GetPaletteColor( i );
-        *mpOStm << (UINT16)( rColor.GetRed() << 8 );
-    }
-    for ( i = 0; i < mnColors; i++ )
-    {
-        const BitmapColor& rColor = mpAcc->GetPaletteColor( i );
-        *mpOStm << (UINT16)( rColor.GetGreen() << 8 );
-    }
-    for ( i = 0; i < mnColors; i++ )
-    {
-        const BitmapColor& rColor = mpAcc->GetPaletteColor( i );
-        *mpOStm << (UINT16)( rColor.GetBlue() << 8 );
-    }
-}
-
-// ------------------------------------------------------------------------
-
-BOOL TIFFWriter::ImplWriteBody()
-{
-    BYTE    nTemp = 0;
-    BYTE    nShift;
-    ULONG   j, x, y;
-
-    ULONG nGfxBegin = mpOStm->Tell();
-    mpOStm->Seek( mnBitmapPos + 8 );        // the strip offset tag entry needs the offset
-    *mpOStm << static_cast<sal_uInt32>(nGfxBegin - mnStreamOfs);        // to the bitmap data
-    mpOStm->Seek( nGfxBegin );
-
-    StartCompression();
-
-    switch( mnBitsPerPixel )
-    {
-        case 24 :
-        {
-            for ( y = 0; y < mnHeight; y++, mnCurAllPictHeight++ )
-            {
-                ImplCallback( 100 * mnCurAllPictHeight / mnSumOfAllPictHeight );
-                for ( x = 0; x < mnWidth; x++ )
-                {
-                    const BitmapColor& rColor = mpAcc->GetPixel( y, x );
-                    Compress( rColor.GetRed() );
-                    Compress( rColor.GetGreen() );
-                    Compress( rColor.GetBlue() );
-                }
-            }
-        }
-        break;
-
-        case 8 :
-        {
-            for ( y = 0; y < mnHeight; y++, mnCurAllPictHeight++ )
-            {
-                ImplCallback( 100 * mnCurAllPictHeight / mnSumOfAllPictHeight );
-                for ( x = 0; x < mnWidth; x++ )
-                {
-                    Compress( mpAcc->GetPixel( y, x ) );
-                }
-            }
-        }
-        break;
-
-        case 4 :
-        {
-            for ( nShift = 0, y = 0; y < mnHeight; y++, mnCurAllPictHeight++ )
-            {
-                ImplCallback( 100 * mnCurAllPictHeight / mnSumOfAllPictHeight );
-                for ( x = 0; x < mnWidth; x++, nShift++ )
-                {
-                    if (!( nShift & 1 ))
-                        nTemp = ( (BYTE)mpAcc->GetPixel( y, x ) << 4 );
-                    else
-                        Compress( (BYTE)( nTemp | ( mpAcc->GetPixel( y, x ) & 0xf ) ) );
-                }
-                if ( nShift & 1 )
-                    Compress( nTemp );
-            }
-        }
-        break;
-
-        case 1 :
-        {
-            j = 1;
-            for ( y = 0; y < mnHeight; y++, mnCurAllPictHeight++ )
-            {
-                ImplCallback( 100 * mnCurAllPictHeight / mnSumOfAllPictHeight );
-                for ( x = 0; x < mnWidth; x++)
-                {
-                    j <<= 1;
-                    j |= ( ( ~mpAcc->GetPixel( y, x ) ) & 1 );
-                    if ( j & 0x100 )
-                    {
-                        Compress( (BYTE)j );
-                        j = 1;
-                    }
-                }
-                if ( j != 1 )
-                {
-                    Compress( (BYTE)(j << ( ( ( x & 7) ^ 7 ) + 1 ) ) );
-                    j = 1;
-                }
-            }
-        }
-        break;
-
-        default:
-        {
-            mbStatus = FALSE;
-        }
-        break;
-    }
-
-    EndCompression();
-
-    if ( mnStripByteCountPos && mbStatus )
-    {
-        ULONG nGfxEnd = mpOStm->Tell();
-        mpOStm->Seek( mnStripByteCountPos + 8 );
-        *mpOStm << static_cast<sal_uInt32>( nGfxEnd - nGfxBegin );      // mnStripByteCountPos needs the size of the compression data
-        mpOStm->Seek( nGfxEnd );
-    }
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void TIFFWriter::ImplWriteResolution( ULONG nStreamPos, sal_uInt32 nResolutionUnit )
-{
-    ULONG nCurrentPos = mpOStm->Tell();
-    mpOStm->Seek( nStreamPos + 8 );
-    *mpOStm << (UINT32)nCurrentPos - mnStreamOfs;
-    mpOStm->Seek( nCurrentPos );
-    *mpOStm << (UINT32)1;
-    *mpOStm << nResolutionUnit;
-}
-
-// ------------------------------------------------------------------------
-
-void TIFFWriter::ImplWriteTag( UINT16 nTagID, UINT16 nDataType, UINT32 nNumberOfItems, UINT32 nValue)
-{
-        mnTagCount++;
-
-        *mpOStm << nTagID;
-        *mpOStm << nDataType;
-        *mpOStm << nNumberOfItems;
-        if ( nDataType == 3 )
-            nValue <<=16;           // in Big Endian Mode WORDS needed to be shifted to a DWORD
-        *mpOStm << nValue;
-}
-
-// ------------------------------------------------------------------------
-
-inline void TIFFWriter::WriteBits( USHORT nCode, USHORT nCodeLen )
-{
-    dwShift |= ( nCode << ( nOffset - nCodeLen ) );
-    nOffset -= nCodeLen;
-    while ( nOffset < 24 )
-    {
-        *mpOStm << (BYTE)( dwShift >> 24 );
-        dwShift <<= 8;
-        nOffset += 8;
-    }
-    if ( nCode == 257 && nOffset != 32 )
-    {
-        *mpOStm << (BYTE)( dwShift >> 24 );
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void TIFFWriter::StartCompression()
-{
-    USHORT i;
-    nDataSize = 8;
-
-    nClearCode = 1 << nDataSize;
-    nEOICode = nClearCode + 1;
-    nTableSize = nEOICode + 1;
-    nCodeSize = nDataSize + 1;
-
-    nOffset = 32;                       // anzahl freier bits in dwShift
-    dwShift = 0;
-
-    pTable = new TIFFLZWCTreeNode[ 4096 ];
-
-    for ( i = 0; i < 4096; i++)
-    {
-        pTable[ i ].pBrother = pTable[ i ].pFirstChild = NULL;
-        pTable[ i ].nValue = (BYTE)( pTable[ i ].nCode = i );
-    }
-
-    pPrefix = NULL;
-    WriteBits( nClearCode, nCodeSize );
-}
-
-// ------------------------------------------------------------------------
-
-void TIFFWriter::Compress( BYTE nCompThis )
-{
-    TIFFLZWCTreeNode*    p;
-    USHORT              i;
-    BYTE                nV;
-
-    if( !pPrefix )
-    {
-        pPrefix = pTable + nCompThis;
-    }
-    else
-    {
-        nV = nCompThis;
-        for( p = pPrefix->pFirstChild; p != NULL; p = p->pBrother )
-        {
-            if ( p->nValue == nV )
-                break;
-        }
-
-        if( p )
-            pPrefix = p;
-        else
-        {
-            WriteBits( pPrefix->nCode, nCodeSize );
-
-            if ( nTableSize == 409 )
-            {
-                WriteBits( nClearCode, nCodeSize );
-
-                for ( i = 0; i < nClearCode; i++ )
-                    pTable[ i ].pFirstChild = NULL;
-
-                nCodeSize = nDataSize + 1;
-                nTableSize = nEOICode + 1;
-            }
-            else
-            {
-                if( nTableSize == (USHORT)( ( 1 << nCodeSize ) - 1 ) )
-                    nCodeSize++;
-
-                p = pTable + ( nTableSize++ );
-                p->pBrother = pPrefix->pFirstChild;
-                pPrefix->pFirstChild = p;
-                p->nValue = nV;
-                p->pFirstChild = NULL;
-            }
-
-            pPrefix = pTable + nV;
-        }
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void TIFFWriter::EndCompression()
-{
-    if( pPrefix )
-        WriteBits( pPrefix->nCode, nCodeSize );
-
-    WriteBits( nEOICode, nCodeSize );
-    delete[] pTable;
-}
-
-// ------------------------------------------------------------------------
-
-// ---------------------
-// - exported function -
-// ---------------------
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, BOOL )
-{
-    return TIFFWriter().WriteTIFF( rGraphic, rStream, pFilterConfigItem );
-}
-
-#ifndef GCC
-#endif
-
-// ---------------
-// - Win16 trash -
-// ---------------
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-    if ( nHeap )
-        UnlockData( 0 );
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/goodies/source/filter.vcl/etiff/exports.map b/goodies/source/filter.vcl/etiff/exports.map
deleted file mode 100644
index 094e72c0f5fb..000000000000
--- a/goodies/source/filter.vcl/etiff/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-TIFEXPORTER_1_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/etiff/makefile.mk b/goodies/source/filter.vcl/etiff/makefile.mk
deleted file mode 100644
index 70902012ce23..000000000000
--- a/goodies/source/filter.vcl/etiff/makefile.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=etiff
-DEPTARGET=vetiff
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/etiff.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	eti$(DLLPOSTFIX)
-SHL1IMPLIB= 	etiff
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
-SHL1LIBS=		$(SLB)$/etiff.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/etiff.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/goodies/source/filter.vcl/expm/expm.cxx b/goodies/source/filter.vcl/expm/expm.cxx
deleted file mode 100644
index 0eb9cd97b94f..000000000000
--- a/goodies/source/filter.vcl/expm/expm.cxx
+++ /dev/null
@@ -1,305 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: expm.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <svtools/fltcall.hxx>
-
-//============================ XPMWriter ==================================
-
-class XPMWriter {
-
-private:
-
-    SvStream*           mpOStm;             // Die auszugebende XPM-Datei
-    USHORT              mpOStmOldModus;
-
-    BOOL                mbStatus;
-    BOOL                mbTrans;
-    BitmapReadAccess*   mpAcc;
-    ULONG               mnWidth, mnHeight;  // Bildausmass in Pixeln
-    USHORT              mnColors;
-
-    com::sun::star::uno::Reference< com::sun::star::task::XStatusIndicator > xStatusIndicator;
-
-    void                ImplCallback( USHORT nPercent );
-    BOOL                ImplWriteHeader();
-    void                ImplWritePalette();
-    void                ImplWriteColor( USHORT );
-    void                ImplWriteBody();
-    void                ImplWriteNumber( sal_Int32 );
-    void                ImplWritePixel( ULONG );
-
-public:
-                        XPMWriter();
-                        ~XPMWriter();
-
-    BOOL                WriteXPM( const Graphic& rGraphic, SvStream& rXPM, FilterConfigItem* pFilterConfigItem );
-};
-
-//=================== Methoden von XPMWriter ==============================
-
-XPMWriter::XPMWriter() :
-    mbStatus    ( TRUE ),
-    mbTrans     ( FALSE ),
-    mpAcc       ( NULL )
-{
-}
-
-// ------------------------------------------------------------------------
-
-XPMWriter::~XPMWriter()
-{
-}
-
-// ------------------------------------------------------------------------
-
-void XPMWriter::ImplCallback( USHORT nPercent )
-{
-    if ( xStatusIndicator.is() )
-    {
-        if ( nPercent <= 100 )
-            xStatusIndicator->setValue( nPercent );
-    }
-}
-
-//  ------------------------------------------------------------------------
-
-BOOL XPMWriter::WriteXPM( const Graphic& rGraphic, SvStream& rXPM, FilterConfigItem* pFilterConfigItem)
-{
-    Bitmap  aBmp;
-
-    mpOStm = &rXPM;
-
-    if ( pFilterConfigItem )
-    {
-        xStatusIndicator = pFilterConfigItem->GetStatusIndicator();
-        if ( xStatusIndicator.is() )
-        {
-            rtl::OUString aMsg;
-            xStatusIndicator->start( aMsg, 100 );
-        }
-    }
-
-    BitmapEx    aBmpEx( rGraphic.GetBitmapEx() );
-    aBmp = aBmpEx.GetBitmap();
-
-    if ( rGraphic.IsTransparent() )                 // event. transparente Farbe erzeugen
-    {
-        mbTrans = TRUE;
-        if ( aBmp.GetBitCount() >= 8 )              // wenn noetig Bild auf 8 bit konvertieren
-            aBmp.Convert( BMP_CONVERSION_8BIT_TRANS );
-        else
-            aBmp.Convert( BMP_CONVERSION_4BIT_TRANS );
-        aBmp.Replace( aBmpEx.GetMask(), BMP_COL_TRANS );
-    }
-    else
-    {
-        if ( aBmp.GetBitCount() > 8 )               // wenn noetig Bild auf 8 bit konvertieren
-            aBmp.Convert( BMP_CONVERSION_8BIT_COLORS );
-    }
-    mpAcc = aBmp.AcquireReadAccess();
-    if ( mpAcc )
-    {
-        mnColors = mpAcc->GetPaletteEntryCount();
-        mpOStmOldModus = mpOStm->GetNumberFormatInt();
-        mpOStm->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-
-        if ( ImplWriteHeader() )
-        {
-            ImplWritePalette();
-            ImplWriteBody();
-            *mpOStm << "\x22XPMENDEXT\x22\x0a};";
-        }
-        aBmp.ReleaseAccess( mpAcc );
-    }
-    else
-        mbStatus = FALSE;
-
-    mpOStm->SetNumberFormatInt( mpOStmOldModus );
-
-    if ( xStatusIndicator.is() )
-        xStatusIndicator->end();
-
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL XPMWriter::ImplWriteHeader()
-{
-    mnWidth = mpAcc->Width();
-    mnHeight = mpAcc->Height();
-    if ( mnWidth && mnHeight && mnColors )
-    {
-        *mpOStm << "/* XPM */\x0astatic char * image[] = \x0a{\x0a\x22";
-        ImplWriteNumber( mnWidth );
-        *mpOStm << (BYTE)32;
-        ImplWriteNumber( mnHeight );
-        *mpOStm << (BYTE)32;
-        ImplWriteNumber( mnColors );
-        *mpOStm << (BYTE)32;
-        ImplWriteNumber( ( mnColors > 26 ) ? 2 : 1 );
-        *mpOStm << "\x22,\x0a";
-    }
-    else mbStatus = FALSE;
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-void XPMWriter::ImplWritePalette()
-{
-    USHORT nTransIndex = 0xffff;
-
-    if ( mbTrans )
-        nTransIndex = mpAcc->GetBestMatchingColor( BMP_COL_TRANS );
-    for ( USHORT i = 0; i < mnColors; i++ )
-    {
-        *mpOStm << "\x22";
-        ImplWritePixel( i );
-        *mpOStm << (BYTE)32;
-        if ( nTransIndex != i )
-        {
-            ImplWriteColor( i );
-            *mpOStm << "\x22,\x0a";
-        }
-        else
-            *mpOStm << "c none\x22,\x0a";
-    }
-}
-
-// ------------------------------------------------------------------------
-
-void XPMWriter::ImplWriteBody()
-{
-    for ( ULONG y = 0; y < mnHeight; y++ )
-    {
-        ImplCallback( (USHORT)( ( 100 * y ) / mnHeight ) );         // processing output in percent
-        *mpOStm << (BYTE)0x22;
-        for ( ULONG x = 0; x < mnWidth; x++ )
-        {
-            ImplWritePixel( (BYTE)(mpAcc->GetPixel( y, x ) ) );
-        }
-        *mpOStm << "\x22,\x0a";
-    }
-}
-
-// ------------------------------------------------------------------------
-// eine Dezimalzahl im ASCII format wird in den Stream geschrieben
-
-void XPMWriter::ImplWriteNumber( sal_Int32 nNumber )
-{
-    const ByteString aNum( ByteString::CreateFromInt32( nNumber ) );
-
-    for( sal_Int16 n = 0UL, nLen = aNum.Len(); n < nLen; n++  )
-        *mpOStm << aNum.GetChar( n );
-
-}
-
-// ------------------------------------------------------------------------
-
-void XPMWriter::ImplWritePixel( ULONG nCol )
-{
-    if ( mnColors > 26 )
-    {
-        BYTE nDiff = (BYTE) ( nCol / 26 );
-        *mpOStm << (BYTE)( nDiff + 'A' );
-        *mpOStm << (BYTE)( nCol - ( nDiff*26 ) + 'A' );
-    }
-    else
-        *mpOStm << (BYTE)( nCol + 'A' );
-}
-
-// ------------------------------------------------------------------------
-// ein Farbwert wird im Hexadezimalzahlformat in den Stream geschrieben
-void XPMWriter::ImplWriteColor( USHORT nNumber )
-{
-    ULONG   nTmp;
-    BYTE    j;
-
-    *mpOStm << "c #";   // # zeigt einen folgenden Hexwert an
-    const BitmapColor& rColor = mpAcc->GetPaletteColor( nNumber );
-    nTmp = ( rColor.GetRed() << 16 ) | ( rColor.GetGreen() << 8 ) | rColor.GetBlue();
-    for ( signed char i = 20; i >= 0 ; i-=4 )
-    {
-        if ( ( j = (BYTE)( nTmp >> i ) & 0xf ) > 9 )
-            j += 'A' - 10;
-        else
-            j += '0';
-        *mpOStm << j;
-    }
-}
-
-// ------------------------------------------------------------------------
-
-// ---------------------
-// - exported function -
-// ---------------------
-
-extern "C" BOOL __LOADONCALLAPI GraphicExport( SvStream& rStream, Graphic& rGraphic, FilterConfigItem* pFilterConfigItem, BOOL )
-{
-    XPMWriter aXPMWriter;
-
-    return aXPMWriter.WriteXPM( rGraphic, rStream, pFilterConfigItem );
-}
-
-#ifndef GCC
-#endif
-
-// ---------------
-// - Win16 trash -
-// ---------------
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-    if ( nHeap )
-        UnlockData( 0 );
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-// ------------------------------------------------------------------------
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/expm/exports.map b/goodies/source/filter.vcl/expm/exports.map
deleted file mode 100644
index f1f42312c802..000000000000
--- a/goodies/source/filter.vcl/expm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-XPMEXPORTER_1_0 {
-        global:
-                GraphicExport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/expm/makefile.mk b/goodies/source/filter.vcl/expm/makefile.mk
deleted file mode 100644
index e123220feff8..000000000000
--- a/goodies/source/filter.vcl/expm/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=expm
-DEPTARGET=vexpm
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/expm.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	exp$(DLLPOSTFIX)
-SHL1IMPLIB= 	expm
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB) $(SVTOOLLIB)
-SHL1LIBS=		$(SLB)$/expm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/expm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/goodies/source/filter.vcl/icgm/actimpr.cxx b/goodies/source/filter.vcl/icgm/actimpr.cxx
deleted file mode 100644
index 7d6ef5ce49c8..000000000000
--- a/goodies/source/filter.vcl/icgm/actimpr.cxx
+++ /dev/null
@@ -1,1137 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: actimpr.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#include <vcl/bitmapex.hxx>
-#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/drawing/LineDash.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/Hatch.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/awt/FontWeight.hpp>
-#include <com/sun/star/awt/FontUnderline.hpp>
-#include <com/sun/star/drawing/XShapeGrouper.hpp>
-#include <com/sun/star/drawing/CircleKind.hpp>
-#include <com/sun/star/awt/XBitmap.hpp>
-#include <com/sun/star/drawing/PointSequenceSequence.hpp>
-#include <com/sun/star/drawing/PointSequence.hpp>
-#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-#include <com/sun/star/drawing/FlagSequence.hpp>
-#include <com/sun/star/drawing/TextAdjust.hpp>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/style/HorizontalAlignment.hpp>
-
-#include <unotools/processfactory.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
-
-//#include <toolkit/unohlp.hxx>
-
-#include "main.hxx"
-#include "outact.hxx"
-
-using namespace ::com::sun::star;
-
-// ---------------------------------------------------------------
-// ---------------------------------------------------------------
-// ---------------------------------------------------------------
-// ---------------------------------------------------------------
-
-CGMImpressOutAct::CGMImpressOutAct( CGM& rCGM, const uno::Reference< frame::XModel > & rModel ) :
-        CGMOutAct       ( rCGM ),
-        nFinalTextCount ( 0 )
-{
-    sal_Bool bStatRet = sal_False;
-
-    if ( mpCGM->mbStatus )
-    {
-        uno::Reference< drawing::XDrawPagesSupplier >  aDrawPageSup( rModel, uno::UNO_QUERY );
-        if( aDrawPageSup.is() )
-        {
-            maXDrawPages = aDrawPageSup->getDrawPages();
-            if ( maXDrawPages.is() )
-            {
-                maXServiceManagerSC = utl::getProcessServiceFactory();
-                if ( maXServiceManagerSC.is() )
-                {
-                    uno::Any aAny( rModel->queryInterface( ::getCppuType((const uno::Reference< lang::XMultiServiceFactory >*)0) ));
-                    if( aAny >>= maXMultiServiceFactory )
-                    {
-                        maXDrawPage = *(uno::Reference< drawing::XDrawPage > *)maXDrawPages->getByIndex( 0 ).getValue();
-                        if ( ImplInitPage() )
-                            bStatRet = sal_True;
-                    }
-                }
-            }
-        }
-        mpCGM->mbStatus = bStatRet;
-    }
-};
-
-// ---------------------------------------------------------------
-
-sal_Bool CGMImpressOutAct::ImplInitPage()
-{
-    sal_Bool    bStatRet = sal_False;
-    if( maXDrawPage.is() )
-    {
-        maXShapes = uno::Reference< drawing::XShapes >( maXDrawPage, uno::UNO_QUERY );
-        if ( maXShapes.is() )
-        {
-            bStatRet = sal_True;
-        }
-    }
-    return bStatRet;
-}
-
-// ---------------------------------------------------------------
-
-sal_Bool CGMImpressOutAct::ImplCreateShape( const ::rtl::OUString& rType )
-{
-    uno::Reference< uno::XInterface > xNewShape( maXMultiServiceFactory->createInstance( rType ) );
-    maXShape = uno::Reference< drawing::XShape >( xNewShape, uno::UNO_QUERY );
-    maXPropSet = uno::Reference< beans::XPropertySet >( xNewShape, uno::UNO_QUERY );
-    if ( maXShape.is() && maXPropSet.is() )
-    {
-        maXShapes->add( maXShape );
-        return sal_True;
-    }
-    return sal_False;
-}
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrientation )
-{
-    uno::Any aAny;
-    aAny <<= (sal_Int32)rRefPoint.X;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointX"), aAny );
-    aAny <<= (sal_Int32)rRefPoint.Y;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointY"), aAny );
-    aAny <<= (sal_Int32)( rOrientation * 100.0 );
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotateAngle"), aAny );
-}
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::ImplSetLineBundle()
-{
-    uno::Any            aAny;
-    drawing::LineStyle  eLS;
-
-    sal_uInt32          nLineColor;
-    LineType            eLineType;
-    double              fLineWidth;
-
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_LINECOLOR )
-        nLineColor = mpCGM->pElement->pLineBundle->GetColor();
-    else
-        nLineColor = mpCGM->pElement->aLineBundle.GetColor();
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_LINETYPE )
-        eLineType = mpCGM->pElement->pLineBundle->eLineType;
-    else
-        eLineType = mpCGM->pElement->aLineBundle.eLineType;
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_LINEWIDTH )
-        fLineWidth = mpCGM->pElement->pLineBundle->nLineWidth;
-    else
-        fLineWidth = mpCGM->pElement->aLineBundle.nLineWidth;
-
-    aAny <<= (sal_Int32)nLineColor;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
-
-    aAny <<= (sal_Int32)fLineWidth;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
-
-    switch( eLineType )
-    {
-        case LT_NONE :
-            eLS = drawing::LineStyle_NONE;
-        break;
-        case LT_DASH :
-        case LT_DOT :
-        case LT_DASHDOT :
-        case LT_DOTDOTSPACE :
-        case LT_LONGDASH :
-        case LT_DASHDASHDOT :
-            eLS = drawing::LineStyle_DASH;
-        break;
-        case LT_SOLID :
-        default:
-            eLS = drawing::LineStyle_SOLID;
-        break;
-    }
-    aAny <<= eLS;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineStyle"), aAny );
-    if ( eLS == drawing::LineStyle_DASH )
-    {
-        drawing::LineDash aLineDash( drawing::DashStyle_RECTRELATIVE, 1, 50, 3, 33, 100 );
-        aAny <<= aLineDash;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineDash"), aAny );
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::ImplSetFillBundle()
-{
-
-    uno::Any                aAny;
-    drawing::LineStyle      eLS;
-    drawing::FillStyle      eFS;
-
-    sal_uInt32              nEdgeColor = 0;
-    EdgeType                eEdgeType;
-    double                  fEdgeWidth = 0;
-
-    sal_uInt32              nFillColor;
-    FillInteriorStyle       eFillStyle;
-    long                    nPatternIndex;
-    sal_uInt32              nHatchIndex;
-
-    if ( mpCGM->pElement->eEdgeVisibility == EV_ON )
-    {
-        if ( mpCGM->pElement->nAspectSourceFlags & ASF_EDGETYPE )
-            eEdgeType = mpCGM->pElement->pEdgeBundle->eEdgeType;
-        else
-            eEdgeType = mpCGM->pElement->aEdgeBundle.eEdgeType;
-        if ( mpCGM->pElement->nAspectSourceFlags & ASF_EDGEWIDTH )
-            fEdgeWidth = mpCGM->pElement->pEdgeBundle->nEdgeWidth;
-        else
-            fEdgeWidth = mpCGM->pElement->aEdgeBundle.nEdgeWidth;
-        if ( mpCGM->pElement->nAspectSourceFlags & ASF_EDGECOLOR )
-            nEdgeColor = mpCGM->pElement->pEdgeBundle->GetColor();
-        else
-            nEdgeColor = mpCGM->pElement->aEdgeBundle.GetColor();
-    }
-    else
-        eEdgeType = ET_NONE;
-
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_FILLINTERIORSTYLE )
-        eFillStyle = mpCGM->pElement->pFillBundle->eFillInteriorStyle;
-    else
-        eFillStyle = mpCGM->pElement->aFillBundle.eFillInteriorStyle;
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_FILLCOLOR )
-        nFillColor = mpCGM->pElement->pFillBundle->GetColor();
-    else
-        nFillColor = mpCGM->pElement->aFillBundle.GetColor();
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_HATCHINDEX )
-        nHatchIndex = (sal_uInt32)mpCGM->pElement->pFillBundle->nFillHatchIndex;
-    else
-        nHatchIndex = (sal_uInt32)mpCGM->pElement->aFillBundle.nFillHatchIndex;
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_PATTERNINDEX )
-        nPatternIndex = mpCGM->pElement->pFillBundle->nFillPatternIndex;
-    else
-        nPatternIndex = mpCGM->pElement->aFillBundle.nFillPatternIndex;
-
-    aAny <<= (sal_Int32)nFillColor;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillColor"), aAny );
-
-    switch ( eFillStyle )
-    {
-        case FIS_HATCH   :
-        {
-            if ( nHatchIndex == 0 )
-                eFS = drawing::FillStyle_NONE;
-            else
-                eFS = drawing::FillStyle_HATCH;
-        }
-        break;
-        case FIS_PATTERN :
-        case FIS_SOLID :
-        {
-            eFS = drawing::FillStyle_SOLID;
-        }
-        break;
-
-        case FIS_GEOPATTERN :
-        {
-            if ( mpCGM->pElement->eTransparency == T_ON )
-                nFillColor = mpCGM->pElement->nAuxiliaryColor;
-            eFS = drawing::FillStyle_NONE;
-        }
-        break;
-
-        case FIS_INTERPOLATED :
-        case FIS_GRADIENT :
-        {
-            eFS = drawing::FillStyle_GRADIENT;
-        }
-        break;
-
-        case FIS_HOLLOW :
-        case FIS_EMPTY :
-        default:
-        {
-            eFS = drawing::FillStyle_NONE;
-        }
-    }
-
-    if ( mpCGM->mnAct4PostReset & ACT4_GRADIENT_ACTION )
-        eFS = drawing::FillStyle_GRADIENT;
-
-    if ( eFS == drawing::FillStyle_GRADIENT )
-    {
-        aAny <<= *mpGradient;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillGradient"), aAny );
-    }
-    aAny <<= eFS;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), aAny );
-
-    eLS = drawing::LineStyle_NONE;
-    if ( eFillStyle == FIS_HOLLOW )
-    {
-        eLS = drawing::LineStyle_SOLID;
-        aAny <<= (sal_Int32)nFillColor;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
-        aAny <<= (sal_Int32)0;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
-    }
-    else if ( eEdgeType != ET_NONE )
-    {
-        aAny <<= (sal_Int32)nEdgeColor;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
-
-        aAny <<= (sal_Int32)fEdgeWidth;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
-
-        switch( eEdgeType )
-        {
-            case ET_DASH :
-            case ET_DOT :
-            case ET_DASHDOT :
-            case ET_DASHDOTDOT :
-            case ET_DOTDOTSPACE :
-            case ET_LONGDASH :
-            case ET_DASHDASHDOT :
-//          {
-//              eLS = LineStyle_DASH;
-//              aAny.setValue( &eLS, ::getCppuType((const drawing::LineStyle*)0) );
-//              maXPropSet->setPropertyValue( L"LineStyle", aAny );
-//              drawing::LineDash   aLineDash( DashStyle_RECTRELATIVE, 1, 160, 1, 160, 190 );
-//              aAny.setValue( &aLineDash, ::getCppuType((const drawing::LineDash*)0) );
-//              maXPropSet->setPropertyValue( L"DashStyle", aAny );
-//          }
-//          break;
-            default:            // case ET_SOLID :
-            {
-                eLS = drawing::LineStyle_SOLID;
-            }
-            break;
-        }
-    }
-
-    aAny <<= eLS;
-    maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineStyle"), aAny );
-
-    if ( eFS == drawing::FillStyle_HATCH )
-    {
-        drawing::Hatch aHatch;
-
-        if ( mpCGM->pElement->nAspectSourceFlags & ASF_LINECOLOR )
-            aHatch.Color = nFillColor;
-        else
-            aHatch.Color = nFillColor;
-        HatchEntry*     pHatchEntry = (HatchEntry*)mpCGM->pElement->aHatchTable.Get( nHatchIndex );
-        if ( pHatchEntry )
-        {
-            switch ( pHatchEntry->HatchStyle )
-            {
-            case 0 : aHatch.Style = drawing::HatchStyle_SINGLE; break;
-            case 1 : aHatch.Style = drawing::HatchStyle_DOUBLE; break;
-            case 2 : aHatch.Style = drawing::HatchStyle_TRIPLE; break;
-            }
-            aHatch.Distance = pHatchEntry->HatchDistance;
-            aHatch.Angle = pHatchEntry->HatchAngle;
-        }
-        else
-        {
-            aHatch.Style = drawing::HatchStyle_TRIPLE;
-            aHatch.Distance = 10 * ( nHatchIndex & 0x1f ) | 100;
-            aHatch.Angle = 15 * ( ( nHatchIndex & 0x1f ) - 5 );
-        }
-        aAny <<= aHatch;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillHatch"), aAny );
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XPropertySet > & rProperty )
-{
-    uno::Any        aAny;
-    TextPrecision   eTextPrecision;
-    sal_uInt32      nTextFontIndex;
-    sal_uInt32      nTextColor;
-    double          fCharacterExpansion;
-    double          fCharacterSpacing;
-
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTFONTINDEX )
-        nTextFontIndex = mpCGM->pElement->pTextBundle->nTextFontIndex;
-    else
-        nTextFontIndex = mpCGM->pElement->aTextBundle.nTextFontIndex;
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTPRECISION )
-        eTextPrecision = mpCGM->pElement->pTextBundle->eTextPrecision;
-    else
-        eTextPrecision = mpCGM->pElement->aTextBundle.eTextPrecision;
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_CHARACTEREXPANSION )
-        fCharacterExpansion = mpCGM->pElement->pTextBundle->nCharacterExpansion;
-    else
-        fCharacterExpansion = mpCGM->pElement->aTextBundle.nCharacterExpansion;
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_CHARACTERSPACING )
-        fCharacterSpacing = mpCGM->pElement->pTextBundle->nCharacterSpacing;
-    else
-        fCharacterSpacing = mpCGM->pElement->aTextBundle.nCharacterSpacing;
-    if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTCOLOR )
-        nTextColor = mpCGM->pElement->pTextBundle->GetColor();
-    else
-        nTextColor = mpCGM->pElement->aTextBundle.GetColor();
-
-    aAny <<= (sal_Int32)nTextColor;
-    rProperty->setPropertyValue( rtl::OUString::createFromAscii("CharColor"), aAny );
-
-    sal_uInt32 nFontType = 0;
-    awt::FontDescriptor aFontDescriptor;
-    FontEntry* pFontEntry = mpCGM->pElement->aFontList.GetFontEntry( nTextFontIndex );
-    if ( pFontEntry )
-    {
-        nFontType = pFontEntry->nFontType;
-        aFontDescriptor.Name = String::CreateFromAscii( (char*)pFontEntry->pFontName );
-    }
-    aFontDescriptor.Height = ( sal_Int16 )( ( mpCGM->pElement->nCharacterHeight * (double)1.50 ) );
-    if ( nFontType & 1 )
-        aFontDescriptor.Slant = awt::FontSlant_ITALIC;
-    if ( nFontType & 2 )
-        aFontDescriptor.Weight = awt::FontWeight::BOLD;
-    else
-        aFontDescriptor.Weight = awt::FontWeight::NORMAL;
-
-    if ( mpCGM->pElement->eUnderlineMode != UM_OFF )
-    {
-        aFontDescriptor.Underline = awt::FontUnderline::SINGLE;
-    }
-    aAny <<= aFontDescriptor;
-    rProperty->setPropertyValue( rtl::OUString::createFromAscii("FontDescriptor"), aAny );
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::InsertPage()
-{
-    if ( mnCurrentPage )    // eine seite ist immer vorhanden, deshalb wird die erste Seite ausgelassen
-    {
-        uno::Reference< drawing::XDrawPage > xPage( maXDrawPages->insertNewByIndex( 0xffff ), uno::UNO_QUERY );
-        maXDrawPage = xPage;
-        if ( ImplInitPage() == sal_False )
-            mpCGM->mbStatus = sal_False;
-    }
-    mnCurrentPage++;
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::BeginGroup()
-{
-    if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL )
-    {
-        mpGroupLevel[ mnGroupLevel ] = maXShapes->getCount();
-    }
-    mnGroupLevel++;
-    mnGroupActCount = mpCGM->mnActCount;
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::EndGroup()
-{
-    if ( mnGroupLevel )     // preserve overflow
-        mnGroupLevel--;
-    if ( mnGroupLevel < CGM_OUTACT_MAX_GROUP_LEVEL )
-    {
-        sal_uInt32 mnFirstIndex = mpGroupLevel[ mnGroupLevel ];
-        if ( mnFirstIndex == 0xffffffff )
-            mnFirstIndex = 0;
-        sal_uInt32 mnCurrentCount = maXShapes->getCount();
-        if ( ( mnCurrentCount - mnFirstIndex ) > 1 )
-        {
-            uno::Reference< drawing::XShapeGrouper > aXShapeGrouper;
-            uno::Any aAny( maXDrawPage->queryInterface( ::getCppuType(((const uno::Reference< drawing::XShapeGrouper >*)0) )));
-            if( aAny >>= aXShapeGrouper )
-            {
-                uno::Reference< drawing::XShapes >  aXShapes;
-//              if ( maXServiceManagerSC->createInstance( L"stardiv.one.drawing.ShapeCollection" )->queryInterface( ::getCppuType((const Reference< drawing::XShapes >*)0), aXShapes ) )
-
-                uno::Reference< drawing::XShape >  aXShapeCollection( maXServiceManagerSC->createInstance( rtl::OUString::createFromAscii("com.sun.star.drawing.ShapeCollection") ), uno::UNO_QUERY );
-                if ( aXShapeCollection.is() )
-                {
-                    aXShapes = uno::Reference< drawing::XShapes >( aXShapeCollection, uno::UNO_QUERY );
-                    if( aXShapes.is() )
-                    {
-                        for ( sal_uInt32 i = mnFirstIndex; i < mnCurrentCount; i++ )
-                        {
-                            uno::Reference< drawing::XShape >  aXShape = *(uno::Reference< drawing::XShape > *)maXShapes->getByIndex( i ).getValue();
-                            if (aXShape.is() )
-                            {
-                                aXShapes->add( aXShape );
-                            }
-                        }
-                    }
-                }
-                uno::Reference< drawing::XShapeGroup >  aXShapeGroup = aXShapeGrouper->group( aXShapes );
-            }
-        }
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::EndGrouping()
-{
-    while ( mnGroupLevel )
-    {
-        EndGroup();
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawRectangle( FloatRect& rFloatRect )
-{
-    if ( mnGroupActCount != ( mpCGM->mnActCount - 1 ) )         // POWERPOINT HACK !!!
-    {
-        if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.RectangleShape") ) )
-        {
-            awt::Size aSize( (long)(rFloatRect.Right - rFloatRect.Left ), (long)(rFloatRect.Bottom-rFloatRect.Top ) );
-            maXShape->setSize( aSize );
-            maXShape->setPosition( awt::Point( (long)rFloatRect.Left, (long)rFloatRect.Top ) );
-            ImplSetFillBundle();
-        }
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation )
-{
-    if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.EllipseShape") ) )
-    {
-        drawing::CircleKind eCircleKind = drawing::CircleKind_FULL;
-        uno::Any aAny( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) );
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleKind"), aAny );
-
-        long nXSize = (long)( rSize.X * 2.0 );      // Merkwuerdigkes Verhalten bei einer awt::Size von 0
-        long nYSize = (long)( rSize.Y * 2.0 );
-        if ( nXSize < 1 )
-            nXSize = 1;
-        if ( nYSize < 1 )
-            nYSize = 1;
-        maXShape->setSize( awt::Size( nXSize, nYSize ) );
-        maXShape->setPosition( awt::Point( (long)( rCenter.X - rSize.X ), (long)( rCenter.Y - rSize.Y ) ) );
-
-        if ( rOrientation != 0 )
-        {
-            ImplSetOrientation( rCenter, rOrientation );
-        }
-        ImplSetFillBundle();
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation,
-            sal_uInt32 nType, double& fStartAngle, double& fEndAngle )
-{
-    if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.EllipseShape") ) )
-    {
-        uno::Any aAny;
-        drawing::CircleKind eCircleKind;
-
-
-        long nXSize = (long)( rSize.X * 2.0 );      // Merkwuerdigkes Verhalten bei einer awt::Size von 0
-        long nYSize = (long)( rSize.Y * 2.0 );
-        if ( nXSize < 1 )
-            nXSize = 1;
-        if ( nYSize < 1 )
-            nYSize = 1;
-
-        maXShape->setSize( awt::Size ( nXSize, nYSize ) );
-
-        if ( rOrientation != 0 )
-        {
-            fStartAngle += rOrientation;
-            if ( fStartAngle >= 360 )
-                fStartAngle -= 360;
-            fEndAngle += rOrientation;
-            if ( fEndAngle >= 360 )
-                fEndAngle -= 360;
-        }
-        switch( nType )
-        {
-            case 0 : eCircleKind = drawing::CircleKind_SECTION; break;
-            case 1 : eCircleKind = drawing::CircleKind_CUT; break;
-            case 2 : eCircleKind = drawing::CircleKind_ARC; break;
-            default : eCircleKind = drawing::CircleKind_FULL; break;
-        }
-        if ( (long)fStartAngle == (long)fEndAngle )
-        {
-            eCircleKind = drawing::CircleKind_FULL;
-            aAny.setValue( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) );
-        }
-        else
-        {
-            aAny.setValue( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleKind"), aAny );
-            aAny <<= (sal_Int32)( (long)( fStartAngle * 100 ) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleStartAngle"), aAny );
-            aAny <<= (sal_Int32)( (long)( fEndAngle * 100 ) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleEndAngle"), aAny );
-        }
-        maXShape->setPosition( awt::Point( (long)( rCenter.X - rSize.X ), (long)( rCenter.Y - rSize.Y ) ) );
-        if ( rOrientation != 0 )
-        {
-            ImplSetOrientation( rCenter, rOrientation );
-        }
-        if ( eCircleKind == drawing::CircleKind_ARC )
-        {
-            ImplSetLineBundle();
-        }
-        else
-        {
-            ImplSetFillBundle();
-            if ( nType == 2 )
-            {
-                ImplSetLineBundle();
-                drawing::FillStyle eFillStyle = drawing::FillStyle_NONE;
-                aAny.setValue( &eFillStyle, ::getCppuType((const drawing::FillStyle*)0) );
-                maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), aAny );
-            }
-        }
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc )
-{
-    if ( pBmpDesc->mbStatus && pBmpDesc->mpBitmap )
-    {
-        FloatPoint aOrigin = pBmpDesc->mnOrigin;
-        double fdx = pBmpDesc->mndx;
-        double fdy = pBmpDesc->mndy;
-
-        sal_uInt32  nMirr = BMP_MIRROR_NONE;
-        if ( pBmpDesc->mbVMirror )
-            nMirr |= BMP_MIRROR_VERT;
-        if ( pBmpDesc->mbHMirror )
-            nMirr |= BMP_MIRROR_HORZ;
-        if ( nMirr != BMP_MIRROR_NONE )
-            pBmpDesc->mpBitmap->Mirror( nMirr );
-
-        mpCGM->ImplMapPoint( aOrigin );
-        mpCGM->ImplMapX( fdx );
-        mpCGM->ImplMapY( fdy );
-
-        if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.GraphicObjectShape") ) )
-        {
-            maXShape->setSize( awt::Size( (long)fdx, (long)fdy ) );
-            maXShape->setPosition( awt::Point( (long)aOrigin.X, (long)aOrigin.Y ) );
-
-            if ( pBmpDesc->mnOrientation != 0 )
-            {
-                ImplSetOrientation( aOrigin, pBmpDesc->mnOrientation );
-            }
-
-            uno::Reference< awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap( BitmapEx( *( pBmpDesc->mpBitmap ) ) ) );
-            uno::Any aAny;
-            aAny <<= xBitmap;
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("GraphicObjectFillBitmap"), aAny );
-
-        }
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawPolygon( Polygon& rPoly )
-{
-    sal_uInt16 nPoints = rPoly.GetSize();
-
-    if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.PolyPolygonShape") ) )
-    {
-        drawing::PointSequenceSequence aRetval;
-
-        // Polygone innerhalb vrobereiten
-        aRetval.realloc( 1 );
-
-        // Zeiger auf aeussere Arrays holen
-        drawing::PointSequence* pOuterSequence = aRetval.getArray();
-
-        // Platz in Arrays schaffen
-        pOuterSequence->realloc((sal_Int32)nPoints);
-
-        // Pointer auf arrays holen
-        awt::Point* pInnerSequence = pOuterSequence->getArray();
-
-        for( sal_uInt16 n = 0; n < nPoints; n++ )
-            *pInnerSequence++ = awt::Point( rPoly[ n ].X(), rPoly[n].Y() );
-
-        uno::Any aParam;
-        aParam <<= aRetval;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam );
-        ImplSetFillBundle();
-    }
-};
-
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly )
-{
-    sal_uInt16 nPoints = rPoly.GetSize();
-
-    if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.PolyLineShape") ) )
-    {
-        drawing::PointSequenceSequence aRetval;
-
-        // Polygone innerhalb vrobereiten
-        aRetval.realloc( 1 );
-
-        // Zeiger auf aeussere Arrays holen
-        drawing::PointSequence* pOuterSequence = aRetval.getArray();
-
-        // Platz in Arrays schaffen
-        pOuterSequence->realloc((sal_Int32)nPoints);
-
-        // Pointer auf arrays holen
-        awt::Point* pInnerSequence = pOuterSequence->getArray();
-
-        for( sal_uInt16 n = 0; n < nPoints; n++ )
-            *pInnerSequence++ = awt::Point( rPoly[ n ].X(), rPoly[n].Y() );
-
-        uno::Any aParam;
-        aParam <<= aRetval;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam );
-        ImplSetLineBundle();
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon )
-{
-    USHORT nPoints = rPolygon.GetSize();
-    if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.OpenBezierShape") ) )
-    {
-        drawing::PolyPolygonBezierCoords aRetval;
-
-        aRetval.Coordinates.realloc( 1 );
-        aRetval.Flags.realloc( 1 );
-
-        // Zeiger auf aeussere Arrays holen
-        drawing::PointSequence* pOuterSequence = aRetval.Coordinates.getArray();
-        drawing::FlagSequence* pOuterFlags = aRetval.Flags.getArray();
-
-        // Platz in Arrays schaffen
-        pOuterSequence->realloc( nPoints );
-        pOuterFlags->realloc( nPoints );
-
-        awt::Point* pInnerSequence = pOuterSequence->getArray();
-        drawing::PolygonFlags* pInnerFlags = pOuterFlags->getArray();
-
-        for( USHORT i = 0; i < nPoints; i++ )
-        {
-            *pInnerSequence++ = awt::Point( rPolygon[ i ].X(), rPolygon[ i ].Y() );
-            *pInnerFlags++ = (drawing::PolygonFlags)rPolygon.GetFlags( i );
-        }
-        uno::Any aParam;
-        aParam <<= aRetval;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygonBezier"), aParam );
-        ImplSetLineBundle();
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon )
-{
-    sal_uInt32 nNumPolys = rPolyPolygon.Count();
-    if ( nNumPolys && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.ClosedBezierShape") ) )
-    {
-        drawing::PolyPolygonBezierCoords aRetval;
-
-        // Polygone innerhalb vrobereiten
-        aRetval.Coordinates.realloc((sal_Int32)nNumPolys);
-        aRetval.Flags.realloc((sal_Int32)nNumPolys);
-
-        // Zeiger auf aeussere Arrays holen
-        drawing::PointSequence* pOuterSequence = aRetval.Coordinates.getArray();
-        drawing::FlagSequence* pOuterFlags = aRetval.Flags.getArray();
-
-        for( sal_uInt16 a = 0; a < nNumPolys; a++ )
-        {
-            Polygon aPolygon( rPolyPolygon.GetObject( a ) );
-            sal_uInt32 nNumPoints = aPolygon.GetSize();
-
-            // Platz in Arrays schaffen
-            pOuterSequence->realloc((sal_Int32)nNumPoints);
-            pOuterFlags->realloc((sal_Int32)nNumPoints);
-
-            // Pointer auf arrays holen
-            awt::Point* pInnerSequence = pOuterSequence->getArray();
-            drawing::PolygonFlags* pInnerFlags = pOuterFlags->getArray();
-
-            for( sal_uInt16 b = 0; b < nNumPoints; b++ )
-            {
-                *pInnerSequence++ = awt::Point( aPolygon.GetPoint( b ).X(), aPolygon.GetPoint( b ).Y() ) ;
-                *pInnerFlags++ = (drawing::PolygonFlags)aPolygon.GetFlags( b );
-            }
-            pOuterSequence++;
-            pOuterFlags++;
-        }
-        uno::Any aParam;
-        aParam <<= aRetval;
-        maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygonBezier"), aParam);
-        ImplSetFillBundle();
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, char* pString, sal_uInt32 /*nSize*/, FinalFlag eFlag )
-{
-    if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.TextShape") ) )
-    {
-        uno::Any    aAny;
-        long    nWidth = rTextSize.Width;
-        long    nHeight = rTextSize.Height;
-
-        awt::Point aTextPos( rTextPos );
-        switch ( mpCGM->pElement->eTextAlignmentV )
-        {
-            case TAV_HALF :
-            {
-                aTextPos.Y -= static_cast<sal_Int32>( ( mpCGM->pElement->nCharacterHeight * 1.5 ) / 2 );
-            }
-            break;
-
-            case TAV_BASE :
-            case TAV_BOTTOM :
-            case TAV_NORMAL :
-                aTextPos.Y -= static_cast<sal_Int32>( mpCGM->pElement->nCharacterHeight * 1.5 );
-            case TAV_TOP :
-                break;
-            case TAV_CAP:
-            case TAV_CONT:
-                break;  // -Wall these two were not here.
-        }
-
-        if ( nWidth < 0 )
-        {
-            nWidth = -nWidth;
-        }
-        else if ( nWidth == 0 )
-        {
-            nWidth = -1;
-        }
-        if ( nHeight < 0 )
-        {
-            nHeight = -nHeight;
-        }
-        else if ( nHeight == 0 )
-        {
-            nHeight = -1;
-        }
-        maXShape->setPosition( aTextPos );
-        maXShape->setSize( awt::Size( nWidth, nHeight ) );
-        double nX = mpCGM->pElement->nCharacterOrientation[ 2 ];
-        double nY = mpCGM->pElement->nCharacterOrientation[ 3 ];
-        double nOrientation = acos( nX / sqrt( nX * nX + nY * nY ) ) * 57.29577951308;
-        if ( nY < 0 )
-            nOrientation = 360 - nOrientation;
-
-        if ( nOrientation )
-        {
-            aAny <<= (sal_Int32)( aTextPos.X );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointX"), aAny );
-            aAny <<= (sal_Int32)( aTextPos.Y + nHeight );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointY"), aAny );
-            aAny <<= (sal_Int32)( (sal_Int32)( nOrientation * 100 ) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotateAngle"), aAny );
-        }
-        if ( nWidth == -1 )
-        {
-            sal_Bool bTrue( sal_True );
-            aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0 ));
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextAutoGrowWidth"), aAny );
-
-            drawing::TextAdjust eTextAdjust;
-            switch ( mpCGM->pElement->eTextAlignmentH )
-            {
-                case TAH_RIGHT :
-                    eTextAdjust = drawing::TextAdjust_RIGHT;
-                break;
-                case TAH_LEFT :
-                case TAH_CONT :
-                case TAH_NORMAL :
-                    eTextAdjust = drawing::TextAdjust_LEFT;
-                break;
-                case TAH_CENTER :
-                    eTextAdjust = drawing::TextAdjust_CENTER;
-                break;
-            }
-            aAny <<= eTextAdjust;
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextHorizontalAdjust"), aAny );
-        }
-        if ( nHeight == -1 )
-        {
-            sal_Bool bTrue = sal_True;
-            aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0) );
-            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextAutoGrowHeight"), aAny );
-        }
-        uno::Reference< text::XText >  xText;
-        uno::Any aFirstQuery( maXShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0) ));
-        if( aFirstQuery >>= xText )
-        {
-            String aStr( String::CreateFromAscii( pString ) );
-
-            uno::Reference< text::XTextCursor >  aXTextCursor( xText->createTextCursor() );
-            {
-                aXTextCursor->gotoEnd( sal_False );
-                uno::Reference< text::XTextRange >  aCursorText;
-                uno::Any aSecondQuery( aXTextCursor->queryInterface( ::getCppuType((const uno::Reference< text::XTextRange >*)0) ));
-                if ( aSecondQuery >>= aCursorText )
-                {
-                    uno::Reference< beans::XPropertySet >  aCursorPropSet;
-
-                    uno::Any aQuery( aCursorText->queryInterface( ::getCppuType((const uno::Reference< beans::XPropertySet >*)0) ));
-                    if( aQuery >>= aCursorPropSet )
-                    {
-                        if ( nWidth != -1 )     // paragraph adjusting in a valid textbox ?
-                        {
-                            switch ( mpCGM->pElement->eTextAlignmentH )
-                            {
-                                case TAH_RIGHT :
-                                    aAny <<= (sal_Int16)style::HorizontalAlignment_RIGHT;
-                                break;
-                                case TAH_LEFT :
-                                case TAH_CONT :
-                                case TAH_NORMAL :
-                                    aAny <<= (sal_Int16)style::HorizontalAlignment_LEFT;
-                                break;
-                                case TAH_CENTER :
-                                    aAny <<= (sal_Int16)style::HorizontalAlignment_CENTER;
-                                break;
-                            }
-                            aCursorPropSet->setPropertyValue( rtl::OUString::createFromAscii("ParaAdjust"), aAny );
-                        }
-                        if ( nWidth > 0 && nHeight > 0 )    // restricted text
-                        {
-                            sal_Bool bTrue = sal_True;
-                            aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0));
-                            maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextFitToSize"), aAny );
-                        }
-                        aCursorText->setString( aStr );
-                        aXTextCursor->gotoEnd( sal_True );
-                        ImplSetTextBundle( aCursorPropSet );
-                    }
-                }
-            }
-        }
-        if ( eFlag == FF_NOT_FINAL )
-        {
-            nFinalTextCount = maXShapes->getCount();
-        }
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::AppendText( char* pString, sal_uInt32 /*nSize*/, FinalFlag /*eFlag*/ )
-{
-    if ( nFinalTextCount )
-    {
-        uno::Reference< drawing::XShape >  aShape = *(uno::Reference< drawing::XShape > *)maXShapes->getByIndex( nFinalTextCount - 1 ).getValue();
-        if ( aShape.is() )
-        {
-            uno::Reference< text::XText >  xText;
-            uno::Any aFirstQuery(  aShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0)) );
-            if( aFirstQuery >>= xText )
-            {
-                String aStr( String::CreateFromAscii( pString ) );
-
-                uno::Reference< text::XTextCursor >  aXTextCursor( xText->createTextCursor() );
-                if ( aXTextCursor.is() )
-                {
-                    aXTextCursor->gotoEnd( sal_False );
-                    uno::Reference< text::XTextRange >  aCursorText;
-                    uno::Any aSecondQuery(aXTextCursor->queryInterface( ::getCppuType((const uno::Reference< text::XTextRange >*)0) ));
-                    if ( aSecondQuery >>= aCursorText )
-                    {
-                        uno::Reference< beans::XPropertySet >  aPropSet;
-                        uno::Any aQuery(aCursorText->queryInterface( ::getCppuType((const uno::Reference< beans::XPropertySet >*)0) ));
-                        if( aQuery >>= aPropSet )
-                        {
-                            aCursorText->setString( aStr );
-                            aXTextCursor->gotoEnd( sal_True );
-                            ImplSetTextBundle( aPropSet );
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-// ---------------------------------------------------------------
-// nCount != 0 -> Append Text
-sal_uInt32 CGMImpressOutAct::DrawText( TextEntry* /*pTextEntry*/, NodeFrameSet& /*rNodeFrameSet*/, sal_uInt32 /*nObjCount*/ )
-{
-
-return 0;
-
-/*
-    uno::Reference< drawing::XShape >  aShape;
-
-    if ( nObjCount )
-    {
-         aShape = (drawing::XShape*) maXShapes->getElementByIndex( nObjCount - 1 )->queryInterface( ::getCppuType((const Reference< drawing::XShape >*)0) );
-    }
-    else
-    {
-        aShape = maXShapes->insertShape( maXShapeFactory->createShape( L"ShapeText", rNodeFrameSet.nSize ), rNodeFrameSet.nTopLeft );
-    }
-    if ( aShape.is() )
-    {
-        uno::Reference< text::XText >  xText = (text::XText*)aShape->queryInterface( ::getCppuType((const Reference< text::XText >*)0) );
-        if ( xText.is() )
-        {
-            uno::Reference< text::XTextCursor >  aXTextCursor = (text::XTextCursor*)xText->createTextCursor()->queryInterface( ::getCppuType((const Reference< text::XTextCursor >*)0) );
-            if ( aXTextCursor.is() )
-            {
-                uno::Any    aAny;
-                sal_uInt32  nTextOfs = 0;
-                TextAttribute* pTAttr = pTextEntry->pAttribute;
-                do
-                {
-                    if ( pTAttr->nTextAttribSize > 0.3 )    // is text readable
-                    {
-                        aXTextCursor->gotoEnd( sal_False );
-                        char nPushedChar = pTextEntry->pText[ nTextOfs + pTAttr->nTextAttribCount ];
-                        pTextEntry->pText[ nTextOfs + pTAttr->nTextAttribCount ] = 0;
-                        UString aStr( StringToOUString( pTextEntry->pText +  nTextOfs, CHARSET_SYSTEM ) );
-
-                        uno::Reference< text::XText >  aCursorText = (text::XText*)aXTextCursor->queryInterface( ::getCppuType((const Reference< text::XText >*)0) );
-                        if ( aCursorText.is() )
-                        {
-                            uno::Reference< beans::XPropertySet >  aPropSet = (beans::XPropertySet*)aCursorText->queryInterface( ::getCppuType((const Reference< beans::XPropertySet >*)0) );
-                            if ( aPropSet.is() )
-                            {
-                                if ( pTextEntry->nRowOrLineNum )
-                                {
-                                    uno::Reference< XControlCharacterInsertable >  aCRef = (XControlCharacterInsertable*)aXTextCursor->queryInterface( ::getCppuType((const Reference< XControlCharacterInsertable >*)0) );
-                                    if ( aCRef.is() )
-                                    {
-                                        aCRef->insertControlCharacter( TEXTCONTROLCHAR_PARAGRAPH_BREAK );
-                                    }
-                                }
-                                aCursorText->setText( aStr );
-                                aXTextCursor->gotoEnd( sal_True );
-                                double nSize = mpCGM->mnOutdx;
-                                if ( mpCGM->mnOutdx < mpCGM->mnOutdy )
-                                    nSize = mpCGM->mnOutdy;
-                                nSize = ( nSize * (double)pTAttr->nTextAttribSize * (double)1.5 ) / 100;
-
-                                aAny <<= (sal_Int32)( (sal_Int32)nSize );
-                                aPropSet->setPropertyValue( L"CharHeight", aAny );
-
-                                sal_uInt32 nTextColor = pTAttr->nTextColorIndex;
-                                if ( nTextColor == 0xff )
-                                {
-                                    nTextColor = ( pTAttr->nTextColorBlue << 16 ) + ( pTAttr->nTextColorGreen << 8 ) + pTAttr->nTextColorRed;
-                                }
-                                else
-                                {
-                                    nTextColor = mpCGM->pElement->aColorTable[ nTextColor ];
-                                }
-
-                                sal_uInt32 nFontType = 0;
-
-                                if (  pTAttr->nTextFontType == 0xff )
-                                {
-                                    FontEntry* pFontEntry = mpCGM->pElement->aFontList.GetFontEntry( pTAttr->nTextFontFamily );
-                                    if ( pFontEntry )
-                                    {
-                                        nFontType = pFontEntry->nFontType;
-                                        if ( mpCGM->pElement->nAspectSourceFlags & ASF_TEXTCOLOR )
-                                            nTextColor = mpCGM->pElement->pTextBundle->GetColor();
-                                        else
-                                            nTextColor = mpCGM->pElement->aTextBundle.GetColor();
-                                    }
-                                    FontItalic eFontItalic = ITALIC_NONE;
-                                    if ( nFontType & 1 )
-                                        eFontItalic = ITALIC_NORMAL;
-                                    aAny.setValue( &eFontItalic, ::getCppuType((const FontItalic*)0) );
-                                    aPropSet->setPropertyValue( L"CharPosture", aAny );
-                                }
-                                aAny <<= (sal_Int32)( (sal_Int32)nTextColor );
-                                aPropSet->setPropertyValue( L"CharColor", aAny );
-
-                                awt::FontWeight eFontWeight = WEIGHT_NORMAL;
-                                if ( nFontType & 2 )
-                                    eFontWeight = WEIGHT_BOLD;
-                                aAny.setValue( &eFontWeight, ::getCppuType((const awt::FontWeight*)0) );
-                                aPropSet->setPropertyValue( L"CharWeight", aAny );
-
-                                if ( pTAttr->nTextAttribBits & 0x4000 )
-                                {
-                                    awt::FontUnderline eUnderline = UNDERLINE_SINGLE;
-                                    aAny.setValue( &eUnderline, ::getCppuType((const awt::FontUnderline*)0) );
-                                    aPropSet->setPropertyValue( L"CharUnderline", aAny );
-                                }
-                            }
-                        }
-                        pTextEntry->pText[ nTextOfs + pTAttr->nTextAttribCount ] = nPushedChar;
-                    }
-                    nTextOfs += pTAttr->nTextAttribCount;
-                }
-                while ( ( ( pTAttr = pTAttr->pNextAttribute ) != NULL ) );
-            }
-        }
-    }
-    return ( nObjCount ) ? nObjCount : maXShapes->getCount();
-*/
-}
-
-// ---------------------------------------------------------------
-
-void CGMImpressOutAct::DrawChart()
-{
-}
diff --git a/goodies/source/filter.vcl/icgm/bitmap.cxx b/goodies/source/filter.vcl/icgm/bitmap.cxx
deleted file mode 100644
index ac2e0929a0ab..000000000000
--- a/goodies/source/filter.vcl/icgm/bitmap.cxx
+++ /dev/null
@@ -1,413 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: bitmap.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include "main.hxx"
-
-// ---------------------------------------------------------------
-
-CGMBitmap::CGMBitmap( CGM& rCGM ) :
-    mpCGM                           ( &rCGM ),
-    pCGMBitmapDescriptor            ( new CGMBitmapDescriptor )
-{
-    ImplGetBitmap( *pCGMBitmapDescriptor );
-};
-
-// ---------------------------------------------------------------
-
-CGMBitmap::~CGMBitmap()
-{
-    delete pCGMBitmapDescriptor;
-}
-
-// ---------------------------------------------------------------
-
-void CGMBitmap::ImplGetBitmap( CGMBitmapDescriptor& rDesc )
-{
-    rDesc.mbStatus = sal_True;
-    long    nx, ny, nxC, nxCount, nyCount;
-
-    if ( ImplGetDimensions( rDesc ) && rDesc.mpBuf )
-    {
-        if ( ( rDesc.mpBitmap = new Bitmap( Size( rDesc.mnX, rDesc.mnY ), (sal_uInt16)rDesc.mnDstBitsPerPixel ) ) != NULL )
-        {
-            if ( ( rDesc.mpAcc = rDesc.mpBitmap->AcquireWriteAccess() ) != NULL )
-            {
-
-                // the picture may either be read from left to right or right to left, from top to bottom ...
-
-                nxCount = rDesc.mnX + 1;    // +1 because we are using prefix decreasing
-                nyCount = rDesc.mnY + 1;
-
-                switch ( rDesc.mnDstBitsPerPixel )
-                {
-                    case 1 :
-                    {
-                        if ( rDesc.mnLocalColorPrecision == 1 )
-                            ImplSetCurrentPalette( rDesc );
-                        else
-                        {
-                            rDesc.mpAcc->SetPaletteEntryCount( 2 );
-                            rDesc.mpAcc->SetPaletteColor( 0, BMCOL( mpCGM->pElement->nBackGroundColor ) );
-                            rDesc.mpAcc->SetPaletteColor( 1,
-                                ( mpCGM->pElement->nAspectSourceFlags & ASF_FILLINTERIORSTYLE )
-                                    ? BMCOL( mpCGM->pElement->pFillBundle->GetColor() )
-                                        : BMCOL( mpCGM->pElement->aFillBundle.GetColor() ) ) ;
-                        }
-                        for ( ny = 0; --nyCount ; ny++, rDesc.mpBuf += rDesc.mnScanSize )
-                        {
-                            nxC = nxCount;
-                            for ( nx = 0; --nxC; nx++ )
-                            {   // this is not fast, but a one bit/pixel format is rarely used
-                                rDesc.mpAcc->SetPixel( ny, nx, (sal_Int8)( (*( rDesc.mpBuf + ( nx >> 3 ) ) >> ( ( nx & 7 ) ^ 7 ) ) ) & 1 );
-                            }
-                        }
-                    }
-                    break;
-
-                    case 2 :
-                    {
-                        ImplSetCurrentPalette( rDesc );
-                        for ( ny = 0; --nyCount; ny++, rDesc.mpBuf += rDesc.mnScanSize )
-                        {
-                            nxC = nxCount;
-                            for ( nx = 0; --nxC; nx++ )
-                            {   // this is not fast, but a two bits/pixel format is rarely used
-                                rDesc.mpAcc->SetPixel( ny, nx, (sal_Int8)( (*( rDesc.mpBuf + ( nx >> 2 ) ) >> ( ( ( nx & 3 ) ^ 3 ) << 1 ) ) ) & 3 );
-                            }
-                        }
-                    }
-                    break;
-
-                    case 4 :
-                    {
-                        ImplSetCurrentPalette( rDesc );
-                        for ( ny = 0; --nyCount; ny++, rDesc.mpBuf += rDesc.mnScanSize )
-                        {
-                            nxC = nxCount;
-                            sal_Int8  nDat;
-                            sal_uInt8* pTemp = rDesc.mpBuf;
-                            for ( nx = 0; --nxC; nx++ )
-                            {
-                                nDat = *pTemp++;
-                                rDesc.mpAcc->SetPixel( ny, nx, (sal_Int8)( nDat >> 4 ) );
-                                if ( --nxC )
-                                {
-                                    nx ++;
-                                    rDesc.mpAcc->SetPixel( ny, nx, (sal_Int8)( nDat & 15 ) );
-                                }
-                                else
-                                    break;
-                            }
-                        }
-                    }
-                    break;
-
-                    case 8 :
-                    {
-                        ImplSetCurrentPalette( rDesc );
-                        for ( ny = 0; --nyCount; ny++, rDesc.mpBuf += rDesc.mnScanSize )
-                        {
-                            sal_uInt8* pTemp = rDesc.mpBuf;
-                            nxC = nxCount;
-                            for ( nx = 0; --nxC; nx++ )
-                            {
-                                rDesc.mpAcc->SetPixel( ny, nx, (sal_Int8)( *pTemp++ ) );
-                            }
-                        }
-                    }
-                    break;
-
-                    case 24 :
-                    {
-                        {
-                            BitmapColor aBitmapColor;
-                            for ( ny = 0; --nyCount; ny++, rDesc.mpBuf += rDesc.mnScanSize )
-                            {
-                                sal_uInt8* pTemp = rDesc.mpBuf;
-                                nxC = nxCount;
-                                for ( nx = 0; --nxC; nx++ )
-                                {
-                                    aBitmapColor.SetRed( (sal_Int8)*pTemp++ );
-                                    aBitmapColor.SetGreen( (sal_Int8)*pTemp++ );
-                                    aBitmapColor.SetBlue( (sal_Int8)*pTemp++ );
-                                    rDesc.mpAcc->SetPixel( ny, nx, aBitmapColor );
-                                }
-                            }
-                        }
-                    }
-                    break;
-                };
-                double nX = rDesc.mnR.X - rDesc.mnQ.X;
-                double nY = rDesc.mnR.Y - rDesc.mnQ.Y;
-
-                rDesc.mndy = sqrt( nX * nX + nY * nY );
-
-                nX = rDesc.mnR.X - rDesc.mnP.X;
-                nY = rDesc.mnR.Y - rDesc.mnP.Y;
-
-                rDesc.mndx = sqrt( nX * nX + nY * nY );
-
-                nX = rDesc.mnR.X - rDesc.mnP.X;
-                nY = rDesc.mnR.Y - rDesc.mnP.Y;
-
-                rDesc.mnOrientation = acos( nX / sqrt( nX * nX + nY * nY ) ) * 57.29577951308;
-                if ( nY > 0 )
-                    rDesc.mnOrientation = 360 - rDesc.mnOrientation;
-
-                nX = rDesc.mnQ.X - rDesc.mnR.X;
-                nY = rDesc.mnQ.Y - rDesc.mnR.Y;
-
-                double fAngle = 0.01745329251994 * ( 360 - rDesc.mnOrientation );
-                double fSin = sin(fAngle);
-                double fCos = cos(fAngle);
-                nX = fCos * nX + fSin * nY;
-                nY = -( fSin * nX - fCos * nY );
-
-                fAngle = acos( nX / sqrt( nX * nX + nY * nY ) ) * 57.29577951308;
-                if ( nY > 0 )
-                    fAngle = 360 - fAngle;
-
-                if ( fAngle > 180 )                 // wird das bild nach oben oder unten aufgebaut ?
-                {
-                    rDesc.mnOrigin = rDesc.mnP;
-                }
-                else
-                {
-                    rDesc.mbVMirror = sal_True;
-                    rDesc.mnOrigin = rDesc.mnP;
-                    rDesc.mnOrigin.X += rDesc.mnQ.X - rDesc.mnR.X;
-                    rDesc.mnOrigin.Y += rDesc.mnQ.Y - rDesc.mnR.Y;
-                }
-            }
-            else
-                rDesc.mbStatus = sal_False;
-        }
-        else
-            rDesc.mbStatus = sal_False;
-    }
-    else
-        rDesc.mbStatus = sal_False;
-
-    if ( rDesc.mpAcc )
-    {
-        rDesc.mpBitmap->ReleaseAccess( rDesc.mpAcc );
-        rDesc.mpAcc = NULL;
-    }
-    if ( rDesc.mbStatus == sal_False )
-    {
-        if ( rDesc.mpBitmap )
-        {
-            delete rDesc.mpBitmap;
-            rDesc.mpBitmap = NULL;
-        }
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGMBitmap::ImplSetCurrentPalette( CGMBitmapDescriptor& rDesc )
-{
-    sal_uInt16 nColors = sal::static_int_cast< sal_uInt16 >(
-        1 << rDesc.mnDstBitsPerPixel);
-    rDesc.mpAcc->SetPaletteEntryCount( nColors );
-    for ( sal_uInt16 i = 0; i < nColors; i++ )
-    {
-        rDesc.mpAcc->SetPaletteColor( i, BMCOL( mpCGM->pElement->aLatestColorTable[ i ] ) );
-    }
-}
-
-// ---------------------------------------------------------------
-
-sal_Bool CGMBitmap::ImplGetDimensions( CGMBitmapDescriptor& rDesc )
-{
-    mpCGM->ImplGetPoint( rDesc.mnP );           // parallelogram    p < - > r
-    mpCGM->ImplGetPoint( rDesc.mnQ );           //                          |
-    mpCGM->ImplGetPoint( rDesc.mnR );           //                          q
-    sal_uInt32 nPrecision = mpCGM->pElement->nIntegerPrecision;
-    rDesc.mnX = mpCGM->ImplGetUI( nPrecision );
-    rDesc.mnY = mpCGM->ImplGetUI( nPrecision );
-    rDesc.mnLocalColorPrecision = mpCGM->ImplGetI( nPrecision );
-    rDesc.mnScanSize = 0;
-    switch( rDesc.mnLocalColorPrecision )
-    {
-        case 0x80000001 :                       // monochrome ( bit = 0->backgroundcolor )
-        case 0 :                                //              bit = 1->fillcolor
-            rDesc.mnDstBitsPerPixel = 1;
-            break;
-        case 1 :                                // 2 color indexed ( monochrome )
-        case -1 :
-            rDesc.mnDstBitsPerPixel = 1;
-            break;
-        case 2 :                                // 4 color indexed
-        case -2 :
-            rDesc.mnDstBitsPerPixel = 2;
-            break;
-        case 4 :                                // 16 color indexed
-        case -4 :
-            rDesc.mnDstBitsPerPixel = 4;
-            break;
-        case 8 :                                // 256 color indexed
-        case -8 :
-            rDesc.mnDstBitsPerPixel = 8;
-            rDesc.mnScanSize = rDesc.mnX;
-            break;
-        case 16 :                               // NS
-        case -16 :
-            rDesc.mbStatus = sal_False;
-            break;
-        case 24 :                               // 24 bit directColor ( 8 bits each component )
-        case -24 :
-            rDesc.mnDstBitsPerPixel = 24;
-            break;
-        case 32 :                               // NS
-        case -32 :
-            rDesc.mbStatus = sal_False;
-            break;
-
-    }
-    // mnCompressionMode == 0 : CCOMP_RUNLENGTH
-    //                   == 1 : CCOMP_PACKED ( no compression. each row starts on a 4 byte boundary )
-    if ( ( rDesc.mnCompressionMode = mpCGM->ImplGetUI16() ) != 1 )
-        rDesc.mbStatus = sal_False;
-
-    if ( ( rDesc.mnX || rDesc.mnY ) == 0 )
-        rDesc.mbStatus = sal_False;
-
-    sal_uInt32 nHeaderSize = 2 + 3 * nPrecision + 3 * mpCGM->ImplGetPointSize();
-    rDesc.mnScanSize = ( ( rDesc.mnX * rDesc.mnDstBitsPerPixel + 7 ) >> 3 );
-
-    sal_uInt32  nScanSize;
-    nScanSize = rDesc.mnScanSize;
-    if ( ( nScanSize * rDesc.mnY + nHeaderSize ) != mpCGM->mnElementSize )  // try a scansize without dw alignment
-    {
-        nScanSize = ( rDesc.mnScanSize + 1 ) & ~1;
-        if ( ( nScanSize * rDesc.mnY + nHeaderSize ) != mpCGM->mnElementSize )  // then we'll try word alignment
-        {
-            nScanSize = ( rDesc.mnScanSize + 3 ) & ~3;
-            if ( ( nScanSize * rDesc.mnY + nHeaderSize ) != mpCGM->mnElementSize )  // and last we'll try dword alignment
-            {
-                nScanSize = ( rDesc.mnScanSize + 1 ) & ~1;          // and LAST BUT NOT LEAST we'll try word alignment without aligning the last line
-                if ( ( nScanSize * ( rDesc.mnY - 1 ) + rDesc.mnScanSize + nHeaderSize ) != mpCGM->mnElementSize )
-                {
-                    nScanSize = ( rDesc.mnScanSize + 3 ) & ~3;
-                    if ( ( nScanSize * ( rDesc.mnY - 1 ) + rDesc.mnScanSize + nHeaderSize ) != mpCGM->mnElementSize )
-                    {
-                        mpCGM->mnParaSize = 0;                              // this format is corrupt
-                        rDesc.mbStatus = sal_False;
-                    }
-                }
-            }
-        }
-    }
-    rDesc.mnScanSize = nScanSize;
-    if ( rDesc.mbStatus )
-    {
-        rDesc.mpBuf = mpCGM->mpSource + mpCGM->mnParaSize;  // mpBuf now points to the first scanline
-        mpCGM->mnParaSize += rDesc.mnScanSize * rDesc.mnY;
-    }
-    return rDesc.mbStatus;
-}
-
-// ---------------------------------------------------------------
-
-void CGMBitmap::ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& rDest )
-{
-    if ( ( rSource.mnR.Y == rDest.mnQ.Y ) && ( rSource.mnR.X == rDest.mnQ.X ) )
-    {   // Insert on Bottom
-        if ( mpCGM->mnVDCYmul == -1 )
-            rDest.mnOrigin = rSource.mnOrigin;          // neuer origin
-        rDest.mpBitmap->Expand( 0, rSource.mnY );
-        rDest.mpBitmap->CopyPixel( Rectangle( Point( 0, rDest.mnY ), Size( rSource.mnX, rSource.mnY ) ),
-            Rectangle( Point( 0, 0 ), Size( rSource.mnX, rSource.mnY ) ), rSource.mpBitmap );
-        FloatPoint aFloatPoint;
-        aFloatPoint.X = rSource.mnQ.X - rSource.mnR.X;
-        aFloatPoint.Y = rSource.mnQ.Y - rSource.mnR.Y;
-        rDest.mnQ.X += aFloatPoint.X;
-        rDest.mnQ.Y += aFloatPoint.Y;
-        rDest.mnP = rSource.mnP;
-        rDest.mnR = rSource.mnR;
-    }
-    else
-    {   // Insert on Top
-        if ( mpCGM->mnVDCYmul == 1 )
-            rDest.mnOrigin = rSource.mnOrigin;          // neuer origin
-        rDest.mpBitmap->Expand( 0, rSource.mnY );
-        rDest.mpBitmap->CopyPixel( Rectangle( Point( 0, rDest.mnY ), Size( rSource.mnX, rSource.mnY ) ),
-            Rectangle( Point( 0, 0 ), Size( rSource.mnX, rSource.mnY ) ), rSource.mpBitmap );
-        rDest.mnP = rSource.mnP;
-        rDest.mnR = rSource.mnR;
-    }
-    rDest.mnY += rSource.mnY;
-    rDest.mndy += rSource.mndy;
-};
-
-// ---------------------------------------------------------------
-
-CGMBitmap* CGMBitmap::GetNext()
-{
-    if ( pCGMBitmapDescriptor->mpBitmap && pCGMBitmapDescriptor->mbStatus )
-    {
-        CGMBitmap* pCGMTempBitmap = new CGMBitmap( *mpCGM );
-        if ( pCGMTempBitmap )
-        {
-            if ( ( (long)pCGMTempBitmap->pCGMBitmapDescriptor->mnOrientation == (long)pCGMBitmapDescriptor->mnOrientation ) &&
-                ( ( ( pCGMTempBitmap->pCGMBitmapDescriptor->mnR.X == pCGMBitmapDescriptor->mnQ.X ) &&
-                        ( pCGMTempBitmap->pCGMBitmapDescriptor->mnR.Y == pCGMBitmapDescriptor->mnQ.Y ) ) ||
-                ( ( pCGMTempBitmap->pCGMBitmapDescriptor->mnQ.X == pCGMBitmapDescriptor->mnR.X ) &&
-                        ( pCGMTempBitmap->pCGMBitmapDescriptor->mnQ.Y == pCGMBitmapDescriptor->mnR.Y ) ) ) )
-            {
-                ImplInsert( *(pCGMTempBitmap->pCGMBitmapDescriptor), *(pCGMBitmapDescriptor) );
-                delete pCGMTempBitmap;
-                return NULL;
-            }
-            else    // we'll replace the pointers and return the old one
-            {
-                CGMBitmapDescriptor* pTempBD = pCGMBitmapDescriptor;
-                pCGMBitmapDescriptor = pCGMTempBitmap->pCGMBitmapDescriptor;
-                pCGMTempBitmap->pCGMBitmapDescriptor = pTempBD;
-                return pCGMTempBitmap;
-            }
-        }
-        return NULL;
-    }
-    else
-        return NULL;
-}
-
-// ---------------------------------------------------------------
-
-CGMBitmapDescriptor* CGMBitmap::GetBitmap()
-{
-    return pCGMBitmapDescriptor;
-}
-
diff --git a/goodies/source/filter.vcl/icgm/bitmap.hxx b/goodies/source/filter.vcl/icgm/bitmap.hxx
deleted file mode 100644
index 6c52f585e38a..000000000000
--- a/goodies/source/filter.vcl/icgm/bitmap.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: bitmap.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 CGM_BITMAP_HXX_
-#define CGM_BITMAP_HXX_
-
-#include "cgm.hxx"
-#include <vcl/bmpacc.hxx>
-
-class CGM;
-
-class CGMBitmapDescriptor
-{
-    public:
-        sal_uInt8*              mpBuf;
-        Bitmap*                 mpBitmap;
-        BitmapWriteAccess*      mpAcc;
-        sal_Bool                mbStatus;
-        sal_Bool                mbVMirror;
-        sal_Bool                mbHMirror;
-        sal_uInt32              mnDstBitsPerPixel;
-        sal_uInt32              mnScanSize;         // bytes per line
-        FloatPoint              mnP, mnQ, mnR;
-
-        FloatPoint              mnOrigin;
-        double                  mndx, mndy;
-        double                  mnOrientation;
-
-        sal_uInt32              mnX, mnY;
-        long                    mnLocalColorPrecision;
-        sal_uInt32              mnCompressionMode;
-                                CGMBitmapDescriptor() :
-                                mpBuf       ( NULL ),
-                                mpBitmap    ( NULL ),
-                                mpAcc       ( NULL ),
-                                mbStatus    ( sal_False ),
-                                mbVMirror   ( sal_False ),
-                                mbHMirror   ( sal_False ) { };
-                                ~CGMBitmapDescriptor()
-                                {
-                                    if ( mpAcc )
-                                        mpBitmap->ReleaseAccess( mpAcc );
-                                    if ( mpBitmap )
-                                        delete mpBitmap;
-                                };
-};
-
-class CGMBitmap
-{
-        CGM*                    mpCGM;
-        CGMBitmapDescriptor*    pCGMBitmapDescriptor;
-        sal_Bool                ImplGetDimensions( CGMBitmapDescriptor& );
-        void                    ImplSetCurrentPalette( CGMBitmapDescriptor& );
-        void                    ImplGetBitmap( CGMBitmapDescriptor& );
-        void                    ImplInsert( CGMBitmapDescriptor& rSource, CGMBitmapDescriptor& rDest );
-    public:
-                                CGMBitmap( CGM& rCGM );
-                                ~CGMBitmap();
-        CGMBitmapDescriptor*    GetBitmap();
-        CGMBitmap*              GetNext();
-};
-#endif
-
diff --git a/goodies/source/filter.vcl/icgm/bundles.cxx b/goodies/source/filter.vcl/icgm/bundles.cxx
deleted file mode 100644
index 9cebbb0ae140..000000000000
--- a/goodies/source/filter.vcl/icgm/bundles.cxx
+++ /dev/null
@@ -1,291 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: bundles.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include "bundles.hxx"
-
-#include <vcl/salbtype.hxx>
-#include <tools/stream.hxx>
-#include <tools/list.hxx>
-
-Bundle& Bundle::operator=( Bundle& rSource )
-{
-    mnColor = rSource.mnColor;
-    mnBundleIndex = rSource.mnBundleIndex;
-    return *this;
-};
-
-// ---------------------------------------------------------------
-
-void Bundle::SetColor( sal_uInt32 nColor )
-{
-    mnColor = nColor;
-}
-
-sal_uInt32 Bundle::GetColor()
-{
-    return mnColor;
-}
-
-// ---------------------------------------------------------------
-
-LineBundle& LineBundle::operator=( LineBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    eLineType = rSource.eLineType;
-    nLineWidth = rSource.nLineWidth;
-    return *this;
-};
-
-MarkerBundle& MarkerBundle::operator=( MarkerBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    eMarkerType = rSource.eMarkerType;
-    nMarkerSize = rSource.nMarkerSize;
-    return *this;
-};
-
-EdgeBundle& EdgeBundle::operator=( EdgeBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    eEdgeType = rSource.eEdgeType;
-    nEdgeWidth = rSource.nEdgeWidth;
-    return *this;
-};
-
-TextBundle& TextBundle::operator=( TextBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    nTextFontIndex = rSource.nTextFontIndex;
-    eTextPrecision = rSource.eTextPrecision;
-    nCharacterExpansion = rSource.nCharacterExpansion;
-    nCharacterSpacing = rSource.nCharacterSpacing;
-    return *this;
-};
-
-FillBundle& FillBundle::operator=( FillBundle& rSource )
-{
-    SetIndex( rSource.GetIndex() );
-    eFillInteriorStyle = rSource.eFillInteriorStyle;
-    nFillPatternIndex = rSource.nFillPatternIndex;
-    nFillHatchIndex = rSource.nFillHatchIndex;
-    return *this;
-};
-
-// ---------------------------------------------------------------
-
-FontEntry::FontEntry() :
-    pFontName       ( NULL ),
-    eCharSetType    ( CST_CCOMPLETE ),
-    pCharSetValue   ( NULL ),
-    nFontType       ( 0 )
-{
-}
-
-FontEntry::~FontEntry()
-{
-    delete pFontName;
-    delete pCharSetValue;
-}
-
-// ---------------------------------------------------------------
-
-CGMFList::CGMFList() :
-    nFontNameCount      ( 0 ),
-    nCharSetCount       ( 0 ),
-    nFontsAvailable     ( 0 )
-{
-    aFontEntryList.Clear();
-}
-
-CGMFList::~CGMFList()
-{
-    ImplDeleteList();
-}
-
-// ---------------------------------------------------------------
-
-CGMFList& CGMFList::operator=( CGMFList& rSource )
-{
-    ImplDeleteList();
-    nFontsAvailable = rSource.nFontsAvailable;
-    nFontNameCount = rSource.nFontNameCount;
-    nCharSetCount = rSource.nCharSetCount;
-    FontEntry* pPtr = (FontEntry*)rSource.aFontEntryList.First();
-    while( pPtr )
-    {
-        FontEntry* pCFontEntry = new FontEntry;
-        if ( pPtr->pFontName )
-        {
-            sal_uInt32 nSize = strlen( (const char*)pPtr->pFontName ) + 1;
-            pCFontEntry->pFontName = new sal_Int8[ nSize ];
-            memcpy( pCFontEntry->pFontName, pPtr->pFontName, nSize );
-        }
-        if ( pPtr->pCharSetValue )
-        {
-            sal_uInt32 nSize = strlen( (const char*)pPtr->pCharSetValue ) + 1;
-            pCFontEntry->pCharSetValue = new sal_Int8[ nSize ];
-            memcpy( pCFontEntry->pCharSetValue, pPtr->pCharSetValue, nSize );
-        }
-        pCFontEntry->eCharSetType = pPtr->eCharSetType;
-        pCFontEntry->nFontType = pPtr->nFontType;
-        aFontEntryList.Insert( pCFontEntry, LIST_APPEND );
-        pPtr = (FontEntry*)rSource.aFontEntryList.Next();
-    }
-    return *this;
-}
-
-// ---------------------------------------------------------------
-
-FontEntry* CGMFList::GetFontEntry( sal_uInt32 nIndex )
-{
-    sal_uInt32 nInd = nIndex;
-    if ( nInd )
-        nInd--;
-    return (FontEntry*)aFontEntryList.GetObject( nInd );
-}
-
-// ---------------------------------------------------------------
-
-static sal_Int8* ImplSearchEntry( sal_Int8* pSource, sal_Int8* pDest, sal_uInt32 nComp, sal_uInt32 nSize )
-{
-    while ( nComp-- >= nSize )
-    {
-        sal_uInt32 i;
-        for ( i = 0; i < nSize; i++ )
-        {
-            if ( ( pSource[i]&~0x20 ) != ( pDest[i]&~0x20 ) )
-                break;
-        }
-        if ( i == nSize )
-            return pSource;
-        pSource++;
-    }
-    return NULL;
-}
-
-void CGMFList::InsertName( sal_uInt8* pSource, sal_uInt32 nSize )
-{
-    FontEntry* pFontEntry;
-    if ( nFontsAvailable == nFontNameCount )
-    {
-        nFontsAvailable++;
-        pFontEntry = new FontEntry;
-        aFontEntryList.Insert( pFontEntry, LIST_APPEND );
-    }
-    else
-    {
-        pFontEntry = (FontEntry*)aFontEntryList.GetObject( nFontNameCount );
-    }
-    nFontNameCount++;
-    sal_Int8* pBuf = new sal_Int8[ nSize ];
-    memcpy( pBuf, pSource, nSize );
-    sal_Int8* pFound = ImplSearchEntry( pBuf, (sal_Int8*)"ITALIC", nSize, 6 );
-    if ( pFound )
-    {
-        pFontEntry->nFontType |= 1;
-        sal_uInt32 nPrev = ( pFound - pBuf );
-        sal_uInt32 nToCopyOfs = 6;
-        if ( nPrev && ( pFound[ -1 ] == '-' || pFound[ -1 ] == ' ' ) )
-        {
-            nPrev--;
-            pFound--;
-            nToCopyOfs++;
-        }
-        sal_uInt32 nToCopy = nSize - nToCopyOfs - nPrev;
-        if ( nToCopy )
-        {
-            memcpy( pFound, pFound + nToCopyOfs, nToCopy );
-        }
-        nSize -= nToCopyOfs;
-    }
-    pFound = ImplSearchEntry( pBuf, (sal_Int8*)"BOLD", nSize, 4 );
-    if ( pFound )
-    {
-        pFontEntry->nFontType |= 2;
-
-        sal_uInt32 nPrev = ( pFound - pBuf );
-        sal_uInt32 nToCopyOfs = 4;
-        if ( nPrev && ( pFound[ -1 ] == '-' || pFound[ -1 ] == ' ' ) )
-        {
-            nPrev--;
-            pFound--;
-            nToCopyOfs++;
-        }
-        sal_uInt32 nToCopy = nSize - nToCopyOfs - nPrev;
-        if ( nToCopy )
-        {
-            memcpy( pFound, pFound + nToCopyOfs, nToCopy );
-        }
-        nSize -= nToCopyOfs;
-    }
-    pFontEntry->pFontName = new sal_Int8[ nSize + 1 ];
-    pFontEntry->pFontName[ nSize ] = 0;
-    memcpy( pFontEntry->pFontName, pBuf, nSize );
-    delete[] pBuf;
-}
-
-//--------------------------------------------------------------------------
-
-void CGMFList::InsertCharSet( CharSetType eCharSetType, sal_uInt8* pSource, sal_uInt32 nSize )
-{
-    FontEntry* pFontEntry;
-    if ( nFontsAvailable == nCharSetCount )
-    {
-        nFontsAvailable++;
-        pFontEntry = new FontEntry;
-        aFontEntryList.Insert( pFontEntry, LIST_APPEND );
-    }
-    else
-    {
-        pFontEntry = (FontEntry*)aFontEntryList.GetObject( nCharSetCount );
-    }
-    nCharSetCount++;
-    pFontEntry->eCharSetType = eCharSetType;
-    pFontEntry->pCharSetValue = new sal_Int8[ nSize + 1 ];
-    pFontEntry->pCharSetValue[ nSize ] = 0;
-    memcpy( pFontEntry->pCharSetValue, pSource , nSize );
-}
-
-// ---------------------------------------------------------------
-
-void CGMFList::ImplDeleteList()
-{
-    FontEntry* pFontEntry = (FontEntry*)aFontEntryList.First();
-    while( pFontEntry )
-    {
-        delete pFontEntry;
-        pFontEntry = (FontEntry*)aFontEntryList.Next();
-    }
-    aFontEntryList.Clear();
-}
-
diff --git a/goodies/source/filter.vcl/icgm/bundles.hxx b/goodies/source/filter.vcl/icgm/bundles.hxx
deleted file mode 100644
index 1ad9acfd0b44..000000000000
--- a/goodies/source/filter.vcl/icgm/bundles.hxx
+++ /dev/null
@@ -1,176 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: bundles.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CGM_BUNDLES_HXX_
-#define CGM_BUNDLES_HXX_
-
-#include <sal/types.h>
-#include "cgmtypes.hxx"
-#include <tools/list.hxx>
-#include <vcl/salbtype.hxx>
-
-// ---------------------------------------------------------------
-
-class CGM;
-
-class Bundle
-{
-
-    long                mnBundleIndex;
-    sal_uInt32          mnColor;
-
-public:
-    void                SetColor( sal_uInt32 nColor ) ;
-    sal_uInt32              GetColor() ;
-    long                GetIndex() const { return mnBundleIndex; } ;
-    void                SetIndex( long nBundleIndex ) { mnBundleIndex = nBundleIndex; } ;
-
-                        Bundle() {};
-    virtual Bundle*     Clone() { return new Bundle( *this ); };
-            Bundle&     operator=( Bundle& rBundle );
-
-    virtual             ~Bundle() {} ;
-};
-
-// ---------------------------------------------------------------
-
-class LineBundle : public Bundle
-{
-public:
-
-    LineType            eLineType;
-    double              nLineWidth;
-
-                        LineBundle() {};
-    virtual Bundle*     Clone() { return new LineBundle( *this ); };
-            LineBundle& operator=( LineBundle& rLineBundle );
-    virtual             ~LineBundle() {};
-};
-
-// ---------------------------------------------------------------
-
-class MarkerBundle : public Bundle
-{
-public:
-
-    MarkerType          eMarkerType;
-    double              nMarkerSize;
-
-                        MarkerBundle() {};
-    virtual Bundle*     Clone() { return new MarkerBundle( *this ); } ;
-            MarkerBundle&   operator=( MarkerBundle& rMarkerBundle );
-    virtual             ~MarkerBundle() {};
-};
-
-// ---------------------------------------------------------------
-
-class EdgeBundle : public Bundle
-{
-public:
-
-    EdgeType            eEdgeType;
-    double              nEdgeWidth;
-
-                        EdgeBundle() {};
-    virtual Bundle*     Clone() { return new EdgeBundle( *this ); } ;
-            EdgeBundle& operator=( EdgeBundle& rEdgeBundle );
-    virtual             ~EdgeBundle() {};
-};
-
-// ---------------------------------------------------------------
-
-class TextBundle : public Bundle
-{
-public:
-
-    sal_uInt32              nTextFontIndex;
-    TextPrecision       eTextPrecision;
-    double              nCharacterExpansion;
-    double              nCharacterSpacing;
-
-                        TextBundle() {};
-    virtual Bundle*     Clone() { return new TextBundle( *this ); } ;
-            TextBundle& operator=( TextBundle& rTextBundle );
-    virtual             ~TextBundle() {};
-};
-
-// ---------------------------------------------------------------
-
-class FillBundle : public Bundle
-{
-public:
-
-    FillInteriorStyle   eFillInteriorStyle;
-    long                nFillPatternIndex;
-    long                nFillHatchIndex;
-
-                        FillBundle() {};
-    virtual Bundle*     Clone() { return new FillBundle( *this ); } ;
-            FillBundle& operator=( FillBundle& rFillBundle );
-    virtual             ~FillBundle() {};
-};
-
-
-// ---------------------------------------------------------------
-
-class FontEntry
-{
-public:
-    sal_Int8*               pFontName;
-    CharSetType         eCharSetType;
-    sal_Int8*               pCharSetValue;
-    sal_uInt32              nFontType;          // bit 0 = 1 -> Italic,
-                                            // bit 1 = 1 -> Bold
-
-                        FontEntry();
-    FontEntry*          Clone() { return new FontEntry( *this ); } ;
-                        ~FontEntry();
-};
-
-// ---------------------------------------------------------------
-
-class CGMFList
-{
-    sal_uInt32              nFontNameCount;
-    sal_uInt32              nCharSetCount;
-    List                aFontEntryList;
-    void                ImplDeleteList();
-public:
-    sal_uInt32              nFontsAvailable;
-    FontEntry*          GetFontEntry( sal_uInt32 );
-    void                InsertName( sal_uInt8* pSource, sal_uInt32 nSize );
-    void                InsertCharSet( CharSetType, sal_uInt8* pSource, sal_uInt32 nSize );
-                        CGMFList();
-    CGMFList&           operator=( CGMFList& rFontList );
-                        ~CGMFList();
-};
-
-
-#endif
diff --git a/goodies/source/filter.vcl/icgm/cgm.cxx b/goodies/source/filter.vcl/icgm/cgm.cxx
deleted file mode 100644
index fc8079a859d4..000000000000
--- a/goodies/source/filter.vcl/icgm/cgm.cxx
+++ /dev/null
@@ -1,930 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: cgm.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_goodies.hxx"
-#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <unotools/ucbstreamhelper.hxx>
-
-#define CGM_BREAK_ACTION    0xffffffff
-#include <osl/endian.h>
-#include <vcl/virdev.hxx>
-#include <vcl/graph.hxx>
-#include <tools/stream.hxx>
-#include <chart.hxx>
-#include <main.hxx>
-#include <elements.hxx>
-#include <outact.hxx>
-
-using namespace ::com::sun::star;
-
-// ---------------------------------------------------------------
-
-void CGM::ImplCGMInit()
-{
-    mbIsFinished = mbPicture = mbMetaFile = mbPictureBody = sal_False;
-
-    mnActCount = 0;
-    mnOutdx = 28000;
-    mnOutdy = 21000;
-
-    mpBuf = NULL;
-    mpChart = NULL;
-    mpBitmapInUse = NULL;
-
-    pCopyOfE = new CGMElements( *this );
-    pElement = new CGMElements( *this );
-}
-
-// ---------------------------------------------------------------
-
-#ifdef CGM_EXPORT_IMPRESS
-
-CGM::CGM( sal_uInt32 nMode, uno::Reference< frame::XModel > & rModel )  :
-    mpGraphic               ( NULL ),
-    mpCommentOut            ( NULL ),
-    mbStatus                ( sal_True ),
-    mpOutAct                ( new CGMImpressOutAct( *this, rModel ) ),
-    mnMode                  ( nMode )
-{
-    mnMode |= CGM_EXPORT_IMPRESS;
-    ImplCGMInit();
-}
-#endif
-
-// ---------------------------------------------------------------
-
-void CGM::ImplComment( sal_uInt32 Level, const char* Description )
-{
-    if ( mpCommentOut )
-    {
-        if ( Level == CGM_DESCRIPTION )
-        {
-            *mpCommentOut << "                                  " << Description << "\n";
-        }
-        else
-        {
-            sal_Int8 nFirst, nSecond, i, nCount = 0;
-            if ( mnActCount < 10000 )
-                nCount++;
-            if ( mnActCount < 1000 )
-                nCount++;
-            if ( mnActCount < 100 )
-                nCount++;
-            if ( mnActCount < 10 )
-                nCount++;
-            for ( i = 0; i <= nCount; i++ )
-                *mpCommentOut << " ";
-            mpCommentOut->WriteNumber( mnActCount );
-
-            switch( Level & 0xff )
-            {
-                case CGM_UNKNOWN_LEVEL :
-                    *mpCommentOut << " L?";
-                break;
-                case CGM_UNKNOWN_COMMAND :
-                    *mpCommentOut << " UNKNOWN COMMAND";
-                break;
-                case CGM_GDSF_ONLY :
-                    *mpCommentOut << " LI";
-                break;
-                default:
-                    *mpCommentOut << " L";
-                    mpCommentOut->WriteNumber( Level & 0xff );
-                break;
-            }
-            *mpCommentOut << " C";
-            mpCommentOut->WriteNumber( mnElementClass );
-            *mpCommentOut << " ID-0x";
-            nFirst = ( mnElementID  > 0x9F ) ? (sal_Int8)( mnElementID >> 4 ) + 'A' - 10: (sal_Int8)( mnElementID >> 4 ) + '0';
-            nSecond = ( ( mnElementID & 15 ) > 9 ) ? (sal_Int8)( mnElementID & 15 ) + 'A' - 10 : (sal_Int8)( mnElementID & 15 ) + '0';
-            *mpCommentOut << nFirst << nSecond;
-             *mpCommentOut << " Size";
-            nCount = 1;
-            if ( mnElementSize < 1000000 )
-                nCount++;
-            if ( mnElementSize < 100000 )
-                nCount++;
-            if ( mnElementSize < 10000 )
-                nCount++;
-            if ( mnElementSize < 1000 )
-                nCount++;
-            if ( mnElementSize < 100 )
-                nCount++;
-            if ( mnElementSize < 10 )
-                nCount++;
-            for ( i = 0; i < nCount; i++ )
-                *mpCommentOut << " ";
-            mpCommentOut->WriteNumber( mnElementSize );
-            *mpCommentOut << " " << Description << "\n";
-        }
-    }
-}
-
-// ---------------------------------------------------------------
-
-CGM::~CGM()
-{
-
-#ifdef CGM_EXPORT_META
-    if ( mpGraphic )
-    {
-        mpGDIMetaFile->Stop();
-        mpGDIMetaFile->SetPrefMapMode( MapMode() );
-        mpGDIMetaFile->SetPrefSize( Size( static_cast< long >( mnOutdx ), static_cast< long >( mnOutdy ) ) );
-        delete mpVirDev;
-        *mpGraphic = Graphic( *mpGDIMetaFile );
-    }
-#endif
-    sal_Int8* pBuf = (sal_Int8*)maDefRepList.First();
-    while( pBuf )
-    {
-        delete pBuf;
-        pBuf = (sal_Int8*)maDefRepList.Next();
-    }
-    maDefRepList.Clear();
-    delete mpBitmapInUse;
-    delete mpCommentOut;
-    delete mpChart;
-    delete mpOutAct;
-    delete pCopyOfE;
-    delete pElement;
-    delete [] mpBuf;
-};
-
-// ---------------------------------------------------------------
-
-sal_uInt32 CGM::GetBackGroundColor()
-{
-    return ( pElement ) ? pElement->aColorTable[ 0 ] : 0;
-}
-
-// ---------------------------------------------------------------
-
-sal_uInt32 CGM::ImplGetUI16( sal_uInt32 /*nAlign*/ )
-{
-    sal_uInt8* pSource = mpSource + mnParaSize;
-    mnParaSize += 2;
-    return ( pSource[ 0 ] << 8 ) +  pSource[ 1 ];
-};
-
-// ---------------------------------------------------------------
-
-sal_uInt8 CGM::ImplGetByte( sal_uInt32 nSource, sal_uInt32 nPrecision )
-{
-    return (sal_uInt8)( nSource >> ( ( nPrecision - 1 ) << 3 ) );
-};
-
-// ---------------------------------------------------------------
-
-long CGM::ImplGetI( sal_uInt32 nPrecision )
-{
-    sal_uInt8* pSource = mpSource + mnParaSize;
-    mnParaSize += nPrecision;
-    switch( nPrecision )
-    {
-        case 1 :
-        {
-            return  (char)*pSource;
-        }
-
-        case 2 :
-        {
-            return (sal_Int16)( ( pSource[ 0 ] << 8 ) | pSource[ 1 ] );
-        }
-
-        case 3 :
-        {
-            return ( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | pSource[ 2 ] << 8 ) >> 8;
-        }
-        case 4:
-        {
-            return (sal_Int32)( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | ( pSource[ 2 ] << 8 ) | ( pSource[ 3 ] ) );
-        }
-        default:
-            mbStatus = sal_False;
-            return 0;
-    }
-}
-
-// ---------------------------------------------------------------
-
-sal_uInt32 CGM::ImplGetUI( sal_uInt32 nPrecision )
-{
-    sal_uInt8* pSource = mpSource + mnParaSize;
-    mnParaSize += nPrecision;
-    switch( nPrecision )
-    {
-        case 1 :
-            return  (sal_Int8)*pSource;
-        case 2 :
-        {
-            return (sal_uInt16)( ( pSource[ 0 ] << 8 ) | pSource[ 1 ] );
-        }
-        case 3 :
-        {
-            return ( pSource[ 0 ] << 16 ) | ( pSource[ 1 ] << 8 ) | pSource[ 2 ];
-        }
-        case 4:
-        {
-            return (sal_uInt32)( ( pSource[ 0 ] << 24 ) | ( pSource[ 1 ] << 16 ) | ( pSource[ 2 ] << 8 ) | ( pSource[ 3 ] ) );
-        }
-        default:
-            mbStatus = sal_False;
-            return 0;
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest )
-{
-    for ( int i = 0; i < 4; i++ )
-    {
-        pDest[ i ] = pSource[ i ^ 3 ];          // Little Endian <-> Big Endian switch
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest )
-{
-    for ( int i = 0; i < 8; i++ )
-    {
-        pDest[ i ] = pSource[ i ^ 7 ];          // Little Endian <-> Big Endian switch
-    }
-}
-
-// ---------------------------------------------------------------
-
-double CGM::ImplGetFloat( RealPrecision eRealPrecision, sal_uInt32 nRealSize )
-{
-    void*   pPtr;
-    sal_uInt8   aBuf[8];
-    sal_Bool    bCompatible;
-    double  nRetValue;
-    double  fDoubleBuf;
-    float   fFloatBuf;
-
-#ifdef OSL_BIGENDIAN
-        bCompatible = sal_True;
-#else
-        bCompatible = sal_False;
-#endif
-    if ( bCompatible )
-        pPtr = mpSource + mnParaSize;
-    else
-    {
-        if ( nRealSize == 4 )
-            ImplGetSwitch4( mpSource + mnParaSize, &aBuf[0] );
-        else
-            ImplGetSwitch8( mpSource + mnParaSize, &aBuf[0] );
-        pPtr = &aBuf;
-    }
-    if ( eRealPrecision == RP_FLOAT )
-    {
-        if ( nRealSize == 4 )
-        {
-            memcpy( (void*)&fFloatBuf, pPtr, 4 );
-            nRetValue = (double)fFloatBuf;
-        }
-        else
-        {
-            memcpy( (void*)&fDoubleBuf, pPtr, 8 );
-            nRetValue = fDoubleBuf;
-        }
-    }
-    else // ->RP_FIXED
-    {
-        long    nVal;
-        int     nSwitch = ( bCompatible ) ? 0 : 1 ;
-        if ( nRealSize == 4 )
-        {
-            sal_uInt16* pShort = (sal_uInt16*)pPtr;
-            nVal = pShort[ nSwitch ];
-            nVal <<= 16;
-            nVal |= pShort[ nSwitch ^ 1 ];
-            nRetValue = (double)nVal;
-            nRetValue /= 65536;
-        }
-        else
-        {
-            long* pLong = (long*)pPtr;
-            nRetValue = (double)abs( pLong[ nSwitch ] );
-            nRetValue *= 65536;
-            nVal = (sal_uInt32)( pLong[ nSwitch ^ 1 ] );
-            nVal >>= 16;
-            nRetValue += (double)nVal;
-            if ( pLong[ nSwitch ] < 0 )
-            {
-                nRetValue -= nRetValue;
-            }
-            nRetValue /= 65536;
-        }
-    }
-    mnParaSize += nRealSize;
-    return nRetValue;
-}
-
-// ---------------------------------------------------------------
-
-sal_uInt32 CGM::ImplGetPointSize()
-{
-    if ( pElement->eVDCType == VDC_INTEGER )
-        return pElement->nVDCIntegerPrecision << 1;
-    else
-        return pElement->nVDCRealSize << 1;
-}
-
-// ---------------------------------------------------------------
-
-inline double CGM::ImplGetIX()
-{
-    return ( ( ImplGetI( pElement->nVDCIntegerPrecision ) + mnVDCXadd ) * mnVDCXmul );
-}
-
-// ---------------------------------------------------------------
-
-inline double CGM::ImplGetFX()
-{
-    return ( ( ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize ) + mnVDCXadd ) * mnVDCXmul );
-}
-
-// ---------------------------------------------------------------
-
-inline double CGM::ImplGetIY()
-{
-    return ( ( ImplGetI( pElement->nVDCIntegerPrecision ) + mnVDCYadd ) * mnVDCYmul );
-}
-
-// ---------------------------------------------------------------
-
-inline double CGM::ImplGetFY()
-{
-    return ( ( ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize ) + mnVDCYadd ) * mnVDCYmul );
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap )
-{
-    if ( pElement->eVDCType == VDC_INTEGER )
-    {
-        rFloatPoint.X = ImplGetIX();
-        rFloatPoint.Y = ImplGetIY();
-    }
-    else // ->floating points
-    {
-        rFloatPoint.X = ImplGetFX();
-        rFloatPoint.Y = ImplGetFY();
-    }
-    if ( bMap )
-        ImplMapPoint( rFloatPoint );
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplGetRectangle( FloatRect& rFloatRect, sal_Bool bMap )
-{
-    if ( pElement->eVDCType == VDC_INTEGER )
-    {
-        rFloatRect.Left = ImplGetIX();
-        rFloatRect.Bottom = ImplGetIY();
-        rFloatRect.Right = ImplGetIX();
-        rFloatRect.Top = ImplGetIY();
-    }
-    else // ->floating points
-    {
-        rFloatRect.Left = ImplGetFX();
-        rFloatRect.Bottom = ImplGetFY();
-        rFloatRect.Right = ImplGetFX();
-        rFloatRect.Top = ImplGetFY();
-    }
-    if ( bMap )
-    {
-        ImplMapX( rFloatRect.Left );
-        ImplMapX( rFloatRect.Right );
-        ImplMapY( rFloatRect.Top );
-        ImplMapY( rFloatRect.Bottom );
-        rFloatRect.Justify();
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplGetRectangleNS( FloatRect& rFloatRect )
-{
-    if ( pElement->eVDCType == VDC_INTEGER )
-    {
-        rFloatRect.Left = ImplGetI( pElement->nVDCIntegerPrecision );
-        rFloatRect.Bottom = ImplGetI( pElement->nVDCIntegerPrecision );
-        rFloatRect.Right = ImplGetI( pElement->nVDCIntegerPrecision );
-        rFloatRect.Top = ImplGetI( pElement->nVDCIntegerPrecision );
-    }
-    else // ->floating points
-    {
-        rFloatRect.Left = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-        rFloatRect.Bottom = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-        rFloatRect.Right = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-        rFloatRect.Top = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-    }
-}
-
-// ---------------------------------------------------------------
-
-sal_uInt32 CGM::ImplGetBitmapColor( sal_Bool bDirect )
-{
-    // the background color is always a direct color
-
-    sal_uInt32  nTmp;
-    if ( ( pElement->eColorSelectionMode == CSM_DIRECT ) || bDirect )
-    {
-        sal_uInt32      nColor = ImplGetByte( ImplGetUI( pElement->nColorPrecision ), 1 );
-        sal_uInt32      nDiff = pElement->nColorValueExtent[ 3 ] - pElement->nColorValueExtent[ 0 ] + 1;
-
-        if ( !nDiff )
-            nDiff++;
-        nColor = ( ( nColor - pElement->nColorValueExtent[ 0 ] ) << 8 ) / nDiff;
-        nTmp = nColor << 16 & 0xff0000;
-
-        nColor = ImplGetByte( ImplGetUI( pElement->nColorPrecision ), 1 );
-        nDiff = pElement->nColorValueExtent[ 4 ] - pElement->nColorValueExtent[ 1 ] + 1;
-        if ( !nDiff )
-            nDiff++;
-        nColor = ( ( nColor - pElement->nColorValueExtent[ 1 ] ) << 8 ) / nDiff;
-        nTmp |= nColor << 8 & 0xff00;
-
-        nColor = ImplGetByte( ImplGetUI( pElement->nColorPrecision ), 1 );
-        nDiff = pElement->nColorValueExtent[ 5 ] - pElement->nColorValueExtent[ 2 ] + 1;
-        if ( !nDiff )
-            nDiff++;
-        nColor = ( ( nColor - pElement->nColorValueExtent[ 2 ] ) << 8 ) / nDiff;
-        nTmp |= (sal_uInt8)nColor;
-    }
-    else
-    {
-        sal_uInt32 nIndex = ImplGetUI( pElement->nColorIndexPrecision );
-        nTmp = pElement->aColorTable[ (sal_uInt8)( nIndex ) ] ;
-    }
-    return nTmp;
-}
-
-// ---------------------------------------------------------------
-
-// call this function each time after the mapmode settings has been changed
-void CGM::ImplSetMapMode()
-{
-    int nAngReverse = 1;
-    mnVDCdx = pElement->aVDCExtent.Right - pElement->aVDCExtent.Left;
-
-    mnVDCXadd = -pElement->aVDCExtent.Left;
-    mnVDCXmul = 1;
-    if ( mnVDCdx < 0 )
-    {
-        nAngReverse ^= 1;
-        mnVDCdx = -mnVDCdx;
-        mnVDCXmul = -1;
-    }
-
-    mnVDCdy = pElement->aVDCExtent.Bottom - pElement->aVDCExtent.Top;
-    mnVDCYadd = -pElement->aVDCExtent.Top;
-    mnVDCYmul = 1;
-    if ( mnVDCdy < 0 )
-    {
-        nAngReverse ^= 1;
-        mnVDCdy = -mnVDCdy;
-        mnVDCYmul = -1;
-    }
-    if ( nAngReverse )
-        mbAngReverse = sal_True;
-    else
-        mbAngReverse = sal_False;
-
-    double fQuo1 = mnVDCdx / mnVDCdy;
-    double fQuo2 = mnOutdx / mnOutdy;
-    if ( fQuo2 < fQuo1 )
-    {
-        mnXFraction = mnOutdx / mnVDCdx;
-        mnYFraction = mnOutdy * ( fQuo2 / fQuo1 ) / mnVDCdy;
-    }
-    else
-    {
-        mnXFraction = mnOutdx * ( fQuo1 / fQuo2 ) / mnVDCdx;
-        mnYFraction = mnOutdy / mnVDCdy;
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplMapDouble( double& nNumb )
-{
-    if ( pElement->eDeviceViewPortMap == DVPM_FORCED )
-    {
-        // point is 1mm * ScalingFactor
-        switch ( pElement->eDeviceViewPortMode )
-        {
-            case DVPM_FRACTION :
-            {
-                nNumb *= ( mnXFraction + mnYFraction ) / 2;
-            }
-            break;
-
-            case DVPM_METRIC :
-            {
-//              nNumb *= ( 100 * pElement->nDeviceViewPortScale );
-                nNumb *= ( mnXFraction + mnYFraction ) / 2;
-                if ( pElement->nDeviceViewPortScale < 0 )
-                    nNumb = -nNumb;
-            }
-            break;
-
-            case DVPM_DEVICE :
-            {
-
-            }
-            break;
-
-            default:
-
-                break;
-        }
-    }
-    else
-    {
-
-
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplMapX( double& nNumb )
-{
-    if ( pElement->eDeviceViewPortMap == DVPM_FORCED )
-    {
-        // point is 1mm * ScalingFactor
-        switch ( pElement->eDeviceViewPortMode )
-        {
-            case DVPM_FRACTION :
-            {
-                nNumb *= mnXFraction;
-            }
-            break;
-
-            case DVPM_METRIC :
-            {
-//              nNumb *= ( 100 * pElement->nDeviceViewPortScale );
-                nNumb *= mnXFraction;
-                if ( pElement->nDeviceViewPortScale < 0 )
-                    nNumb = -nNumb;
-            }
-            break;
-
-            case DVPM_DEVICE :
-            {
-
-            }
-            break;
-
-            default:
-
-                break;
-        }
-    }
-    else
-    {
-
-
-    }
-}
-
-
-// ---------------------------------------------------------------
-
-void CGM::ImplMapY( double& nNumb )
-{
-    if ( pElement->eDeviceViewPortMap == DVPM_FORCED )
-    {
-        // point is 1mm * ScalingFactor
-        switch ( pElement->eDeviceViewPortMode )
-        {
-            case DVPM_FRACTION :
-            {
-                nNumb *= mnYFraction;
-            }
-            break;
-
-            case DVPM_METRIC :
-            {
-//              nNumb *= ( 100 * pElement->nDeviceViewPortScale );
-                nNumb *= mnYFraction;
-                if ( pElement->nDeviceViewPortScale < 0 )
-                    nNumb = -nNumb;
-            }
-            break;
-
-            case DVPM_DEVICE :
-            {
-
-            }
-            break;
-
-            default:
-
-                break;
-        }
-    }
-    else
-    {
-
-
-    }
-}
-
-
-// ---------------------------------------------------------------
-
-// convert a point to the current VC mapmode (1/100TH mm)
-void CGM::ImplMapPoint( FloatPoint& rFloatPoint )
-{
-    if ( pElement->eDeviceViewPortMap == DVPM_FORCED )
-    {
-        // point is 1mm * ScalingFactor
-        switch ( pElement->eDeviceViewPortMode )
-        {
-            case DVPM_FRACTION :
-            {
-                rFloatPoint.X *= mnXFraction;
-                rFloatPoint.Y *= mnYFraction;
-            }
-            break;
-
-            case DVPM_METRIC :
-            {
-                rFloatPoint.X *= mnXFraction;
-                rFloatPoint.Y *= mnYFraction;
-                if ( pElement->nDeviceViewPortScale < 0 )
-                {
-                    rFloatPoint.X = -rFloatPoint.X;
-                    rFloatPoint.Y = -rFloatPoint.Y;
-                }
-            }
-            break;
-
-            case DVPM_DEVICE :
-            {
-
-            }
-            break;
-
-            default:
-
-                break;
-        }
-    }
-    else
-    {
-
-
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass()
-{
-#ifdef CGM_USER_BREAKPOINT
-#ifdef WNT
-    if ( mnActCount == CGM_BREAK_ACTION )
-        _asm int 0x3;
-#endif
-#endif
-    switch ( mnElementClass )
-    {
-        case 0 : ImplDoClass0(); break;
-        case 1 : ImplDoClass1(); break;
-        case 2 : ImplDoClass2(); break;
-        case 3 : ImplDoClass3(); break;
-        case 4 :
-        {
-            ImplDoClass4();
-            mnAct4PostReset = 0;
-        }
-        break;
-        case 5 : ImplDoClass5(); break;
-        case 6 : ImplDoClass6(); break;
-        case 7 : ImplDoClass7(); break;
-        case 8 : ImplDoClass8(); break;
-        case 9 : ImplDoClass9(); break;
-        case 15 :ImplDoClass15(); break;
-        default : ComOut( CGM_UNKNOWN_COMMAND, "" ); break;
-    }
-    mnActCount++;
-};
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDefaultReplacement()
-{
-    sal_uInt8*  pBuf = (sal_uInt8*)maDefRepList.First();
-    if ( pBuf )
-    {
-        sal_uInt32  nElementSize = (sal_uInt32)(sal_uIntPtr)maDefRepSizeList.First();
-        sal_uInt32  nOldEscape = mnEscape;
-        sal_uInt32  nOldElementClass = mnElementClass;
-        sal_uInt32  nOldElementID = mnElementID;
-        sal_uInt32  nOldElementSize = mnElementSize;
-        sal_uInt8*  pOldBuf = mpSource;
-        while( pBuf )
-        {
-            sal_uInt32  nCount = 0;
-            while ( mbStatus && ( nCount < nElementSize ) )
-            {
-                mpSource = pBuf + nCount;
-                mnParaSize = 0;
-                mnEscape = ImplGetUI16();
-                mnElementClass = mnEscape >> 12;
-                mnElementID = ( mnEscape & 0x0fe0 ) >> 5;
-                mnElementSize = mnEscape & 0x1f;
-                if ( mnElementSize == 31 )
-                {
-                    mnElementSize = ImplGetUI16();
-                }
-                nCount += mnParaSize;
-                mnParaSize = 0;
-                mpSource = pBuf + nCount;
-                if ( mnElementSize & 1 )
-                    nCount++;
-                nCount += mnElementSize;
-                if ( ( mnElementClass != 1 ) || ( mnElementID != 0xc ) )    // rekursion hier nicht moeglich!!
-                    ImplDoClass();
-            }
-            nElementSize = (sal_uInt32)(sal_uIntPtr)maDefRepSizeList.Next();
-            pBuf = (sal_uInt8*)maDefRepList.Next();
-        }
-        mnEscape = nOldEscape;
-        mnElementClass = nOldElementClass;
-        mnElementID = nOldElementID;
-        mnParaSize = mnElementSize = nOldElementSize;
-        mpSource = pOldBuf;
-    }
-}
-
-// ---------------------------------------------------------------
-
-sal_Bool CGM::Write( SvStream& rIStm )
-{
-    if ( !mpBuf )
-        mpBuf = new sal_uInt8[ 0xffff ];
-
-    mnParaSize = 0;
-    mpSource = mpBuf;
-    rIStm.Read( mpSource, 2 );
-    mnEscape = ImplGetUI16();
-    mnElementClass = mnEscape >> 12;
-    mnElementID = ( mnEscape & 0x0fe0 ) >> 5;
-    mnElementSize = mnEscape & 0x1f;
-
-    if ( mnElementSize == 31 )
-    {
-        rIStm.Read( mpSource + mnParaSize, 2 );
-        mnElementSize = ImplGetUI16();
-    }
-    mnParaSize = 0;
-    if ( mnElementSize )
-        rIStm.Read( mpSource + mnParaSize, mnElementSize );
-
-    if ( mnElementSize & 1 )
-        rIStm.SeekRel( 1 );
-    ImplDoClass();
-
-
-#ifdef CGM_USER_BREAKPOINT
-#ifdef WNT
-    if ( !mbStatus || mnParaSize && ( mnElementSize != mnParaSize ) )
-        _asm int 0x3;
-#endif
-#endif
-
-    return mbStatus;
-};
-
-// ---------------------------------------------------------------
-
-SvStream& operator>>( SvStream& rOStm, CGM& /*rCGM*/ )
-{
-
-    return rOStm;
-};
-
-// ---------------------------------------------------------------
-
-
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" sal_uInt32 __LOADONCALLAPI ImportCGM( String& rFileName, uno::Reference< frame::XModel > & rXModel, sal_uInt32 nMode, void* pProgressBar )
-{
-
-    sal_uInt32  nStatus = 0;            // retvalue == 0 -> ERROR
-                                        //          == 0xffrrggbb -> background color in the lower 24 bits
-    sal_Bool    bProgressBar = sal_False;
-
-    if( rXModel.is() )
-    {
-        CGM*        pCGM= NULL;
-
-        try
-        {
-            pCGM = new CGM( nMode, rXModel );
-            if ( pCGM && pCGM->IsValid() )
-            {
-                if ( nMode & CGM_IMPORT_CGM )
-                {
-                    SvStream* pIn = ::utl::UcbStreamHelper::CreateStream( rFileName, STREAM_READ );
-                    if ( pIn )
-                    {
-                        pIn->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-                        pIn->Seek( STREAM_SEEK_TO_END );
-                        sal_uInt32  nInSize = pIn->Tell();
-                        pIn->Seek( 0 );
-
-#ifdef CGM_EXPORT_IMPRESS
-                        uno::Reference< task::XStatusIndicator >  aXStatInd;
-                        sal_uInt32  nNext = 0;
-                        sal_uInt32  nAdd = nInSize / 20;
-                        if ( pProgressBar )
-                            aXStatInd = *(uno::Reference< task::XStatusIndicator > *)pProgressBar;
-                        bProgressBar = aXStatInd.is();
-                        if ( bProgressBar )
-                            aXStatInd->start( rtl::OUString::createFromAscii("CGM Import"), nInSize );
-#endif
-
-                        while ( pCGM->IsValid() && ( pIn->Tell() < nInSize ) && !pCGM->IsFinished() )
-                        {
-
-#ifdef CGM_EXPORT_IMPRESS
-
-
-                            if ( bProgressBar )
-                            {
-                                sal_uInt32 nCurrentPos = pIn->Tell();
-                                if ( nCurrentPos >= nNext )
-                                {
-                                    aXStatInd->setValue( nCurrentPos );
-                                    nNext = nCurrentPos + nAdd;
-                                }
-                            }
-#endif
-
-                            if ( pCGM->Write( *pIn ) == sal_False )
-                                break;
-                        }
-                        if ( pCGM->IsValid() )
-                        {
-                            nStatus = pCGM->GetBackGroundColor() | 0xff000000;
-                        }
-#ifdef CGM_EXPORT_IMPRESS
-                        if ( bProgressBar )
-                            aXStatInd->end();
-#endif
-                        delete pIn;
-                    }
-                }
-            }
-        }
-        catch( ::com::sun::star::uno::Exception& )
-        {
-            nStatus = 0;
-        }
-        delete pCGM;
-    }
-    return nStatus;
-}
diff --git a/goodies/source/filter.vcl/icgm/cgm.hxx b/goodies/source/filter.vcl/icgm/cgm.hxx
deleted file mode 100644
index 78bece103dc1..000000000000
--- a/goodies/source/filter.vcl/icgm/cgm.hxx
+++ /dev/null
@@ -1,181 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: cgm.hxx,v $
- * $Revision: 1.7 $
- *
- * 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 CGM_HXX_
-#define CGM_HXX_
-
-#include <com/sun/star/frame/XModel.hpp>
-
-// ---------------------------------------------------------------
-#undef CGM_USER_BREAKPOINT
-
-#define CGM_IMPORT_CGM      0x00000001
-
-#define CGM_EXPORT_IMPRESS  0x00000100
-#define CGM_EXPORT_META     0x00000200
-//#define CGM_EXPORT_COMMENT    0x00000400
-
-// ---------------------------------------------------------------
-
-#include <tools/solar.h>
-#include <rtl/ustring.hxx>
-#include <tools/list.hxx>
-#include "cgmtypes.hxx"
-
-// ---------------------------------------------------------------
-
-class   List;
-class   Bundle;
-class   Graphic;
-class   SvStream;
-class   CGMChart;
-class   CGMBitmap;
-class   CGMOutAct;
-class   CGMElements;
-class   BitmapColor;
-class   GDIMetaFile;
-class   VirtualDevice;
-class   CGMBitmapDescriptor;
-
-class CGM
-{
-        friend class CGMChart;
-        friend class CGMBitmap;
-        friend class CGMElements;
-        friend class CGMOutAct;
-        friend class CGMImpressOutAct;
-
-        double              mnOutdx;                // Ausgabe Groesse in 1/100TH mm
-        double              mnOutdy;                // auf das gemappt wird
-        double              mnVDCXadd;
-        double              mnVDCYadd;
-        double              mnVDCXmul;
-        double              mnVDCYmul;
-        double              mnVDCdx;
-        double              mnVDCdy;
-        double              mnXFraction;
-        double              mnYFraction;
-        sal_Bool                mbAngReverse;           // AngularDirection
-
-        Graphic*            mpGraphic;              // ifdef CGM_EXPORT_META
-        SvStream*           mpCommentOut;           // ifdef CGM_EXPORT_COMMENT
-
-        sal_Bool                mbStatus;
-        sal_Bool                mbMetaFile;
-        sal_Bool                mbIsFinished;
-        sal_Bool                mbPicture;
-        sal_Bool                mbPictureBody;
-        sal_Bool                mbFigure;
-        sal_Bool                mbFirstOutPut;
-        sal_uInt32              mnAct4PostReset;
-        CGMBitmap*          mpBitmapInUse;
-        CGMChart*           mpChart;                // if sal_True->"SHWSLIDEREC"
-                                                    //  otherwise "BEGINPIC" commands
-                                                    // controlls page inserting
-        CGMElements*        pElement;
-        CGMElements*        pCopyOfE;
-        CGMOutAct*          mpOutAct;
-        List                maDefRepList;
-        List                maDefRepSizeList;
-
-        sal_uInt8*              mpSource;       // source buffer that is not increased
-                                            // ( instead use mnParaCount to index )
-        sal_uInt32              mnParaSize;     // actual parameter size which has been done so far
-        sal_uInt32              mnActCount;     // increased by each action
-        sal_uInt8*              mpBuf;          // source stream operation -> then this is allocated for
-                                            //                            the temp input buffer
-
-        sal_uInt32              mnMode;         // source description
-        sal_uInt32              mnEscape;       //
-        sal_uInt32              mnElementClass; //
-        sal_uInt32              mnElementID;    //
-        sal_uInt32              mnElementSize;  // full parameter size for the latest action
-
-        void                ImplCGMInit();
-        sal_uInt32          ImplGetUI16( sal_uInt32 nAlign = 0 );
-        sal_uInt8           ImplGetByte( sal_uInt32 nSource, sal_uInt32 nPrecision );
-        long                ImplGetI( sal_uInt32 nPrecision );
-        sal_uInt32          ImplGetUI( sal_uInt32 nPrecision );
-        void                ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest );
-        void                ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest );
-        double              ImplGetFloat( RealPrecision, sal_uInt32 nRealSize );
-        sal_uInt32          ImplGetBitmapColor( sal_Bool bDirectColor = sal_False );
-        void                ImplSetMapMode();
-        void                ImplMapDouble( double& );
-        void                ImplMapX( double& );
-        void                ImplMapY( double& );
-        void                ImplMapPoint( FloatPoint& );
-        inline double       ImplGetIY();
-        inline double       ImplGetFY();
-        inline double       ImplGetIX();
-        inline double       ImplGetFX();
-        sal_uInt32              ImplGetPointSize();
-        void                ImplGetPoint( FloatPoint& rFloatPoint, sal_Bool bMap = sal_False );
-        void                ImplGetRectangle( FloatRect&, sal_Bool bMap = sal_False );
-        void                ImplGetRectangleNS( FloatRect& );
-        void                ImplGetVector( double* );
-        double              ImplGetOrientation( FloatPoint& rCenter, FloatPoint& rPoint );
-        void                ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle );
-        sal_Bool                ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double& rOrientation );
-
-        void                ImplDefaultReplacement();
-        void                ImplDoClass();
-        void                ImplDoClass0();
-        void                ImplDoClass1();
-        void                ImplDoClass2();
-        void                ImplDoClass3();
-        void                ImplDoClass4();
-        void                ImplDoClass5();
-        void                ImplDoClass6();
-        void                ImplDoClass7();
-        void                ImplDoClass8();
-        void                ImplDoClass9();
-        void                ImplDoClass15();
-
-    public:
-
-                            ~CGM();
-
-                            CGM( sal_uInt32 nMode, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & rModel );
-#ifdef CGM_EXPORT_META
-        VirtualDevice*      mpVirDev;
-        GDIMetaFile*        mpGDIMetaFile;
-#endif
-        void                ImplComment( sal_uInt32, const char* );
-        sal_uInt32              GetBackGroundColor();
-        sal_Bool                IsValid() { return mbStatus; };
-        sal_Bool                IsFinished() { return mbIsFinished; };
-        sal_Bool                Write( SvStream& rIStm );
-
-        friend SvStream& operator>>( SvStream& rOStm, CGM& rCGM );
-
-};
-#endif
-
diff --git a/goodies/source/filter.vcl/icgm/cgmres.hrc b/goodies/source/filter.vcl/icgm/cgmres.hrc
deleted file mode 100644
index dcadd6c3f906..000000000000
--- a/goodies/source/filter.vcl/icgm/cgmres.hrc
+++ /dev/null
@@ -1,31 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: cgmres.hrc,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.
- *
- ************************************************************************/
-#define MB_CGM          1
-#define MID_TEST        1
diff --git a/goodies/source/filter.vcl/icgm/cgmtypes.hxx b/goodies/source/filter.vcl/icgm/cgmtypes.hxx
deleted file mode 100644
index 0a7988b5c070..000000000000
--- a/goodies/source/filter.vcl/icgm/cgmtypes.hxx
+++ /dev/null
@@ -1,148 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: cgmtypes.hxx,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.
- *
- ************************************************************************/
-
-#ifndef CGM_TYPES_HXX_
-#define CGM_TYPES_HXX_
-
-struct FloatPoint
-{
-        double          X;
-        double          Y;
-        FloatPoint(){};
-        FloatPoint( const double& rX, const double& rY ) { X = rX, Y = rY; };
-};
-
-struct FloatRect
-{
-        double          Left;
-        double          Top;
-        double          Right;
-        double          Bottom;
-        FloatRect(){};
-        FloatRect( const FloatPoint& rTopLeft, const FloatPoint& rBottomRight )
-        {
-            Left = rTopLeft.X;
-            Top = rTopLeft.Y;
-            Right = rBottomRight.X;
-            Bottom = rBottomRight.Y;
-        }
-        void Justify()
-        {
-            double fTemp;
-            if ( Left > Right )
-            {
-                fTemp = Left;
-                Left = Right;
-                Right = fTemp;
-            }
-            if ( Top > Bottom )
-            {
-                fTemp = Top;
-                Top = Bottom;
-                Bottom = fTemp;
-            }
-        }
-};
-
-struct HatchEntry
-{
-    int     HatchStyle;
-    long    HatchDistance;
-    long    HatchAngle;
-};
-
-#define ASF_LINETYPE            0x00000001UL
-#define ASF_LINEWIDTH           0x00000002UL
-#define ASF_LINECOLOR           0x00000004UL
-#define ASF_MARKERTYPE          0x00000008UL
-#define ASF_MARKERSIZE          0x00000010UL
-#define ASF_MARKERCOLOR         0x00000020UL    // NS
-#define ASF_FILLINTERIORSTYLE   0x00000040UL
-#define ASF_HATCHINDEX          0x00000080UL
-#define ASF_PATTERNINDEX        0x00000100UL
-#define ASF_BITMAPINDEX         0x00000200UL    // NS
-#define ASF_FILLCOLOR           0x00000400UL
-#define ASF_EDGETYPE            0x00000800UL
-#define ASF_EDGEWIDTH           0x00001000UL
-#define ASF_EDGECOLOR           0x00002000UL
-#define ASF_TEXTFONTINDEX       0x00004000UL
-#define ASF_TEXTPRECISION       0x00008000UL
-#define ASF_CHARACTEREXPANSION  0x00010000UL
-#define ASF_CHARACTERSPACING    0x00020000UL
-#define ASF_TEXTCOLOR           0x00040000UL
-
-#define ACT4_GRADIENT_ACTION    0x00000001UL
-
-enum RealPrecision      { RP_FLOAT = 0, RP_FIXED = 1 };
-
-enum ScalingMode        { SM_ABSTRACT = 0, SM_METRIC = 1 };
-
-enum VDCType            { VDC_INTEGER = 0, VDC_REAL = 1 };
-enum DeviceViewPortMode { DVPM_FRACTION = 0, DVPM_METRIC = 1, DVPM_DEVICE = 2 };
-enum DeviceViewPortMap  { DVPM_NOT_FORCED = 0, DVPM_FORCED = 1 };
-enum DeviceViewPortMapH { DVPMH_LEFT = 0, DVPMH_CENTER = 1, CVPMH_RIGHT = 2 };
-enum DeviceViewPortMapV { DVPMV_BOTTOM = 0, DVPMV_CENTER = 1, DVPMV_TOP = 2 };
-
-enum ClipIndicator      { CI_OFF = 0, CI_ON = 1 };
-
-enum ColorSelectionMode { CSM_INDEXED = 0, CSM_DIRECT = 1 };
-enum ColorModel         { CM_RGB = 0, CM_CYMK = 1 };
-
-enum CharacterCodingA   { CCA_BASIC_7 = 0, CCA_BASIC_8 = 1, CCA_EXT_7 = 2, CCA_EXT_8 = 3 };
-enum CharSetType        { CST_CBYTE_94 = 0, CST_CBYTE_96 = 1, CST_MULT94 = 2, CST_MULT96 = 3, CST_CCOMPLETE = 4 };
-enum TextPrecision      { TPR_STRING = 0, TPR_CHARACTER = 1, TPR_STROKE = 2, TPR_UNDEFINED = 0xffff };
-enum TextPath           { TPR_RIGHT = 0, TPR_LEFT = 1, TPR_UP = 2, TPR_DOWN = 3 };
-enum TextAlignmentH     { TAH_NORMAL = 0, TAH_LEFT = 1, TAH_CENTER = 2, TAH_RIGHT = 3, TAH_CONT = 4 };
-enum TextAlignmentV     { TAV_NORMAL = 0, TAV_TOP = 1, TAV_CAP = 2, TAV_HALF = 3, TAV_BASE = 4, TAV_BOTTOM = 5, TAV_CONT = 6 };
-enum UnderlineMode      { UM_OFF = 0, UM_LOW = 1, UM_HIGH = 2, UM_STRIKEOUT = 4, UM_OVERSCORE = 8 };
-enum FinalFlag          { FF_NOT_FINAL = 0, FF_FINAL = 1 };
-
-enum LineType           { LT_SOLID = 1, LT_DASH = 2, LT_DOT = 3, LT_DASHDOT = 4, LT_DASHDOTDOT = 5,     // Standart
-                            LT_NONE = -4, LT_DOTDOTSPACE = -3, LT_LONGDASH = -2, LT_DASHDASHDOT = -1 }; // GDSF Styles
-enum SpecMode           { SM_ABSOLUTE = 0, SM_SCALED = 1 };
-enum LineCapType        { LCT_BUTT = 0, LCT_ROUND = 1, LCT_SQUARE = 2, LCT_TRIANGLE = 3, LCT_ARROW = 4, LCT_NONE = -1 };
-enum LineJoinType       { LJT_MITER = 0, LJT_ROUND = 1, LJT_BEVEL = 2, LJT_NONE = -1 };
-
-
-enum EdgeType           { ET_SOLID = 1, ET_DASH = 2, ET_DOT = 3, ET_DASHDOT = 4, ET_DASHDOTDOT = 5,     // Standart
-                            ET_NONE = -4, ET_DOTDOTSPACE = -3, ET_LONGDASH = -2, ET_DASHDASHDOT = -1 }; // GDSF Styles
-enum EdgeVisibility     { EV_OFF = 0, EV_ON = 1 };
-
-enum MarkerType         { MT_POINT = 1, MT_PLUS = 2, MT_STAR = 3, MT_CIRCLE = 4, MT_CROSS = 5 };
-
-enum Transparency       { T_OFF = 0, T_ON = 1 };
-
-enum FillInteriorStyle  { FIS_HOLLOW = 0, FIS_SOLID = 1, FIS_PATTERN = 2, FIS_HATCH = 3, FIS_EMPTY = 4, FIS_GEOPATTERN = 5,
-                            FIS_INTERPOLATED = 6, FIS_GRADIENT = 7 };
-
-
-
-
-#endif
diff --git a/goodies/source/filter.vcl/icgm/chart.cxx b/goodies/source/filter.vcl/icgm/chart.cxx
deleted file mode 100644
index 5f771db3e2b7..000000000000
--- a/goodies/source/filter.vcl/icgm/chart.cxx
+++ /dev/null
@@ -1,103 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: chart.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <main.hxx>
-#include <chart.hxx>
-
-// ---------------------------------------------------------------
-
-CGMChart::CGMChart( CGM& rCGM ) :
-    mpCGM       ( &rCGM )
-{
-    for ( sal_Int8 i = 0; i < 7; i++ )
-    {
-        mDataNode[ i ].nBoxX1 = mDataNode[ i ].nBoxY1 = 0 ;
-        mDataNode[ i ].nBoxX2 = mDataNode[ i ].nBoxY2 = 0 ;
-
-        mDataNode[ i ].nZoneEnum = i;
-    }
-};
-
-// ---------------------------------------------------------------
-
-CGMChart::~CGMChart()
-{
-    // delete the whole textentry structure
-
-    TextEntry* pTextEntry;
-    while( ( pTextEntry = (TextEntry*)maTextEntryList.First() ) != NULL )
-    {
-        DeleteTextEntry( pTextEntry );
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMChart::DeleteTextEntry( TextEntry* pTextEntry )
-{
-    if ( pTextEntry )
-    {
-        delete pTextEntry->pText;
-        for ( TextAttribute* pTAttr = pTextEntry->pAttribute; pTAttr != NULL ; )
-        {
-            TextAttribute* pTempTAttr = pTAttr;
-            pTAttr = pTAttr->pNextAttribute;
-            delete pTempTAttr;
-        }
-        delete pTextEntry;
-        maTextEntryList.Remove( pTextEntry );
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGMChart::InsertTextEntry( TextEntry* pTextEntry )
-{
-    maTextEntryList.Insert( pTextEntry );
-};
-
-// ---------------------------------------------------------------
-
-// ---------------------------------------------------------------
-void CGMChart::ResetAnnotation()
-{
-    mDataNode[ 0 ].nZoneEnum = 0;
-}
-
-// ---------------------------------------------------------------
-
-sal_Bool CGMChart::IsAnnotation()
-{
-    return ( mDataNode[ 0 ].nZoneEnum == 0 );
-};
-
diff --git a/goodies/source/filter.vcl/icgm/chart.hxx b/goodies/source/filter.vcl/icgm/chart.hxx
deleted file mode 100644
index d55e4106275c..000000000000
--- a/goodies/source/filter.vcl/icgm/chart.hxx
+++ /dev/null
@@ -1,217 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: chart.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 CGM_CHART_HXX_
-#define CGM_CHART_HXX_
-
-#include <tools/list.hxx>
-
-/* FILE TYPE CONSTANTS: */
-#define NOCHART         0       /* Undefined chart.         */
-#define XYCHART         1       /* Standard XY chart.       */
-#define PIECHART        21      /* Standard pie chart file. */
-#define ORGCHART        26      /* Standard org chart file. */
-#define TTLCHART        31      /* Title chart file.        */
-#define BULCHART        32      /* Bullet chart file.       */
-#define TABCHART        33      /* Table chart file.        */
-#define DRWCHART        41      /* Chart with drawings only.*/
-#define MLTCHART        42      /* Multiple chart file.     */
-#define LASTCHART       45      /* The largest chart type.  */
-#define SHWFILE         46      /* Slide show file.         */
-#define SYMFILE         47      /* Symbol file.             */
-/* the following were added although SPC doesn't have a #define */
-/* for them...                                                  */
-#define AUTOTTLCHT      95      /* Autobuild TTL CHT        */
-#define AUTOBULCHT      96      /* Autobuild BUL CHT        */
-#define AUTOTABCHT      97      /* Autobuild TAB CHT        */
-
-/* FNC 10/11/93: for the chart stream, ALLCHART was added.  */
-/* It is used specifically by PPT in its Template to let    */
-/* us know that the template applies to all charts, not to  */
-/* one specific chart type.                                 */
-#define ALLCHART       127      /* Applies to all chart types */
-#define ALLCHART_TPL   255      /* Applies to all chart types */
-
-#define IOC_CHTTITLE        1       /* Title for any chart.                  */
-#define IOC_CHTFOOTNOTE     2       /* ::com::sun::star::text::Footnote for any chart.               */
-#define IOC_XYAXIS          3       /* Axis title for XY charts.             */
-#define IOC_XYSERIESLEGEND  4       /* Series legend titles for XY charts.   */
-#define IOC_PIETITLE        5       /* Title for pie charts.                 */
-#define IOC_TABLEBODY       6       /* Table chart text element.             */
-#define IOC_TITLEBODY       7       /* Title chart text element.             */
-#define IOC_BULLETBODY      8       /* Bullet chart text element.            */
-#define IOC_XYLEGENDTITLE   9       /* Legend title for XY charts.           */
-#define IOC_PIELEGENDTITLE  10      /* Legend title for pie charts.          */
-#define IOC_TABLEGENDTITLE  11      /* Legend title for table charts.        */
-
-typedef struct TextAttribute
-{
-    sal_uInt16          nTextAttribCount;
-    sal_Int8            nTextColorIndex;
-    sal_Int8            nTextColorRed;
-    sal_Int8            nTextColorGreen;
-    sal_Int8            nTextColorBlue;
-    sal_Int8            nShadowColorIndex;
-    sal_Int8            nShadowColorRed;
-    sal_Int8            nShadowColorGreen;
-    sal_Int8            nShadowColorBlue;
-    float           nTextAttribSize;
-    sal_uInt16          nTextAttribBits;
-    sal_Int8            nTextFontType;      // font identifiers
-    sal_Int8            nTextCharPage;
-    sal_uInt16          nTextFontFamily;
-    sal_Int8            nTextFontMemberID;
-    sal_Int8            nTextFontVendorID;
-    TextAttribute*  pNextAttribute;     // zero or pointer to next TextAttribute
-} TextAttribute;
-
-typedef struct TextEntry
-{
-    sal_uInt16          nTypeOfText;
-    sal_uInt16          nRowOrLineNum;
-    sal_uInt16          nColumnNum;
-    sal_uInt16          nZoneSize;          // textzone attributes
-    sal_uInt16          nLineType;
-    sal_uInt16          nAttributes;
-    char*           pText;              // null terminated text
-    TextAttribute*  pAttribute;
-} TextEntry;
-
-typedef struct ZoneOption
-{
-    char            nOverTitle;
-    char            nOverBody;
-    char            nOverFoot;
-    char            nFStyle_Title;
-    char            nFStyle_Body;
-    char            nFStyle_Foot;
-    char            nFOutc_Title;
-    char            nFOutc_Body;
-    char            nFOutc_Foot;
-    char            nFFillc_Title;
-    char            nFFillc_Body;
-    char            nFFillc_Foot;
-} ZoneOption;
-
-typedef struct BulletOption
-{
-    char            nBType;
-    char            nBSize;
-    char            nBColor;
-    sal_Int16           nBStart;
-    double          nTMargin;
-    double          nBSpace;
-    char            nCPlace;
-} BulletOption;
-
-typedef struct BulDef
-{
-    char            btype;
-    char            bsize;
-    char            bcolor;
-    char            bnumber;
-} BulDef;
-
-typedef struct BulletLines
-{
-    BulDef          nBulDef[ 48 ];
-} BulletLines;
-
-typedef struct IntSettings
-{
-    sal_uInt16          nCountry;
-    sal_uInt16          nDateFormat;
-    sal_uInt16          nDateSep;
-    sal_uInt16          nTimeFormat;
-    sal_uInt16          nTimeSep;
-    sal_uInt16          nNumSeps;
-    sal_uInt16          nCurrencyFormat;
-    char            nCurrencySymbol[ 5 ];
-} IntSettings;
-
-typedef struct PageOrientDim
-{
-    char            nOrientation;
-    char            nDimension;
-    float           nPageX;
-    float           nPageY;
-} PageOrientDim;
-
-typedef struct DataNode
-{
-    sal_Int16           nBoxX1;
-    sal_Int16           nBoxY1;
-    sal_Int16           nBoxX2;
-    sal_Int16           nBoxY2;
-    sal_Int8            nZoneEnum;
-} DataNode;
-
-typedef struct ChartZone
-{
-    sal_Int16           nMinX;
-    sal_Int16           nMinY;
-    sal_Int16           nMaxX;
-    sal_Int16           nMaxY;
-    char            nUserDef;
-    char            nPad1;
-} ChartZone;
-
-class CGM;
-class CGMImpressOutAct;
-class CGMChart
-{
-    friend class CGM;
-    friend class CGMImpressOutAct;
-
-    protected:
-        CGM*                    mpCGM;
-        sal_Int8                    mnCurrentFileType;
-        List                    maTextEntryList;
-        DataNode                mDataNode[ 7 ];
-        ChartZone               mChartZone;
-        PageOrientDim           mPageOrientDim;
-        BulletOption            mBulletOption;
-        BulletLines             mBulletLines;
-        ZoneOption              mZoneOption;
-        IntSettings             mIntSettings;
-
-    public:
-                                CGMChart( CGM& rCGM );
-                                ~CGMChart();
-
-        void                    DeleteTextEntry( TextEntry* );
-        void                    InsertTextEntry( TextEntry* );
-
-        void                    ResetAnnotation();
-        sal_Bool                    IsAnnotation();
-};
-
-#endif
-
diff --git a/goodies/source/filter.vcl/icgm/class0.cxx b/goodies/source/filter.vcl/icgm/class0.cxx
deleted file mode 100644
index 394d5f803bde..000000000000
--- a/goodies/source/filter.vcl/icgm/class0.cxx
+++ /dev/null
@@ -1,141 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: class0.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#include <main.hxx>
-#include <outact.hxx>
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass0()
-{
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_LEVEL1, "Begin Metafile" )
-        {
-            ImplSetMapMode();
-            mbMetaFile = sal_True;
-        }
-        break;
-        case 0x02 : ComOut( CGM_LEVEL1, "End MetaFile" )
-        {
-            if ( mpBitmapInUse )                            // vorhandene grafik verarbeiten,
-            {
-                CGMBitmapDescriptor* pBmpDesc = mpBitmapInUse->GetBitmap();
-                // irgendetwas mit der Bitmap anfangen
-                mpOutAct->DrawBitmap( pBmpDesc );
-                delete mpBitmapInUse;
-                mpBitmapInUse = NULL;
-            }
-            mbIsFinished = sal_True;
-            mbPictureBody = sal_False;
-            mbMetaFile = sal_False;
-        }
-        break;
-        case 0x03 : ComOut( CGM_LEVEL1, "Begin Picture" )
-        {
-            ImplDefaultReplacement();
-            ImplSetMapMode();
-            if ( mbPicture )
-                mbStatus = sal_False;
-            else
-            {
-                *pCopyOfE = *pElement;
-                mbPicture = mbFirstOutPut = sal_True;
-                mbFigure = sal_False;
-                mnAct4PostReset = 0;
-                if ( mpChart == NULL )      // normal CGM Files determines "BeginPic"
-                    mpOutAct->InsertPage();     // as the next slide
-            }
-        }
-        break;
-        case 0x04 : ComOut( CGM_LEVEL1, "Begin Picture Body" )
-            mbPictureBody = sal_True;
-        break;
-        case 0x05 : ComOut( CGM_LEVEL1, "   End Picture" )
-        {
-            if ( mbPicture )
-            {
-                if ( mpBitmapInUse )                            // vorhandene grafik verarbeiten,
-                {
-                    CGMBitmapDescriptor* pBmpDesc = mpBitmapInUse->GetBitmap();
-                    // irgendetwas mit der Bitmap anfangen
-                    mpOutAct->DrawBitmap( pBmpDesc );
-                    delete mpBitmapInUse;
-                    mpBitmapInUse = NULL;
-                }
-                mpOutAct->EndFigure();                          // eventuelle figuren schliessen
-                mpOutAct->EndGrouping();                        // eventuelle gruppierungen noch abschliessen
-                *pElement = *pCopyOfE;
-                mbFigure = mbFirstOutPut = mbPicture = mbPictureBody = sal_False;
-            }
-            else
-                mbStatus = sal_False;
-        }
-        break;
-        case 0x06 : ComOut( CGM_LEVEL2, "Begin Segment" )
-            pElement->bSegmentCount = sal_True;
-        break;
-        case 0x07 : ComOut( CGM_LEVEL2, "End Segment" )
-            pElement->bSegmentCount = sal_True;
-        break;
-        case 0x08 : ComOut( CGM_LEVEL2, "Begin Figure" )
-            mbFigure = sal_True;
-            mpOutAct->BeginFigure();
-        break;
-        case 0x09 : ComOut( CGM_LEVEL2, "End Figure" )
-            mpOutAct->EndFigure();
-            mbFigure = sal_False;
-        break;
-        case 0x0d : ComOut( CGM_LEVEL3, "Begin Protection Region" ) break;
-        case 0x0e : ComOut( CGM_LEVEL3, "End Protection Region" ) break;
-        case 0x0f : ComOut( CGM_LEVEL3, "Begin Compound Line" ) break;
-        case 0x10 : ComOut( CGM_LEVEL3, "End Compound Line" ) break;
-        case 0x11 : ComOut( CGM_LEVEL3, "Begin Compound Text Path" ) break;
-        case 0x12 : ComOut( CGM_LEVEL3, "End Compound Text Path" ) break;
-        case 0x13 : ComOut( CGM_LEVEL3, "Begin Tile Array" ) break;                 // NS
-        case 0x14 : ComOut( CGM_LEVEL3, "End Tile Array" ) break;                   // NS
-        case 0xff : ComOut( CGM_GDSF_ONLY, "Filter Setup" ) break;
-        case 0xfe : ComOut( CGM_GDSF_ONLY, "Begin Block Text Region" ) break;
-        case 0xfd : ComOut( CGM_GDSF_ONLY, "End Block Text Region" ) break;
-        case 0xfc : ComOut( CGM_GDSF_ONLY, "Begin Group" )
-            mpOutAct->BeginGroup();
-        break;
-        case 0xfb : ComOut( CGM_GDSF_ONLY, "End Group" )
-            mpOutAct->EndGroup();
-        break;
-        case 0xfa : ComOut( CGM_GDSF_ONLY, "Begin Patch" ) break;
-        case 0xf9 : ComOut( CGM_GDSF_ONLY, "Begin Patch" ) break;
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-    }
-};
-
-
diff --git a/goodies/source/filter.vcl/icgm/class1.cxx b/goodies/source/filter.vcl/icgm/class1.cxx
deleted file mode 100644
index cbe86633cd21..000000000000
--- a/goodies/source/filter.vcl/icgm/class1.cxx
+++ /dev/null
@@ -1,234 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: class1.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <main.hxx>
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass1()
-{
-    long    nInteger, nI0, nI1;
-    sal_uInt32  nUInteger;
-
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_LEVEL1, "Metafile Version" )
-            pElement->nMetaFileVersion = ImplGetI( pElement->nIntegerPrecision );
-        break;
-        case 0x02 : ComOut( CGM_LEVEL1, "Metafile Description" ) break;
-        case 0x03 : ComOut( CGM_LEVEL1, "VDC Type" )
-        {
-            nUInteger = ImplGetUI16();
-            switch( nUInteger )
-            {
-                case 0 : pElement->eVDCType = VDC_INTEGER; break;
-                case 1 : pElement->eVDCType = VDC_REAL; break;
-                default: mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x04 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Integer Precision" )
-        {
-            nInteger = ImplGetI( pElement->nIntegerPrecision );
-            switch ( nInteger )
-            {
-                case 32 :
-                case 24 :
-                case 16 :
-                case 8 : pElement->nIntegerPrecision = nInteger >> 3; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x05 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Real Precision" )
-        {
-            nUInteger = ImplGetUI16( 4 );
-            nI0 = ImplGetI( pElement->nIntegerPrecision );  // exponent
-            nI1 = ImplGetI( pElement->nIntegerPrecision );  // mantisse
-            switch( nUInteger )
-            {
-                case 0 :
-                    pElement->eRealPrecision = RP_FLOAT;
-                    switch ( nI0 )
-                    {
-                        case 9 :
-                            if ( nI1 != 23 )
-                                mbStatus = sal_False;
-                            pElement->nRealSize = 4;
-                            break;
-                        case 12 :
-                            if ( nI1 != 52 )
-                                mbStatus =sal_False;
-                            pElement->nRealSize = 8;
-                            break;
-                        default:
-                            mbStatus = sal_False;
-                            break;
-                    }
-                    break;
-                case 1 :
-                    pElement->eRealPrecision = RP_FIXED;
-                    if ( nI0 != nI1 )
-                        mbStatus = sal_False;
-                    if ( nI0 == 16 )
-                        pElement->nRealSize = 4;
-                    else if ( nI0 == 32 )
-                        pElement->nRealSize = 8;
-                    else
-                        mbStatus = sal_False;
-                    break;
-                default :
-                    mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x06 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Index Precision" )
-        {
-            nInteger = ImplGetI( pElement->nIntegerPrecision );
-            switch ( nInteger )
-            {
-                case 32 :
-                case 24 :
-                case 16 :
-                case 8 : pElement->nIndexPrecision = nInteger >> 3; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x07 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Color Precision" )
-        {
-            nInteger = ImplGetI( pElement->nIntegerPrecision );
-            switch ( nInteger )
-            {
-                case 32 :
-                case 24 :
-                case 16 :
-                case 8 : pElement->nColorPrecision = nInteger >> 3; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x08 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Color Index Precision" )
-        {
-            nInteger = ImplGetI( pElement->nIntegerPrecision );
-            switch ( nInteger )
-            {
-                case 32 :
-                case 24 :
-                case 16 :
-                case 8 : pElement->nColorIndexPrecision = nInteger >> 3; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x09 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Maximum Colour Index" )
-        {
-            pElement->nColorMaximumIndex = ImplGetUI( pElement->nColorIndexPrecision );
-            if ( ( pElement->nColorMaximumIndex > 256 /*255*/ ) || ( pElement->nColorMaximumIndex == 0 ) )
-                mbStatus = sal_False;
-        }
-        break;
-        case 0x0a : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Color Value Extent" )
-        {
-            if ( pElement->eColorModel == CM_RGB )
-                nI1 = 6;
-            else
-            {
-                nI1 = 8;
-                mbStatus = sal_False;                               // CMYK is not supported
-            }
-            for ( nI0 = 0; nI0 < nI1; nI0++ )
-            {
-                pElement->nColorValueExtent[ nI0 ] = (sal_uInt8)ImplGetUI( pElement->nColorPrecision );
-            }
-        }
-        break;
-        case 0x0b : ComOut( CGM_LEVEL1, "MetaFile Element List" ) break;
-        case 0x0c : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "MetaFile Default Replacement" )
-        {
-            if ( mnElementSize > 1 )
-            {
-                sal_Int8* pBuf = new sal_Int8[ mnElementSize ];
-                if ( pBuf )
-                {
-                    memcpy( pBuf, mpSource, mnElementSize );
-                    maDefRepList.Insert( pBuf, LIST_APPEND );
-                    maDefRepSizeList.Insert( (void*)mnElementSize, LIST_APPEND );
-                }
-            }
-            mnParaSize = mnElementSize;
-        }
-        break;
-        case 0x0d : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Font List" )
-        {
-            while ( mnParaSize < mnElementSize )
-            {
-                sal_uInt32 nSize;
-                nSize = ImplGetUI( 1 );
-                pElement->aFontList.InsertName( mpSource + mnParaSize, nSize );
-                mnParaSize += nSize;
-            }
-        }
-        break;
-        case 0x0e : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Character Set List" )
-        {
-            while ( mnParaSize < mnElementSize )
-            {
-                sal_uInt32 nCharSetType;
-                sal_uInt32 nSize;
-                nCharSetType = ImplGetUI16();
-                nSize = ImplGetUI( 1 );
-                pElement->aFontList.InsertCharSet( (CharSetType)nCharSetType, mpSource + mnParaSize, nSize );
-                mnParaSize += nSize;
-            }
-        }
-        break;
-        case 0x0f : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Character Coding Announcer" )
-            pElement->eCharacterCodingA = (CharacterCodingA)ImplGetUI16();
-        break;
-        case 0x10 : ComOut( CGM_LEVEL2, "Name Precision" ) break;                   // NS
-        case 0x11 : ComOut( CGM_LEVEL2, "Maximum VDC Extent" ) break;               // NS
-        case 0x12 : ComOut( CGM_LEVEL2, "Segment Priority Extent" ) break;          // NS
-        case 0x13 : ComOut( CGM_LEVEL3, "Color Model" ) break;                      // NS
-        case 0x14 : ComOut( CGM_LEVEL3, "Color Calibration" ) break;                // NS
-        case 0x15 : ComOut( CGM_LEVEL3, "Font Properties" ) break;                  // NS
-        case 0x16 : ComOut( CGM_LEVEL3, "Glyph Mapping" ) break;                    // NS
-        case 0x17 : ComOut( CGM_LEVEL3, "Symbol Library List" ) break;              // NS
-        case 0xfc : ComOut( CGM_GDSF_ONLY, "Inquire Function Support" ) break;
-        case 0xfa : ComOut( CGM_GDSF_ONLY, "End Metafile Defaults Replacement" ) break;
-        case 0xf8 : ComOut( CGM_GDSF_ONLY, "Set Color Value Desc Extent" ) break;
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-    }
-};
-
-
diff --git a/goodies/source/filter.vcl/icgm/class2.cxx b/goodies/source/filter.vcl/icgm/class2.cxx
deleted file mode 100644
index 9e0f4d854bbf..000000000000
--- a/goodies/source/filter.vcl/icgm/class2.cxx
+++ /dev/null
@@ -1,230 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: class2.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <main.hxx>
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass2()
-{
-    sal_uInt32  nUInteger;
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Scaling Mode" )
-        {
-            if ( mnElementSize )    // HACK (NASA.CGM)
-            {
-                switch( ImplGetUI16() )
-                {
-                    case 0 : pElement->eScalingMode = SM_ABSTRACT; break;
-                    case 1 : pElement->eScalingMode = SM_METRIC; break;
-                    default : mbStatus = sal_False; break;
-                }
-                pElement->nScalingFactor = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-                ImplSetMapMode();
-            }
-        }
-        break;
-        case 0x02 : ComOut( CGM_LEVEL1, "Color Selection Mode" )
-        {
-            nUInteger = ImplGetUI16();
-            switch( nUInteger )
-            {
-                case 0 : pElement->eColorSelectionMode = CSM_INDEXED; break;
-                case 1 : pElement->eColorSelectionMode = CSM_DIRECT; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x03 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Line Width Specification Mode" )
-        {
-            nUInteger = ImplGetUI16();
-            switch( nUInteger )
-            {
-                case 0 : pElement->eLineWidthSpecMode = SM_ABSOLUTE; break;
-                case 1 : pElement->eLineWidthSpecMode = SM_SCALED; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x04 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Marker Size Specification Mode" )
-        {
-            nUInteger = ImplGetUI16();
-            switch( nUInteger )
-            {
-                case 0 : pElement->eMarkerSizeSpecMode = SM_ABSOLUTE; break;
-                case 1 : pElement->eMarkerSizeSpecMode = SM_SCALED; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x05 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Edge Width Specification Mode" )
-        {
-            nUInteger = ImplGetUI16();
-            switch( nUInteger )
-            {
-                case 0 : pElement->eEdgeWidthSpecMode = SM_ABSOLUTE; break;
-                case 1 : pElement->eEdgeWidthSpecMode = SM_SCALED; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x06 : ComOut( CGM_LEVEL1, "VDC Extent" )
-        {
-            ImplGetRectangleNS( pElement->aVDCExtent );
-            ImplSetMapMode();
-        }
-        break;
-        case 0x07 : ComOut( CGM_LEVEL1, "Background Color" )
-            pElement->nBackGroundColor = ImplGetBitmapColor( sal_True );
-        break;
-        case 0x08 : ComOut( CGM_LEVEL2, "Device Viewport" )
-        {
-            if ( pElement->eVDCType == VDC_INTEGER )
-                ImplGetRectangle( pElement->aDeviceViewPort );
-                ImplSetMapMode();
-        }
-        break;
-        case 0x09 : ComOut( CGM_LEVEL2, "Device Viewport Specification Mode" )
-        {
-            nUInteger = ImplGetUI16( 8 );
-            switch( nUInteger )
-            {
-                case 0 : pElement->eDeviceViewPortMode = DVPM_FRACTION; break;
-                case 1 : pElement->eDeviceViewPortMode = DVPM_METRIC; break;
-                case 2 : pElement->eDeviceViewPortMode = DVPM_DEVICE; break;
-                default : mbStatus = sal_False; break;
-            }
-            pElement->nDeviceViewPortScale = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            ImplSetMapMode();
-        }
-        break;
-        case 0x0a : ComOut( CGM_LEVEL2, "Device Viewport Mapping" )
-        {
-            switch( ImplGetUI16() )
-            {
-                case 0 : pElement->eDeviceViewPortMap = DVPM_NOT_FORCED; break;
-                case 1 : pElement->eDeviceViewPortMap = DVPM_FORCED; break;
-                default : mbStatus = sal_False; break;
-            }
-            switch( ImplGetUI16() )
-            {
-                case 0 : pElement->eDeviceViewPortMapH = DVPMH_LEFT; break;
-                case 1 : pElement->eDeviceViewPortMapH = DVPMH_CENTER; break;
-                case 2 : pElement->eDeviceViewPortMapH = CVPMH_RIGHT; break;
-                default : mbStatus = sal_False; break;
-            }
-            switch( ImplGetUI16() )
-            {
-                case 0 : pElement->eDeviceViewPortMapV = DVPMV_BOTTOM; break;
-                case 1 : pElement->eDeviceViewPortMapV = DVPMV_CENTER; break;
-                case 2 : pElement->eDeviceViewPortMapV = DVPMV_TOP; break;
-                default : mbStatus = sal_False; break;
-            }
-            ImplSetMapMode();
-        }
-        break;
-        case 0x0b : ComOut( CGM_LEVEL2, "Line Representation" )
-        {
-            LineBundle  aTempLineBundle;
-            aTempLineBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
-            aTempLineBundle.eLineType = (LineType)ImplGetI( pElement->nIndexPrecision );
-            aTempLineBundle.nLineWidth = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            aTempLineBundle.SetColor( ImplGetBitmapColor() );
-            pElement->InsertBundle( pElement->aLineList, aTempLineBundle );
-        }
-        break;
-        case 0x0c : ComOut( CGM_LEVEL2, "Marker Representation" )
-        {
-            MarkerBundle aTempMarkerBundle;
-            aTempMarkerBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
-            aTempMarkerBundle.eMarkerType = (MarkerType)ImplGetI( pElement->nIndexPrecision );
-            aTempMarkerBundle.nMarkerSize = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            aTempMarkerBundle.SetColor( ImplGetBitmapColor() );
-            pElement->InsertBundle( pElement->aMarkerList, aTempMarkerBundle );
-        }
-        break;
-        case 0x0d : ComOut( CGM_LEVEL2, "Text Representation" )
-        {
-            TextBundle aTempTextBundle;
-            aTempTextBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
-            aTempTextBundle.nTextFontIndex = ImplGetI( pElement->nIndexPrecision );
-            aTempTextBundle.eTextPrecision = (TextPrecision)ImplGetI( pElement->nIndexPrecision );
-            aTempTextBundle.nCharacterSpacing = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            aTempTextBundle.nCharacterExpansion = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            aTempTextBundle.SetColor( ImplGetBitmapColor() );
-            pElement->InsertBundle( pElement->aTextList, aTempTextBundle );
-        }
-        break;
-        case 0x0e : ComOut( CGM_LEVEL2, "Fill Representation" )
-        {
-            FillBundle aTempFillBundle;
-            aTempFillBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
-            aTempFillBundle.eFillInteriorStyle = (FillInteriorStyle)ImplGetI( pElement->nIndexPrecision );
-            aTempFillBundle.SetColor( ImplGetBitmapColor() );
-            aTempFillBundle.nFillPatternIndex = ImplGetI( pElement->nIndexPrecision );
-            aTempFillBundle.nFillHatchIndex = ImplGetI( pElement->nIndexPrecision );
-            pElement->InsertBundle( pElement->aFillList, aTempFillBundle );
-        }
-        break;
-        case 0x0f : ComOut( CGM_LEVEL2, "Edge Representation" )
-        {
-            EdgeBundle aTempEdgeBundle;
-            aTempEdgeBundle.SetIndex( ImplGetI( pElement->nIndexPrecision ) );
-            aTempEdgeBundle.eEdgeType = (EdgeType)ImplGetI( pElement->nIndexPrecision );
-            aTempEdgeBundle.nEdgeWidth = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            aTempEdgeBundle.SetColor( ImplGetBitmapColor() );
-            pElement->InsertBundle( pElement->aEdgeList, aTempEdgeBundle );
-        }
-        break;
-        case 0x10 : ComOut( CGM_LEVEL3, "Interior Style Specification Mode" ) break;    // NS
-        case 0x11 : ComOut( CGM_LEVEL3, "Line and Edge Type Definition" ) break;
-        case 0x12 : ComOut( CGM_LEVEL3, "Hatch Style Definition" ) break;               // NS
-        case 0x13 : ComOut( CGM_LEVEL3, "Geometric Pattern Definition" ) break;         // NS
-        case 0xff : ComOut( CGM_GDSF_ONLY, "inquire VDC EXTENT" ) break;
-        case 0xfe : ComOut( CGM_GDSF_ONLY, "inquire Background Color" ) break;
-        case 0xfd : ComOut( CGM_GDSF_ONLY, "inquire Device Viewport" ) break;
-        case 0xfc : ComOut( CGM_GDSF_ONLY, "set Font Selection Mode" ) break;
-        case 0xfb : ComOut( CGM_GDSF_ONLY, "inquire Color Selection Mode" ) break;
-        case 0xfa : ComOut( CGM_GDSF_ONLY, "inquire Font Selection Mode" ) break;
-        case 0xf9 : ComOut( CGM_GDSF_ONLY, "set Char Height Spec Mode" )
-        {
-            ImplGetUI16(); // -Wall is this really needed?
-        }
-        break;
-        case 0xf8 : ComOut( CGM_GDSF_ONLY, "set Background Style" ) break;
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-    }
-};
-
-
diff --git a/goodies/source/filter.vcl/icgm/class3.cxx b/goodies/source/filter.vcl/icgm/class3.cxx
deleted file mode 100644
index 812ca63a3bea..000000000000
--- a/goodies/source/filter.vcl/icgm/class3.cxx
+++ /dev/null
@@ -1,147 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: class3.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <main.hxx>
-#include <outact.hxx>
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass3()
-{
-    sal_uInt32  nUInteger;
-    long    nI0, nI1;
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_LEVEL1, "VDC Integer Precision" )
-        {
-            switch( ImplGetI( pElement->nIntegerPrecision ) )
-            {
-                case 16 : pElement->nVDCIntegerPrecision = 2; break;
-                case 32 : pElement->nVDCIntegerPrecision = 4; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x02 : ComOut( CGM_LEVEL1, "VDC Real Precision" )
-        {
-            nUInteger = ImplGetUI16();
-            nI0 = ImplGetI( pElement->nIntegerPrecision );  // exponent
-            nI1 = ImplGetI( pElement->nIntegerPrecision );  // mantisse
-            switch( nUInteger )
-            {
-                case 0 :
-                    pElement->eVDCRealPrecision = RP_FLOAT;
-                    switch ( nI0 )
-                    {
-                        case 9 :
-                            if ( nI1 != 23 )
-                                mbStatus = sal_False;
-                            pElement->nVDCRealSize = 4;
-                            break;
-                        case 12 :
-                            if ( nI1 != 52 )
-                                mbStatus =sal_False;
-                            pElement->nVDCRealSize = 8;
-                            break;
-                        default:
-                            mbStatus = sal_False;
-                            break;
-                    }
-                    break;
-                case 1 :
-                    pElement->eVDCRealPrecision = RP_FIXED;
-                    if ( nI0 != nI1 )
-                        mbStatus = sal_False;
-                    if ( nI0 == 16 )
-                        pElement->nVDCRealSize = 4;
-                    else if ( nI0 == 32 )
-                        pElement->nVDCRealSize = 8;
-                    else
-                        mbStatus = sal_False;
-                    break;
-                default :
-                    mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x03 : ComOut( CGM_LEVEL1, "Auxiliary Colour" )
-        {
-            pElement->nAuxiliaryColor = ImplGetBitmapColor();
-        }
-        break;
-        case 0x04 : ComOut( CGM_LEVEL1, "Transparency" )
-        {
-            switch( ImplGetUI16() )
-            {
-                case 0 : pElement->eTransparency = T_OFF; break;
-                case 1 : pElement->eTransparency = T_ON; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x05 : ComOut( CGM_LEVEL1, "Clip Rectangle" )
-            ImplGetRectangle( pElement->aClipRect );
-        break;
-        case 0x06 : ComOut( CGM_LEVEL1, "Clip Indicator" )
-        {
-            switch( ImplGetUI16() )
-            {
-                case 0 : pElement->eClipIndicator = CI_OFF; break;
-                case 1 : pElement->eClipIndicator = CI_ON; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x07 : ComOut( CGM_LEVEL2, "Line Clipping Mode" ) break;               // NS
-        case 0x08 : ComOut( CGM_LEVEL2, "Marker Clipping Mode" ) break;             // NS
-        case 0x09 : ComOut( CGM_LEVEL2, "Edge Clipping Mode" ) break;               // NS
-        case 0x0a : ComOut( CGM_LEVEL2, "New Region" )
-            mpOutAct->NewRegion();
-        break;
-        case 0x0b : ComOut( CGM_LEVEL2, "Save Primitive Context" ) break;           // NS
-        case 0x0c : ComOut( CGM_LEVEL2, "Restore Primitive Context" ) break;        // NS
-        case 0x11 : ComOut( CGM_LEVEL3, "Protection Region Indicator" ) break;
-        case 0x12 : ComOut( CGM_LEVEL3, "Generalized Text Path Mode" ) break;       // NS
-        case 0x13 : ComOut( CGM_LEVEL3, "Mitre Limit" )
-            pElement->nMitreLimit = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-        break;                                                                      // NS
-        case 0x14 : ComOut( CGM_LEVEL3, "Transparent Cell Color" ) break;           // NS
-        case 0xfc : ComOut( CGM_GDSF_ONLY, "Text Path Alignment Modes" ) break;
-        case 0xfd : ComOut( CGM_GDSF_ONLY, "Pop Transformation Stack" ) break;
-        case 0xfe : ComOut( CGM_GDSF_ONLY, "Push Transformation Stack" ) break;
-        case 0xff : ComOut( CGM_GDSF_ONLY, "Set Patch ID" ) break;
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-    }
-};
-
-
diff --git a/goodies/source/filter.vcl/icgm/class4.cxx b/goodies/source/filter.vcl/icgm/class4.cxx
deleted file mode 100644
index ee63d9636696..000000000000
--- a/goodies/source/filter.vcl/icgm/class4.cxx
+++ /dev/null
@@ -1,864 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: class4.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <main.hxx>
-#include <chart.hxx>
-#include <outact.hxx>
-#include <math.h>
-
-using namespace ::com::sun::star;
-
-double CGM::ImplGetOrientation( FloatPoint& rCenter, FloatPoint& rPoint )
-{
-    double fOrientation;
-
-    double nX = rPoint.X - rCenter.X;
-    double nY = rPoint.Y - rCenter.Y;
-
-    fOrientation = acos( nX / sqrt( nX * nX + nY * nY ) ) * 57.29577951308;
-    if ( nY > 0 )
-        fOrientation = 360 - fOrientation;
-
-    return fOrientation;
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle )
-{
-    double nTemp;
-    nTemp = rStartAngle;
-    rStartAngle = rEndAngle;
-    rEndAngle = nTemp;
-}
-
-// ---------------------------------------------------------------
-
-void CGM::ImplGetVector( double* pVector )
-{
-    if ( pElement->eVDCType == VDC_REAL )
-    {
-        for ( sal_uInt32 i = 0; i < 4; i++ )
-        {
-            pVector[ i ] = (double)ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-        }
-    }
-    else
-    {
-        for ( sal_uInt32 i = 0; i < 4; i++ )
-        {
-            pVector[ i ] = (double)ImplGetI( pElement->nVDCIntegerPrecision );
-        }
-    }
-    pVector[ 0 ] *= mnVDCXmul;
-    pVector[ 2 ] *= mnVDCXmul;
-    pVector[ 1 ] *= mnVDCYmul;
-    pVector[ 3 ] *= mnVDCYmul;
-}
-
-// ---------------------------------------------------------------
-sal_Bool CGM::ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double& rAngle )
-{
-    FloatPoint  aPoint1, aPoint2;
-    double      fRot1, fRot2;
-    ImplGetPoint( rCenter, sal_True );
-    ImplGetPoint( aPoint1, sal_True );
-    ImplGetPoint( aPoint2, sal_True );
-    fRot1 = ImplGetOrientation( rCenter, aPoint1 );
-    fRot2 = ImplGetOrientation( rCenter, aPoint2 );
-    rAngle = ImplGetOrientation( rCenter, aPoint1 );
-    aPoint1.X -= rCenter.X;
-    aPoint1.Y -= rCenter.Y;
-    rRadius.X = sqrt( aPoint1.X * aPoint1.X + aPoint1.Y * aPoint1.Y );
-    aPoint2.X -= rCenter.X;
-    aPoint2.Y -= rCenter.Y;
-    rRadius.Y = sqrt( aPoint2.X * aPoint2.X + aPoint2.Y * aPoint2.Y );
-
-    if ( fRot1 > fRot2 )
-    {
-        if ( ( fRot1 - fRot2 ) < 180 )
-            return sal_False;
-    }
-    else
-    {
-        if ( ( fRot2 - fRot1 ) > 180 )
-            return sal_False;
-    }
-    return sal_True;
-}
-
-void CGM::ImplDoClass4()
-{
-    if ( mbFirstOutPut )
-        mpOutAct->FirstOutPut();
-
-    if ( mpBitmapInUse && ( mnElementID != 9 ) )    // vorhandene grafik verarbeiten,
-    {                                               // da jetzt nicht bitmap actions anstehen
-        CGMBitmapDescriptor* pBmpDesc = mpBitmapInUse->GetBitmap();
-        // irgendetwas mit der Bitmap anfangen
-        mpOutAct->DrawBitmap( pBmpDesc );
-        delete mpBitmapInUse;
-        mpBitmapInUse = NULL;
-    }
-
-    if ( ( mpChart == NULL ) || mpChart->IsAnnotation() )
-    {
-        switch ( mnElementID )
-        {
-            case 0x01 : ComOut( CGM_LEVEL1, "PolyLine" )
-            {
-                sal_uInt32 nPoints = mnElementSize / ImplGetPointSize();
-                Polygon aPolygon( (sal_uInt16)nPoints );
-                for ( sal_uInt16 i = 0; i < nPoints; i++)
-                {
-                    FloatPoint  aFloatPoint;
-                    ImplGetPoint( aFloatPoint, sal_True );
-                    aPolygon.SetPoint( Point( (long)aFloatPoint.X, (long)aFloatPoint.Y ), i );
-                }
-                if ( mbFigure )
-                    mpOutAct->RegPolyLine( aPolygon );
-                else
-                    mpOutAct->DrawPolyLine( aPolygon );
-            }
-            break;
-
-            case 0x02 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Disjoint PolyLine" )
-            {
-                USHORT nPoints = sal::static_int_cast< USHORT >(
-                    mnElementSize / ImplGetPointSize());
-                if ( ! ( nPoints & 1 ) )
-                {
-                    nPoints >>= 1;
-                    FloatPoint  aFloatPoint;
-                    if ( mbFigure )
-                    {
-                        Polygon aPolygon( nPoints );
-                        for ( sal_uInt16 i = 0; i < nPoints; i++ )
-                        {
-                            ImplGetPoint( aFloatPoint, sal_True );
-                            aPolygon.SetPoint( Point( (long)aFloatPoint.X, (long)aFloatPoint.Y ), 0 );
-                        }
-                        mpOutAct->RegPolyLine( aPolygon );
-                    }
-                    else
-                    {
-                        mpOutAct->BeginGroup();
-                        Polygon aPolygon( (sal_uInt16)2 );
-                        for ( sal_uInt16 i = 0; i < nPoints; i++ )
-                        {
-                            ImplGetPoint( aFloatPoint, sal_True );
-                            aPolygon.SetPoint( Point( (long)aFloatPoint.X, (long)aFloatPoint.Y ), 0 );
-                            ImplGetPoint( aFloatPoint, sal_True );
-                            aPolygon.SetPoint( Point( (long)aFloatPoint.X, (long)aFloatPoint.Y ), 1);
-                            mpOutAct->DrawPolyLine( aPolygon );
-                        }
-                        mpOutAct->EndGroup();
-                    }
-                }
-            }
-            break;
-
-            case 0x03 : ComOut( CGM_LEVEL1, "PolyMarker" ) break;
-            case 0x04 : ComOut( CGM_LEVEL1, "Text" )
-            {
-                FloatPoint  aFloatPoint;
-                sal_uInt32      nType, nSize;
-
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                ImplGetPoint ( aFloatPoint, sal_True );
-                nType = ImplGetUI16( 4 );
-                nSize = ImplGetUI( 1 );
-                mpSource[ mnParaSize + nSize ] = 0;
-
-                ComOut( CGM_DESCRIPTION, (char*)mpSource + mnParaSize );
-
-                awt::Size aSize;
-                awt::Point aPoint( (long)aFloatPoint.X, (long)aFloatPoint.Y );
-                mpOutAct->DrawText( aPoint, aSize,
-                                (char*)mpSource + mnParaSize, nSize, (FinalFlag)nType );
-//              mnParaSize += nSize;
-                mnParaSize = mnElementSize;
-            }
-            break;
-
-            case 0x05 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Restricted Text" )
-            {
-                double      dx, dy;
-                FloatPoint  aFloatPoint;
-                sal_uInt32      nType, nSize;
-
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                if ( pElement->eVDCType == VDC_REAL )
-                {
-                    dx = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                    dy = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                }
-                else
-                {
-                    dx = (double)ImplGetI( pElement->nVDCIntegerPrecision );
-                    dy = (double)ImplGetI( pElement->nVDCIntegerPrecision );
-                }
-                ImplMapDouble( dx );
-                ImplMapDouble( dy );
-
-                ImplGetPoint ( aFloatPoint, sal_True );
-                nType = ImplGetUI16( 4 );
-                nSize = ImplGetUI( 1 );
-
-                mpSource[ mnParaSize + nSize ] = 0;
-
-                ComOut( CGM_DESCRIPTION, (char*)mpSource + mnParaSize );
-
-                awt::Point aPoint( (long)aFloatPoint.X, (long)aFloatPoint.Y );
-                awt::Size aSize((long)dx, (long)dy);
-                mpOutAct->DrawText( aPoint, aSize ,
-                                (char*)mpSource + mnParaSize, nSize, (FinalFlag)nType );
-//              mnParaSize += nSize;
-                mnParaSize = mnElementSize;
-            }
-            break;
-
-            case 0x06 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Append Text" )
-            {
-                sal_uInt32 nSize;
-                sal_uInt32 nType = ImplGetUI16( 4 );
-
-                nSize = ImplGetUI( 1 );
-                mpSource[ mnParaSize + nSize ] = 0;
-
-                ComOut( CGM_DESCRIPTION, (char*)mpSource + mnParaSize );
-
-                mpOutAct->AppendText( (char*)mpSource + mnParaSize, nSize, (FinalFlag)nType );
-//              mnParaSize += nSize;
-                mnParaSize = mnElementSize;
-            }
-            break;
-
-            case 0x07 : ComOut( CGM_LEVEL1, "Polygon" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                USHORT nPoints = sal::static_int_cast< USHORT >(
-                    mnElementSize / ImplGetPointSize());
-                Polygon aPolygon( nPoints );
-                for ( USHORT i = 0; i < nPoints; i++)
-                {
-                    FloatPoint  aFloatPoint;
-                    ImplGetPoint( aFloatPoint, sal_True );
-                    aPolygon.SetPoint( Point ( (long)( aFloatPoint.X ), (long)( aFloatPoint.Y ) ), i );
-                }
-                mpOutAct->DrawPolygon( aPolygon );
-            }
-            break;
-
-            case 0x08 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Polygon Set" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                USHORT      nPoints = 0;
-                Point*      pPoints = new Point[ 0x4000 ];
-
-                PolyPolygon aPolyPolygon;
-                FloatPoint  aFloatPoint;
-                sal_uInt32      nEdgeFlag;
-                while ( mnParaSize < mnElementSize )
-                {
-                    ImplGetPoint( aFloatPoint, sal_True );
-                    nEdgeFlag = ImplGetUI16();
-                    pPoints[ nPoints++ ] = Point( (long)aFloatPoint.X, (long)aFloatPoint.Y );
-                    if ( ( nEdgeFlag & 2 ) || ( mnParaSize == mnElementSize ) )
-                    {
-                        Polygon aPolygon( nPoints );
-                        for ( USHORT i = 0; i < nPoints; i++ )
-                        {
-                            aPolygon.SetPoint( pPoints[ i ], i );
-                        }
-                        aPolyPolygon.Insert( aPolygon, POLYPOLY_APPEND );
-                        nPoints = 0;
-                    }
-                }
-                delete[] pPoints;
-                mpOutAct->DrawPolyPolygon( aPolyPolygon );
-            }
-            break;
-
-            case 0x09 : ComOut( CGM_LEVEL1, "Cell Array" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                if ( mpBitmapInUse )
-                {
-                    CGMBitmap* pBmpDesc = mpBitmapInUse->GetNext();
-                    if ( pBmpDesc ) // eventuell bekommen wir eine bitmap zurück, die nicht
-                    {               // zur vorherigen paßt -> diese müssen wir dann auch löschen
-                        mpOutAct->DrawBitmap( pBmpDesc->GetBitmap() );
-                        delete pBmpDesc;
-                    }
-                }
-                else
-                {
-                    mpBitmapInUse = new CGMBitmap( *this );
-                }
-            }
-            break;
-
-            case 0x0a : ComOut( CGM_LEVEL1, "Generalized Drawing Primitive" )
-            {
-                ImplGetI( pElement->nIntegerPrecision );  //-Wall is this needed
-                ImplGetUI( pElement->nIntegerPrecision ); //-Wall is this needed
-                mnParaSize = mnElementSize;
-            }
-            break;
-
-            case 0x0b : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Rectangle" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                FloatRect   aFloatRect;
-                ImplGetRectangle( aFloatRect, sal_True );
-                mpOutAct->DrawRectangle( aFloatRect );
-            }
-            break;
-
-            case 0x0c : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circle" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                double fRotation = 0;
-                FloatPoint aCenter, aRadius;
-                ImplGetPoint( aCenter, sal_True );
-                if ( pElement->eVDCType == VDC_REAL )
-                    aRadius.X = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                else
-                    aRadius.X = (double)ImplGetI( pElement->nVDCIntegerPrecision );
-                ImplMapDouble( aRadius.X );
-                aRadius.Y = aRadius.X;
-                mpOutAct->DrawEllipse( aCenter, aRadius, fRotation );
-            }
-            break;
-
-            case 0x0d : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc 3 Point" )
-            {
-                int     nSwitch = 0;
-
-                FloatPoint aStartingPoint, aIntermediatePoint, aEndingPoint, aCenterPoint;
-                ImplGetPoint( aStartingPoint, sal_True );
-                ImplGetPoint( aIntermediatePoint, sal_True );
-                ImplGetPoint( aEndingPoint, sal_True );
-
-                double fA = aIntermediatePoint.X - aStartingPoint.X;
-                double fB = aIntermediatePoint.Y - aStartingPoint.Y;
-                double fC = aEndingPoint.X - aStartingPoint.X;
-                double fD = aEndingPoint.Y - aStartingPoint.Y;
-
-                double fE = fA * ( aStartingPoint.X + aIntermediatePoint.X ) + fB * ( aStartingPoint.Y + aIntermediatePoint.Y );
-                double fF = fC * ( aStartingPoint.X + aEndingPoint.X ) + fD * ( aStartingPoint.Y + aEndingPoint.Y );
-
-                double fG = 2.0 * ( fA * ( aEndingPoint.Y - aIntermediatePoint.Y ) - fB * ( aEndingPoint.X - aIntermediatePoint.X ) );
-
-                aCenterPoint.X = ( fD * fE - fB * fF ) / fG;
-                aCenterPoint.Y = ( fA * fF - fC * fE ) / fG;
-
-                if ( fG != 0 )
-                {
-                    double fStartAngle = ImplGetOrientation( aCenterPoint, aStartingPoint );
-                    double fInterAngle = ImplGetOrientation( aCenterPoint, aIntermediatePoint );
-                    double fEndAngle = ImplGetOrientation( aCenterPoint, aEndingPoint );
-
-                    if ( fStartAngle > fEndAngle )
-                    {
-                        nSwitch ^=1;
-                        aIntermediatePoint = aEndingPoint;
-                        aEndingPoint = aStartingPoint;
-                        aStartingPoint = aIntermediatePoint;
-                        fG = fStartAngle;
-                        fStartAngle = fEndAngle;
-                        fEndAngle = fG;
-                    }
-                    if ( ! ( fInterAngle > fStartAngle )  && ( fInterAngle < fEndAngle ) )
-                    {
-                        nSwitch ^=1;
-                        aIntermediatePoint = aEndingPoint;
-                        aEndingPoint = aStartingPoint;
-                        aStartingPoint = aIntermediatePoint;
-                        fG = fStartAngle;
-                        fStartAngle = fEndAngle;
-                        fEndAngle = fG;
-                    }
-                    double fRadius = sqrt( pow( ( aStartingPoint.X - aCenterPoint.X ), 2 ) + pow( ( aStartingPoint.Y - aCenterPoint.Y ), 2 ) ) ;
-
-                    if ( mbFigure )
-                    {
-                        Rectangle aBoundingBox( Point( (long)( aCenterPoint.X - fRadius ), long( aCenterPoint.Y - fRadius ) ),
-                            Size( ( static_cast< long >( 2 * fRadius ) ), (long)( 2 * fRadius) ) );
-                        Polygon aPolygon( aBoundingBox, Point( (long)aStartingPoint.X, (long)aStartingPoint.Y ) ,Point( (long)aEndingPoint.X, (long)aEndingPoint.Y ), POLY_ARC );
-                        if ( nSwitch )
-                            mpOutAct->RegPolyLine( aPolygon, sal_True );
-                        else
-                            mpOutAct->RegPolyLine( aPolygon );
-                    }
-                    else
-                    {
-                        fG = 0;
-                        FloatPoint aRadius;
-                        aRadius.X = aRadius.Y = fRadius;
-                        mpOutAct->DrawEllipticalArc( aCenterPoint, aRadius, fG, 2, fStartAngle, fEndAngle );
-                    }
-                }
-            }
-            break;
-
-            case 0x0e : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc 3 Point Close" )
-            {
-                int nSwitch = 0;
-
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                FloatPoint aStartingPoint, aIntermediatePoint, aEndingPoint, aCenterPoint;
-                ImplGetPoint( aStartingPoint );
-                ImplGetPoint( aIntermediatePoint );
-                ImplGetPoint( aEndingPoint );
-
-                double fA = aIntermediatePoint.X - aStartingPoint.X;
-                double fB = aIntermediatePoint.Y - aStartingPoint.Y;
-                double fC = aEndingPoint.X - aStartingPoint.X;
-                double fD = aEndingPoint.Y - aStartingPoint.Y;
-
-                double fE = fA * ( aStartingPoint.X + aIntermediatePoint.X ) + fB * ( aStartingPoint.Y + aIntermediatePoint.Y );
-                double fF = fC * ( aStartingPoint.X + aEndingPoint.X ) + fD * ( aStartingPoint.Y + aEndingPoint.Y );
-
-                double fG = 2.0 * ( fA * ( aEndingPoint.Y - aIntermediatePoint.Y ) - fB * ( aEndingPoint.X - aIntermediatePoint.X ) );
-
-                aCenterPoint.X = ( fD * fE - fB * fF ) / fG;
-                aCenterPoint.Y = ( fA * fF - fC * fE ) / fG;
-
-                if ( fG != 0 )
-                {
-                    double fStartAngle = ImplGetOrientation( aCenterPoint, aStartingPoint );
-                    double fInterAngle = ImplGetOrientation( aCenterPoint, aIntermediatePoint );
-                    double fEndAngle = ImplGetOrientation( aCenterPoint, aEndingPoint );
-
-                    if ( fStartAngle > fEndAngle )
-                    {
-                        nSwitch ^=1;
-                        aIntermediatePoint = aEndingPoint;
-                        aEndingPoint = aStartingPoint;
-                        aStartingPoint = aIntermediatePoint;
-                        fG = fStartAngle;
-                        fStartAngle = fEndAngle;
-                        fEndAngle = fG;
-                    }
-                    if ( ! ( fInterAngle > fStartAngle )  && ( fInterAngle < fEndAngle ) )
-                    {
-                        nSwitch ^=1;
-                        aIntermediatePoint = aEndingPoint;
-                        aEndingPoint = aStartingPoint;
-                        aStartingPoint = aIntermediatePoint;
-                        fG = fStartAngle;
-                        fStartAngle = fEndAngle;
-                        fEndAngle = fG;
-                    }
-                    FloatPoint fRadius;
-                    fRadius.Y = fRadius.X = sqrt( pow( ( aStartingPoint.X - aCenterPoint.X ), 2 ) + pow( ( aStartingPoint.Y - aCenterPoint.Y ), 2 ) ) ;
-
-                    sal_uInt32 nType = ImplGetUI16();
-                    if ( nType == 0 )
-                        nType = 0;          // is PIE
-                    else
-                        nType = 1;          // is CHORD
-
-                    double fOrientation = 0;
-                    mpOutAct->DrawEllipticalArc( aCenterPoint, fRadius, fOrientation, nType, fStartAngle, fEndAngle );
-                }
-            }
-            break;
-
-            case 0x0f : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc Centre" )
-            {
-                double fOrientation, fStartAngle, fEndAngle, vector[ 4 ];
-                FloatPoint aCenter, aRadius;
-
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                ImplGetPoint( aCenter, sal_True );
-                ImplGetVector( &vector[ 0 ] );
-
-                if ( pElement->eVDCType == VDC_REAL )
-                {
-                    aRadius.X = (double)ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                }
-                else
-                {
-                    aRadius.X = (double)ImplGetI( pElement->nVDCIntegerPrecision );
-                }
-
-                ImplMapDouble( aRadius.X );
-                aRadius.Y = aRadius.X;
-
-                fStartAngle = acos( vector[ 0 ] / sqrt( vector[ 0 ] * vector[ 0 ] + vector[ 1 ] * vector[ 1 ] ) ) * 57.29577951308;
-                fEndAngle = acos( vector[ 2 ] / sqrt( vector[ 2 ] * vector[ 2 ] + vector[ 3 ] * vector[ 3 ] ) ) * 57.29577951308;
-
-                if ( vector[ 1 ] > 0 )
-                    fStartAngle = 360 - fStartAngle;
-                if ( vector[ 3 ] > 0 )
-                    fEndAngle = 360 - fEndAngle;
-
-                if ( mbAngReverse )
-                    ImplSwitchStartEndAngle( fStartAngle, fEndAngle );
-
-                if ( mbFigure )
-                {
-                    Rectangle aBoundingBox(
-                        Point( (long)( aCenter.X - aRadius.X ), long( aCenter.Y - aRadius.X ) ),
-                        Size( static_cast< long >( 2 * aRadius.X ), (long)( 2 * aRadius.X ) ) );
-                    Polygon aPolygon( aBoundingBox,
-                        Point( (long)vector[ 0 ], (long)vector[ 1 ] ),
-                        Point( (long)vector[ 2 ], (long)vector[ 3 ] ), POLY_ARC );
-                    mpOutAct->RegPolyLine( aPolygon );
-                }
-                else
-                {
-                    fOrientation = 0;
-                    mpOutAct->DrawEllipticalArc( aCenter, aRadius, fOrientation, 2, fStartAngle, fEndAngle );
-                }
-                mnParaSize = mnElementSize;
-
-            }
-            break;
-
-            case 0x10 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Circular Arc Centre Close" )
-            {
-                double fOrientation, fStartAngle, fEndAngle, vector[ 4 ];
-                FloatPoint aCenter, aRadius;
-
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                ImplGetPoint( aCenter, sal_True );
-                ImplGetVector( &vector[ 0 ] );
-                if ( pElement->eVDCType == VDC_REAL )
-                {
-                    aRadius.X = (double)ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                }
-                else
-                {
-                    aRadius.X = (double)ImplGetI( pElement->nVDCIntegerPrecision );
-                }
-                ImplMapDouble( aRadius.X );
-                aRadius.Y = aRadius.X;
-                fStartAngle = acos( vector[ 0 ] / sqrt( vector[ 0 ] * vector[ 0 ] + vector[ 1 ] * vector[ 1 ] ) ) * 57.29577951308;
-                fEndAngle = acos( vector[ 2 ] / sqrt( vector[ 2 ] * vector[ 2 ] + vector[ 3 ] * vector[ 3 ] ) ) * 57.29577951308;
-
-                if ( vector[ 1 ] > 0 )
-                    fStartAngle = 360 - fStartAngle;
-                if ( vector[ 3 ] > 0 )
-                    fEndAngle = 360 - fEndAngle;
-
-                if ( mbAngReverse )
-                    ImplSwitchStartEndAngle( fStartAngle, fEndAngle );
-
-
-                sal_uInt32 nType = ImplGetUI16();
-                if ( nType == 0 )
-                    nType = 0;          // is PIE
-                else
-                    nType = 1;          // is CHORD
-                fOrientation = 0;
-
-                mpOutAct->DrawEllipticalArc( aCenter, aRadius, fOrientation,
-                            nType, fStartAngle, fEndAngle );
-                mnParaSize = mnElementSize;
-            }
-            break;
-
-            case 0x11 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Ellipse" )
-            {
-                double fOrientation;
-                FloatPoint aCenter, aRadius;
-
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                ImplGetEllipse( aCenter, aRadius, fOrientation ) ;
-                mpOutAct->DrawEllipse( aCenter, aRadius, fOrientation ) ;
-            }
-            break;
-
-            case 0x12 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Elliptical Arc" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                double fOrientation, fStartAngle, fEndAngle, vector[ 4 ];
-                FloatPoint aCenter, aRadius;
-
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                sal_Bool bDirection = ImplGetEllipse( aCenter, aRadius, fOrientation );
-                ImplGetVector( &vector[ 0 ] );
-
-                fStartAngle = acos( vector[ 0 ] / sqrt( vector[ 0 ] * vector[ 0 ] + vector[ 1 ] * vector[ 1 ] ) ) * 57.29577951308;
-                fEndAngle = acos( vector[ 2 ] / sqrt( vector[ 2 ] * vector[ 2 ] + vector[ 3 ] * vector[ 3 ] ) ) * 57.29577951308;
-
-                if ( vector[ 1 ] > 0 )
-                    fStartAngle = 360 - fStartAngle;
-                if ( vector[ 3 ] > 0 )
-                    fEndAngle = 360 - fEndAngle;
-
-                if ( bDirection )
-                    mpOutAct->DrawEllipticalArc( aCenter, aRadius, fOrientation,
-                                2, fStartAngle, fEndAngle );
-                else
-                    mpOutAct->DrawEllipticalArc( aCenter, aRadius, fOrientation,
-                                2, fEndAngle, fStartAngle);
-            }
-            break;
-
-            case 0x13 : ComOut( CGM_LEVEL1 | CGM_EXTENDED_PRIMITIVES_SET, "Elliptical Arc Close" )
-            {
-                double fOrientation, fStartAngle, fEndAngle, vector[ 4 ];
-                FloatPoint aCenter, aRadius;
-
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-
-                sal_Bool bDirection = ImplGetEllipse( aCenter, aRadius, fOrientation );
-                ImplGetVector( &vector[ 0 ] );
-
-                fStartAngle = acos( vector[ 0 ] / sqrt( vector[ 0 ] * vector[ 0 ] + vector[ 1 ] * vector[ 1 ] ) ) * 57.29577951308;
-                fEndAngle = acos( vector[ 2 ] / sqrt( vector[ 2 ] * vector[ 2 ] + vector[ 3 ] * vector[ 3 ] ) ) * 57.29577951308;
-
-                if ( vector[ 1 ] > 0 )
-                    fStartAngle = 360 - fStartAngle;
-                if ( vector[ 3 ] > 0 )
-                    fEndAngle = 360 - fEndAngle;
-
-                sal_uInt32 nType = ImplGetUI16();
-                if ( nType == 0 )
-                    nType = 0;          // is PIE
-                else
-                    nType = 1;          // is CHORD
-
-                if ( bDirection )
-                    mpOutAct->DrawEllipticalArc( aCenter, aRadius, fOrientation,
-                                nType, fStartAngle, fEndAngle );
-                else
-                    mpOutAct->DrawEllipticalArc( aCenter, aRadius, fOrientation,
-                                nType, fEndAngle, fStartAngle);
-            }
-            break;
-            case 0x14 : ComOut( CGM_LEVEL2, "Circular Arc Centre Reversed" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0x15 : ComOut( CGM_LEVEL2, "Connection Edge" )                         // NS
-            {
-//              if ( mbFigure )
-//                  mpOutAct->CloseRegion();
-            }
-            break;
-            case 0x16 : ComOut( CGM_LEVEL3, "Hyperbolic Arc" )                          // NS
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0x17 : ComOut( CGM_LEVEL3, "Parabolic Arc" )                           // NS
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0x18 : ComOut( CGM_LEVEL3, "Non Uniform B-Spline" )                    // NS
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0x19 : ComOut( CGM_LEVEL3, "Non Uniform Rational B-Spline" )           // NS
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0x1a : ComOut( CGM_LEVEL3, "Polybezier" )
-            {
-                sal_uInt32 nOrder = ImplGetI( pElement->nIntegerPrecision );
-
-                USHORT nNumberOfPoints = sal::static_int_cast< USHORT >(( mnElementSize - pElement->nIntegerPrecision ) / ImplGetPointSize());
-
-                Polygon aPolygon( nNumberOfPoints );
-
-                for ( USHORT i = 0; i < nNumberOfPoints; i++)
-                {
-                    FloatPoint  aFloatPoint;
-                    ImplGetPoint( aFloatPoint, sal_True );
-                    aPolygon.SetPoint( Point ( (long)( aFloatPoint.X ), (long)( aFloatPoint.Y ) ), i );
-                }
-                if ( nOrder & 4 )
-                {
-                    for ( USHORT i = 0; i < nNumberOfPoints; i++ )
-                    {
-                        if ( ( i % 3 ) == 0 )
-                            aPolygon.SetFlags( i, POLY_NORMAL );
-                        else
-                            aPolygon.SetFlags( i, POLY_CONTROL );
-                    }
-                }
-                else
-                {
-                    for ( USHORT i = 0; i < nNumberOfPoints; i++ )
-                    {
-                        switch ( i & 3 )
-                        {
-                            case 0 :
-                            case 3 : aPolygon.SetFlags( i, POLY_NORMAL ); break;
-                            default : aPolygon.SetFlags( i, POLY_CONTROL ); break;
-                        }
-                    }
-                }
-                if ( mbFigure )
-                    mpOutAct->RegPolyLine( aPolygon );
-                else
-                    mpOutAct->DrawPolybezier( aPolygon );
-                mnParaSize = mnElementSize;
-            }
-            break;
-
-            case 0x1b : ComOut( CGM_LEVEL3, "Polysymbol" )                              // NS
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0x1c : ComOut( CGM_LEVEL3, "Bitonal Tile" )                            // NS
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0x1d : ComOut( CGM_LEVEL3, "Tile" )                                    // NS
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0x1e : ComOut( CGM_UNKNOWN_LEVEL, "Insert Object" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xff : ComOut( CGM_GDSF_ONLY, "Polybezier" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xfe : ComOut( CGM_GDSF_ONLY, "Sharp Polybezier" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xfd : ComOut( CGM_GDSF_ONLY, "Polyspline" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xfc : ComOut( CGM_GDSF_ONLY, "Reounded Rectangle" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xfb : ComOut( CGM_GDSF_ONLY, "Begin Cell Array" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xfa : ComOut( CGM_GDSF_ONLY, "End Cell Array" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xf9 : ComOut( CGM_GDSF_ONLY, "Insert File" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xf8 : ComOut( CGM_GDSF_ONLY, "Block Text" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xf7 : ComOut( CGM_GDSF_ONLY, "Variable Width Polyline" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xf6 : ComOut( CGM_GDSF_ONLY, "Elliptical Arc 3 Point" )
-            {
-                if ( mbFigure )
-                    mpOutAct->CloseRegion();
-            }
-            break;
-            case 0xf1 : ComOut( CGM_GDSF_ONLY, "Hyperlink Definition" ) break;
-            default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-        }
-    }
-    else
-        mnParaSize = mnElementSize;
-};
-
-
diff --git a/goodies/source/filter.vcl/icgm/class5.cxx b/goodies/source/filter.vcl/icgm/class5.cxx
deleted file mode 100644
index a2b3994cfc9f..000000000000
--- a/goodies/source/filter.vcl/icgm/class5.cxx
+++ /dev/null
@@ -1,527 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: class5.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-//#define VCL_NEED_BASETSD
-
-#include <main.hxx>
-#include <outact.hxx>
-
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass5()
-{
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_LEVEL1, "Line Bundle Index" )
-            pElement->pLineBundle = (LineBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aLineList, pElement->aLineBundle );
-        break;
-        case 0x02 : ComOut( CGM_LEVEL1, "Line Type" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_LINETYPE )
-                pElement->pLineBundle->eLineType = (LineType)ImplGetI( pElement->nIndexPrecision );
-            else
-                pElement->aLineBundle.eLineType = (LineType)ImplGetI( pElement->nIndexPrecision );
-        }
-        break;
-        case 0x03 : ComOut( CGM_LEVEL1, "Line Width" )
-        {
-            double nWidth;
-            if ( pElement->eLineWidthSpecMode == SM_ABSOLUTE )
-            {
-                if ( pElement->eVDCType == VDC_REAL )
-                    nWidth = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                else
-                    nWidth = (double)ImplGetI( pElement->nVDCIntegerPrecision );
-
-                ImplMapDouble( nWidth );
-            }
-            else
-                nWidth = (sal_uInt32)ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ) * 25; // scaling in 1/4 mm
-
-            ( pElement->nAspectSourceFlags & ASF_LINEWIDTH )
-                ? pElement->aLineBundle.nLineWidth = nWidth
-                    : pElement->aLineBundle.nLineWidth = nWidth;
-        }
-        break;
-        case 0x04 : ComOut( CGM_LEVEL1, "Line Color" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_LINECOLOR )
-                pElement->pLineBundle->SetColor( ImplGetBitmapColor() );
-            else
-                pElement->aLineBundle.SetColor( ImplGetBitmapColor() );
-        }
-        break;
-        case 0x05 : ComOut( CGM_LEVEL1, "Marker Bundle Index" )
-            pElement->pMarkerBundle = (MarkerBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aMarkerList, pElement->aMarkerBundle );
-        break;
-        case 0x06 : ComOut( CGM_LEVEL1, "Marker Type" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_MARKERTYPE )
-                pElement->pMarkerBundle->eMarkerType = (MarkerType)ImplGetI( pElement->nIndexPrecision );
-            else
-                pElement->aMarkerBundle.eMarkerType = (MarkerType)ImplGetI( pElement->nIndexPrecision );
-        }
-        break;
-        case 0x07 : ComOut( CGM_LEVEL1, "Marker Size" )
-        {
-            double nWidth;
-            if ( pElement->eMarkerSizeSpecMode == SM_ABSOLUTE )
-            {
-                if ( pElement->eVDCType == VDC_REAL )
-                    nWidth = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                else
-                    nWidth = (double)ImplGetI( pElement->nVDCIntegerPrecision );
-                ImplMapDouble( nWidth );
-            }
-            else
-                nWidth = (sal_uInt32)ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ) * 25;
-            ( pElement->nAspectSourceFlags & ASF_MARKERSIZE )
-                ? pElement->aMarkerBundle.nMarkerSize = nWidth
-                    : pElement->aMarkerBundle.nMarkerSize = nWidth;
-        }
-        break;
-        case 0x08 : ComOut( CGM_LEVEL1, "Marker Color" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_MARKERCOLOR )
-                pElement->pMarkerBundle->SetColor( ImplGetBitmapColor() );
-            else
-                pElement->aMarkerBundle.SetColor( ImplGetBitmapColor() );
-        }
-        break;
-        case 0x09 : ComOut( CGM_LEVEL1, "Text Bundle Index" )
-            pElement->pTextBundle = (TextBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aTextList, pElement->aTextBundle );
-        break;
-        case 0x0a : ComOut( CGM_LEVEL1, "Text Font Index" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_TEXTFONTINDEX )
-                pElement->pTextBundle->nTextFontIndex = ImplGetI( pElement->nIndexPrecision );
-            else
-                pElement->aTextBundle.nTextFontIndex = ImplGetI( pElement->nIndexPrecision );
-        }
-        break;
-        case 0x0b : ComOut( CGM_LEVEL1, "Text Precision" )
-        {
-            TextBundle* pBundle;
-            if ( pElement->nAspectSourceFlags & ASF_TEXTPRECISION )
-                pBundle = pElement->pTextBundle;
-            else
-                pBundle = &pElement->aTextBundle;
-            switch( ImplGetUI16() )
-            {
-                case 0 : pBundle->eTextPrecision = TPR_STRING; break;
-                case 1 : pBundle->eTextPrecision = TPR_CHARACTER; break;
-                case 2 : pBundle->eTextPrecision = TPR_STROKE; break;
-                default : pBundle->eTextPrecision = TPR_UNDEFINED; break;
-            }
-        }
-        break;
-        case 0x0c : ComOut( CGM_LEVEL1, "Character Expansion Factor" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_CHARACTEREXPANSION )
-                pElement->pTextBundle->nCharacterExpansion = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            else
-                pElement->aTextBundle.nCharacterExpansion = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-        }
-        break;
-        case 0x0d : ComOut( CGM_LEVEL1, "Character Spacing" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_CHARACTERSPACING )
-                pElement->pTextBundle->nCharacterSpacing = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            else
-                pElement->aTextBundle.nCharacterSpacing = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-        }
-        break;
-        case 0x0e : ComOut( CGM_LEVEL1, "Text Color" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_TEXTCOLOR )
-                pElement->pTextBundle->SetColor( ImplGetBitmapColor() );
-            else
-                pElement->aTextBundle.SetColor( ImplGetBitmapColor() );
-        }
-        break;
-        case 0x0f : ComOut( CGM_LEVEL1, "Character Height" )
-        {
-                if ( pElement->eVDCType == VDC_INTEGER )
-                    pElement->nCharacterHeight = ImplGetI( pElement->nVDCIntegerPrecision );
-                else // ->floating points
-                    pElement->nCharacterHeight = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                ImplMapDouble( pElement->nCharacterHeight );
-                pElement->nCharacterHeight /= 18.0;
-        }
-        break;
-        case 0x10 : ComOut( CGM_LEVEL1, "Character Orientation" )
-        {
-            if ( pElement->eVDCType == VDC_INTEGER )
-            {
-                pElement->nCharacterOrientation[0] = ImplGetI( pElement->nVDCIntegerPrecision );
-                pElement->nCharacterOrientation[1] = ImplGetI( pElement->nVDCIntegerPrecision );
-                pElement->nCharacterOrientation[2] = ImplGetI( pElement->nVDCIntegerPrecision );
-                pElement->nCharacterOrientation[3] = ImplGetI( pElement->nVDCIntegerPrecision );
-            }
-            else // ->floating points
-            {
-                pElement->nCharacterOrientation[0] = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                pElement->nCharacterOrientation[1] = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                pElement->nCharacterOrientation[2] = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                pElement->nCharacterOrientation[3] = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-            }
-        }
-        break;
-        case 0x11 : ComOut( CGM_LEVEL1, "Text Path" )
-        {
-            switch( ImplGetUI16() )
-            {
-                case 0 : pElement->eTextPath = TPR_RIGHT; break;
-                case 1 : pElement->eTextPath = TPR_LEFT; break;
-                case 2 : pElement->eTextPath = TPR_UP; break;
-                case 3 : pElement->eTextPath = TPR_DOWN; break;
-                default : mbStatus = sal_False; break;
-            }
-        }
-        break;
-        case 0x12 : ComOut( CGM_LEVEL1, "Text Alignment" )
-        {
-            pElement->eTextAlignmentH = (TextAlignmentH)ImplGetUI16();
-            pElement->eTextAlignmentV = (TextAlignmentV)ImplGetUI16( 8 );
-            pElement->nTextAlignmentHCont = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            pElement->nTextAlignmentVCont = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-        }
-        break;
-        case 0x13 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Character Set Index" )
-            pElement->nCharacterSetIndex = ImplGetI( pElement->nIndexPrecision );
-        break;
-        case 0x14 : ComOut( CGM_LEVEL1 | CGM_DRAWING_PLUS_CONTROL_SET, "Alternate Character Set Index" )
-            pElement->nAlternateCharacterSetIndex = ImplGetI( pElement->nIndexPrecision );
-        break;
-        case 0x15 : ComOut( CGM_LEVEL1, "Fill Bundle Index" )
-            pElement->pFillBundle = (FillBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aFillList, pElement->aFillBundle );
-        break;
-        case 0x16 : ComOut( CGM_LEVEL1, "Fill Interior Style" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_FILLINTERIORSTYLE )
-                pElement->pFillBundle->eFillInteriorStyle = (FillInteriorStyle)ImplGetUI16();
-            else
-                pElement->aFillBundle.eFillInteriorStyle = (FillInteriorStyle)ImplGetUI16();
-        }
-        break;
-        case 0x17 : ComOut( CGM_LEVEL1, "Fill Color" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_FILLCOLOR )
-                pElement->pFillBundle->SetColor( ImplGetBitmapColor() );
-            else
-                pElement->aFillBundle.SetColor( ImplGetBitmapColor() );
-        }
-        break;
-        case 0x18 : ComOut( CGM_LEVEL1, "Fill Hatch Index" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_HATCHINDEX )
-                pElement->pFillBundle->nFillHatchIndex = ImplGetI( pElement->nIndexPrecision );
-            else
-                pElement->aFillBundle.nFillHatchIndex = ImplGetI( pElement->nIndexPrecision );
-        }
-        break;
-        case 0x19 : ComOut( CGM_LEVEL1, "Fill Pattern Index" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_PATTERNINDEX )
-                pElement->pFillBundle->nFillPatternIndex = ImplGetI( pElement->nIndexPrecision );
-            else
-                pElement->aFillBundle.nFillPatternIndex = ImplGetI( pElement->nIndexPrecision );
-        }
-        break;
-        case 0x1a : ComOut( CGM_LEVEL1, "Edge Bundle Index" )
-            pElement->pEdgeBundle = (EdgeBundle*)pElement->GetBundleIndex( ImplGetI( pElement->nIndexPrecision ), pElement->aEdgeList, pElement->aEdgeBundle );
-        break;
-        case 0x1b : ComOut( CGM_LEVEL1, "Edge Type" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_EDGETYPE )
-                pElement->pEdgeBundle->eEdgeType = (EdgeType)ImplGetI( pElement->nIndexPrecision );
-            else
-                pElement->aEdgeBundle.eEdgeType = (EdgeType)ImplGetI( pElement->nIndexPrecision );
-        }
-        break;
-        case 0x1c : ComOut( CGM_LEVEL1, "Edge Width" )
-        {
-            double nWidth;
-            if ( pElement->eEdgeWidthSpecMode == SM_ABSOLUTE )
-            {
-                if ( pElement->eVDCType == VDC_REAL )
-                    nWidth = ImplGetFloat( pElement->eVDCRealPrecision, pElement->nVDCRealSize );
-                else
-                    nWidth = (double)ImplGetI( pElement->nVDCIntegerPrecision );
-
-                ImplMapDouble( nWidth );
-            }
-            else
-                nWidth = (sal_uInt32)ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ) * 25;
-            ( pElement->nAspectSourceFlags & ASF_EDGEWIDTH )
-                ? pElement->aEdgeBundle.nEdgeWidth = nWidth
-                    : pElement->aEdgeBundle.nEdgeWidth = nWidth;
-        }
-        break;
-        case 0x1d : ComOut( CGM_LEVEL1, "Edge Color" )
-        {
-            if ( pElement->nAspectSourceFlags & ASF_EDGECOLOR )
-                pElement->pEdgeBundle->SetColor( ImplGetBitmapColor() );
-            else
-                pElement->aEdgeBundle.SetColor( ImplGetBitmapColor() );
-        }
-        break;
-        case 0x1e : ComOut( CGM_LEVEL1, "Edge Visibility" )
-        {
-            switch( ImplGetUI16() )
-            {
-                case 0 : pElement->eEdgeVisibility = EV_OFF; break;
-                case 1 : pElement->eEdgeVisibility = EV_ON; break;
-                default : mbStatus = sal_False;
-            }
-        }
-        break;
-        case 0x1f : ComOut( CGM_LEVEL1, "Fill Reference Point" )
-            ImplGetPoint( pElement->aFillRefPoint );
-        break;
-        case 0x20 : ComOut( CGM_LEVEL1, "Pattern Table" ) break;
-        case 0x21 : ComOut( CGM_LEVEL1, "Pattern Size" ) break;
-        case 0x22 : ComOut( CGM_LEVEL1, "Color Table" )
-        {
-            sal_uInt32 nColorStartIndex = ImplGetUI( pElement->nColorIndexPrecision );
-            if ( ( nColorStartIndex > 255 ) ||
-                ( ( ( mnElementSize - pElement->nColorIndexPrecision ) % ( pElement->nColorPrecision * 3 ) ) != 0 ) )
-            {
-                mbStatus = sal_False;
-            }
-            else
-            {
-                sal_uInt32 nColors = ( mnElementSize - pElement->nColorIndexPrecision ) / ( 3 * pElement->nColorPrecision );
-                if ( nColors )
-                {
-                    sal_uInt32 nMaxColorIndex = nColorStartIndex + nColors - 1;
-                    sal_uInt32 nIndex;
-                    if ( nMaxColorIndex > 255 )
-                    {
-                        mbStatus = sal_False;
-                    }
-                    else
-                    {
-                        if ( pElement->nLatestColorMaximumIndex < nMaxColorIndex )
-                            pElement->nLatestColorMaximumIndex = nMaxColorIndex;
-
-                        for (  nIndex = nColorStartIndex; nIndex <= nMaxColorIndex; nIndex++ )
-                        {
-                            pElement->aLatestColorTable[ nIndex ] = ImplGetBitmapColor( sal_True );
-                        }
-                    }
-                    pElement->nColorMaximumIndex = pElement->nLatestColorMaximumIndex;
-                    for ( nIndex = nColorStartIndex; nIndex <= nMaxColorIndex; nIndex++ )
-                    {
-                        if ( !pElement->aColorTableEntryIs[ nIndex ] )
-                        {
-                            pElement->aColorTableEntryIs[ nIndex ] = 1;
-                            pElement->aColorTable[ nIndex ] = pElement->aLatestColorTable[ nIndex ];
-                        }
-                    }
-                }
-            }
-        }
-        break;
-        case 0x23 : ComOut( CGM_LEVEL1, "Aspect Source Flags" )
-        {
-            int nFlags = mnElementSize >> 2;
-            while ( nFlags-- > 0 )
-            {
-                sal_uInt32 nFlag = 0;
-                switch( ImplGetUI16() )
-                {
-                    case 0 : nFlag = ASF_LINETYPE; break;
-                    case 1 : nFlag = ASF_LINEWIDTH; break;
-                    case 2 : nFlag = ASF_LINECOLOR; break;
-                    case 3 : nFlag = ASF_MARKERTYPE; break;
-                    case 4 : nFlag = ASF_MARKERSIZE; break;
-                    case 5 : nFlag = ASF_MARKERCOLOR; break;
-                    case 6 : nFlag = ASF_FILLINTERIORSTYLE; break;
-                    case 7 : nFlag = ASF_HATCHINDEX; break;
-                    case 8 : nFlag = ASF_PATTERNINDEX; break;
-                    case 9 : nFlag = ASF_BITMAPINDEX; break;
-                    case 10 : nFlag = ASF_FILLCOLOR; break;
-                    case 11 : nFlag = ASF_EDGETYPE; break;
-                    case 12 : nFlag = ASF_EDGEWIDTH; break;
-                    case 13 : nFlag = ASF_EDGECOLOR; break;
-                    case 14 : nFlag = ASF_TEXTFONTINDEX; break;
-                    case 15 : nFlag = ASF_TEXTPRECISION; break;
-                    case 16 : nFlag = ASF_CHARACTEREXPANSION; break;
-                    case 17 : nFlag = ASF_CHARACTERSPACING; break;
-                    case 18 : nFlag = ASF_TEXTCOLOR; break;
-                    default : mbStatus = sal_False; break;
-                }
-                sal_uInt32  nASF = ImplGetUI16();
-                switch ( nASF )
-                {
-                    case 0 : pElement->nAspectSourceFlags &= ~nFlag; break; // INDIVIDUAL
-                    case 1 : pElement->nAspectSourceFlags |= nFlag; break;  // BUNDLED
-                    default : mbStatus = sal_False; break;
-                }
-            }
-        }
-        break;
-        case 0x24 : ComOut( CGM_LEVEL2, "Pick Identifier" ) break;
-        case 0x25 : ComOut( CGM_LEVEL3, "Line Cap" )
-        {
-            switch( ImplGetUI16() )
-            {
-                case 0 : pElement->eLineCapType = LCT_BUTT; break;
-                case 1 : pElement->eLineCapType = LCT_ROUND; break;
-                case 2 : pElement->eLineCapType = LCT_SQUARE; break;
-                case 3 : pElement->eLineCapType = LCT_TRIANGLE; break;
-                case 4 : pElement->eLineCapType = LCT_ARROW; break;
-                default : pElement->eLineCapType = LCT_NONE; break;
-            }
-        }
-        break;
-        case 0x26 : ComOut( CGM_LEVEL3, "Line Join" )
-        {
-            switch( ImplGetUI16() )
-            {
-                case 0 : pElement->eLineJoinType = LJT_MITER; break;
-                case 1 : pElement->eLineJoinType = LJT_ROUND; break;
-                case 2 : pElement->eLineJoinType = LJT_BEVEL; break;
-                default : pElement->eLineJoinType = LJT_NONE; break;
-            }
-        }
-        break;
-        case 0x27 : ComOut( CGM_LEVEL3, "Line Type Continuation" ) break;           // NS
-        case 0x28 : ComOut( CGM_LEVEL3, "Line Type Initial Offset" ) break;         // NS
-        case 0x29 : ComOut( CGM_LEVEL3, "Text Score Type" ) break;
-        case 0x2a : ComOut( CGM_LEVEL3, "Restricted Text Type" ) break;
-        case 0x2b : ComOut( CGM_LEVEL3, "Interpolated interior" ) break;
-        case 0x2c : ComOut( CGM_LEVEL3, "Edge Cap" ) break;                         // NS
-        case 0x2d : ComOut( CGM_LEVEL3, "Edge Join" ) break;
-        case 0x2e : ComOut( CGM_LEVEL3, "Edge Type Continuation" ) break;           // NS
-        case 0x2f : ComOut( CGM_LEVEL3, "Edge Type Initial Offset" ) break;         // NS
-        case 0x30 : ComOut( CGM_LEVEL3, "Symbol Library Index" ) break;             // NS
-        case 0x31 : ComOut( CGM_LEVEL3, "Symbol Color" ) break;                     // NS
-        case 0x32 : ComOut( CGM_LEVEL3, "Symbol Size" ) break;                      // NS
-        case 0x33 : ComOut( CGM_LEVEL3, "Symbol Orientation" ) break;               // NS
-        case 0x50 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Region Margins" ) break;
-        case 0x51 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Region Expansion" ) break;
-        case 0x52 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Region Anchor" ) break;
-        case 0x53 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Horizontal Alignment" ) break;
-        case 0x54 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Vertical Alignment" ) break;
-        case 0x55 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Line Flow" ) break;
-        case 0x60 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Spacing" ) break;
-        case 0x61 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Indent" ) break;
-        case 0x62 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Tabs" ) break;
-        case 0x63 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Bullets" ) break;
-        case 0x64 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Bullet Level" ) break;
-        case 0x65 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Line Horizontal Alignment" ) break;
-        case 0x66 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Line Vertical Alignment" ) break;
-        case 0x67 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragragh Line Spacing" ) break;
-        case 0x68 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Paragraph Word Wrap" ) break;
-        case 0x70 : ComOut( CGM_UNKNOWN_LEVEL, "Block Text Forward Advance Distance" ) break;
-        case 0x71 : ComOut( CGM_UNKNOWN_LEVEL, "Word Spacing" ) break;
-        case 0x72 : ComOut( CGM_UNKNOWN_LEVEL, "External Leading" ) break;
-        case 0x7a : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Offset" )
-        {
-            long nHorzOffset = ImplGetI( pElement->nIndexPrecision );
-            long nVertOffset = ImplGetI( pElement->nIndexPrecision );
-            sal_uInt32 nType = ImplGetUI16();
-            mpOutAct->SetGradientOffset( nHorzOffset, nVertOffset, nType );
-            mnAct4PostReset |= ACT4_GRADIENT_ACTION;
-        }
-        break;
-        case 0x7b : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Edge" )
-        {
-            mnAct4PostReset |= ACT4_GRADIENT_ACTION;
-        }
-        break;
-        case 0x7c : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Angle" )
-        {
-            mpOutAct->SetGradientAngle( ImplGetI( pElement->nIndexPrecision ) );
-            mnAct4PostReset |= ACT4_GRADIENT_ACTION;
-        }
-        break;
-        case 0x7d : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Description" )
-        {
-            ImplGetI( pElement->nIndexPrecision ); // -Wall is this needed?
-            sal_uInt32  nNumberOfStages = ImplGetI( pElement->nIndexPrecision );
-            sal_uInt32  i, nColorFrom = 0;
-            sal_uInt32  nColorTo = 0xffffff;
-
-            //FIXME,  does this loop actually do anything?
-            for ( i = 0; i < nNumberOfStages; i++ )
-            {
-                ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize ); // -Wall is this needed
-            }
-
-            for ( i = 0; i <= nNumberOfStages; i++ )
-            {
-                sal_uInt32 nPara = mnParaSize + 24;
-                if ( i == 0 )
-                {
-                    nColorTo = ImplGetBitmapColor();
-                    nColorFrom = nColorTo ^ 0xffffff;
-                }
-                else if ( i == 1 )
-                    nColorFrom = ImplGetBitmapColor();
-                mnParaSize = nPara;
-            }
-            if ( nNumberOfStages > 1 )
-                mpOutAct->SetGradientStyle( 0xff, 1 );
-
-            mpOutAct->SetGradientDescriptor( nColorFrom, nColorTo );
-            mnAct4PostReset |= ACT4_GRADIENT_ACTION;
-        }
-        break;
-        case 0x7e : ComOut( CGM_UNKNOWN_LEVEL, "set Gradient Style" )
-        {
-            sal_uInt32 nStyle = ImplGetUI16( 8 );
-            double fRatio = ImplGetFloat( pElement->eRealPrecision, pElement->nRealSize );
-            mpOutAct->SetGradientStyle( nStyle, fRatio );
-            mnAct4PostReset |= ACT4_GRADIENT_ACTION;
-        }
-        break;
-        case 0xff : ComOut( CGM_GDSF_ONLY, "inquire Font metrics" ) break;
-        case 0xfe : ComOut( CGM_GDSF_ONLY, "inquire character widths" ) break;
-        case 0xfd : ComOut( CGM_GDSF_ONLY, "set Text Font" ) break;
-        case 0xfc : ComOut( CGM_GDSF_ONLY, "set current position" ) break;
-        case 0xfb : ComOut( CGM_GDSF_ONLY, "set current position mode" ) break;
-        case 0xfa : ComOut( CGM_GDSF_ONLY, "set character height mode" ) break;
-        case 0xf9 : ComOut( CGM_GDSF_ONLY, "set Transform matrix 2D" ) break;
-        case 0xf8 : ComOut( CGM_GDSF_ONLY, "set Transform matrix 3D" ) break;
-        case 0xf7 : ComOut( CGM_GDSF_ONLY, "pop transformation state" ) break;
-        case 0xf6 : ComOut( CGM_GDSF_ONLY, "clear transformation state" ) break;
-        case 0xf5 : ComOut( CGM_GDSF_ONLY, "set character widths" ) break;
-        case 0xf4 : ComOut( CGM_GDSF_ONLY, "set color name - for Pantone support" ) break;
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-    }
-};
-
-
diff --git a/goodies/source/filter.vcl/icgm/class7.cxx b/goodies/source/filter.vcl/icgm/class7.cxx
deleted file mode 100644
index c815822678e5..000000000000
--- a/goodies/source/filter.vcl/icgm/class7.cxx
+++ /dev/null
@@ -1,240 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: class7.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <main.hxx>
-#include <chart.hxx>
-#include <outact.hxx>
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass7()
-{
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_LEVEL1, "Message" ) break;
-        case 0x02 :
-        {
-            sal_uInt8*  pAppData = mpSource + 12;
-            sal_uInt16* pTemp = (sal_uInt16*)mpSource;
-            sal_uInt16 nOpcode = pTemp[ 4 ];
-
-            if ( mpChart || ( nOpcode == 0 ) )
-            {
-                switch ( nOpcode )
-                {
-                    case 0x000 : ComOut( CGM_LEVEL1, "AppData - Beginning of File Opcodes" )
-                    {
-                        if ( mpChart == NULL )
-                            mpChart = new CGMChart( *this );
-                        mpChart->mnCurrentFileType = pAppData[ 3 ];
-                    }
-                    break;
-                    case 0x001 : ComOut( CGM_LEVEL1, "AppData - End of File Opcodes" ) break;
-                    case 0x190 : ComOut( CGM_LEVEL1, "AppData - FDESC" ) break;
-                    case 0x192 : ComOut( CGM_LEVEL1, "AppData - FNOTES" ) break;
-                    case 0x1F4 : ComOut( CGM_LEVEL1, "AppData - BOGENFILE" ) break;
-                    case 0x1F5 : ComOut( CGM_LEVEL1, "AppData - EOGENFILE" ) break;
-                    case 0x1F8 : ComOut( CGM_LEVEL1, "AppData - BOCHTGROUP" ) break;
-                    case 0x1F9 : ComOut( CGM_LEVEL1, "AppData - EOCHTGROUP" ) break;
-                    case 0x1FC : ComOut( CGM_LEVEL1, "AppData - BOCHTDATA" ) break;
-                    case 0x1FD : ComOut( CGM_LEVEL1, "AppData - EOCHTDATA" )
-                    {
-                        mpOutAct->DrawChart();
-                    }
-                    break;
-                    case 0x200 : ComOut( CGM_LEVEL1, "AppData - BOSYMGROUP" ) break;
-                    case 0x201 : ComOut( CGM_LEVEL1, "AppData - EOSYMGROUP" ) break;
-                    case 0x204 : ComOut( CGM_LEVEL1, "AppData - BEGSYMBOL" ) break;
-                    case 0x205 : ComOut( CGM_LEVEL1, "AppData - ENDSYMBOL" ) break;
-                    case 0x208 : ComOut( CGM_LEVEL1, "AppData - BOSHWGROUP" ) break;
-                    case 0x209 : ComOut( CGM_LEVEL1, "AppData - EOSHWGROUP" ) break;
-                    case 0x260 : ComOut( CGM_LEVEL1, "AppData - BEGGROUP" ) break;
-                    case 0x262 : ComOut( CGM_LEVEL1, "AppData - ENDGROUP" ) break;
-                    case 0x264 : ComOut( CGM_LEVEL1, "AppData - DATANODE" )
-                    {
-                        mpChart->mDataNode[ 0 ] = *(DataNode*)( pAppData );
-                        sal_Int8 nZoneEnum = mpChart->mDataNode[ 0 ].nZoneEnum;
-                        if ( nZoneEnum && ( nZoneEnum <= 6 ) )
-                            mpChart->mDataNode[ nZoneEnum ] = *(DataNode*)( pAppData );
-                    }
-                    break;
-                    case 0x2BE : ComOut( CGM_LEVEL1, "AppData - SHWSLIDEREC" )
-                    {
-                        if ( mnMode & CGM_EXPORT_IMPRESS )
-                        {
-                            if ( pAppData[ 16 ] == 0 )      // a blank template ?
-                            {
-                                if ( pAppData[ 2 ] == 46 )
-                                {
-                                    // this starts the document -> maybe we could insert a new document
-                                }
-                                else if ( pAppData[ 2 ] & 0x80 )
-                                {
-                                    // this is a template
-                                }
-                                else
-                                {
-                                    mpOutAct->InsertPage();
-                                }
-                            }
-                            mpChart->ResetAnnotation();
-                        }
-                    }
-                    break;
-                    case 0x2C0 : ComOut( CGM_LEVEL1, "AppData - SHWKEYTABLE" ) break;
-                    case 0x2C2 : ComOut( CGM_LEVEL1, "AppData - SHWBUTTONTAB" ) break;
-                    case 0x2C4 : ComOut( CGM_LEVEL1, "AppData - SHWGLOBAL" ) break;
-                    case 0x2C6 : ComOut( CGM_LEVEL1, "AppData - SHWTITLE" ) break;
-                    case 0x2CA : ComOut( CGM_LEVEL1, "AppData - SHWAPP" ) break;
-                    case 0x320 : ComOut( CGM_LEVEL1, "AppData - TEXT" )
-                    {
-                        TextEntry* pTextEntry = new TextEntry;
-                        pTextEntry->nTypeOfText = *((sal_uInt16*)( pAppData ) );
-                        pTextEntry->nRowOrLineNum = *((sal_uInt16*)( pAppData + 2 ) );
-                        pTextEntry->nColumnNum = *((sal_uInt16*)( pAppData + 4 ) );
-                        sal_uInt16 nAttributes = *( (sal_uInt16*)( pAppData + 6 ) );
-                        pTextEntry->nZoneSize = nAttributes & 0xff;
-                        pTextEntry->nLineType = ( nAttributes >> 8 ) & 0xf;
-                        nAttributes >>= 12;
-                        pTextEntry->nAttributes = nAttributes;
-                        pAppData += 8;
-                        sal_uInt32 nLen = strlen( (char*)( pAppData ) ) + 1;
-                        pTextEntry->pText = new char[ nLen ];
-                        memcpy( pTextEntry->pText, pAppData, nLen );
-                        pAppData += nLen;
-
-                        TextAttribute* pTextOld = 0;
-                        for ( sal_uInt16 i = 0; i < nAttributes; i++ )
-                        {
-                            TextAttribute* pTextAttr = new TextAttribute;
-
-                            *pTextAttr = *(TextAttribute*)( pAppData );
-
-                            pTextAttr->pNextAttribute = NULL;
-                            if ( i == 0 )
-                                pTextEntry->pAttribute = pTextAttr;
-                            else
-                                pTextOld->pNextAttribute = pTextAttr;
-
-                            pAppData += sizeof( TextAttribute ) - 4;
-                            pTextOld = pTextAttr;
-                        }
-                        mpChart->InsertTextEntry( pTextEntry );
-                    }
-                    break;
-                    case 0x321 : ComOut( CGM_LEVEL1, "AppData - IOC_TABS" ) break;
-                    case 0x322 : ComOut( CGM_LEVEL1, "AppData - CHARTZONE" )
-                    {
-                        mpChart->mChartZone = *( ChartZone* )( pAppData );
-                    }
-                    break;
-                    case 0x324 : ComOut( CGM_LEVEL1, "AppData - TITLEZONE" ) break;
-                    case 0x328 : ComOut( CGM_LEVEL1, "AppData - FOOTNOTEZONE" ) break;
-                    case 0x32A : ComOut( CGM_LEVEL1, "AppData - LEGENDZONE" ) break;
-                    case 0x330 : ComOut( CGM_LEVEL1, "AppData - PAGEORIENTDIM" )
-                    {
-                        mpChart->mPageOrientDim = *( PageOrientDim*)( pAppData );
-                    }
-                    break;
-                    case 0x334 : ComOut( CGM_LEVEL1, "AppData - CHTZONEOPTN" )
-                    {
-                        mpChart->mZoneOption = *( ZoneOption*)( pAppData );
-                    }
-                    break;
-                    case 0x336 : ComOut( CGM_LEVEL1, "AppData - CHTINTL" )
-                    {
-                        mpChart->mIntSettings = *( IntSettings*)( pAppData );
-                    }
-                    break;
-                    case 0x338 : ComOut( CGM_LEVEL1, "AppData - CHTLINESPC" ) break;
-                    case 0x384 : ComOut( CGM_LEVEL1, "AppData - ORGGRIDSTATE" ) break;
-                    case 0x386 : ComOut( CGM_LEVEL1, "AppData - ORGSCRSTATE" ) break;
-                    case 0x388 : ComOut( CGM_LEVEL1, "AppData - ORGTREESTATE" ) break;
-                    case 0x38A : ComOut( CGM_LEVEL1, "AppData - ORGTEXTOPTN" ) break;
-                    case 0x38E : ComOut( CGM_LEVEL1, "AppData - ORGBOXOPTN" ) break;
-                    case 0x390 : ComOut( CGM_LEVEL1, "AppData - ORGBOXDIM" ) break;
-                    case 0x392 : ComOut( CGM_LEVEL1, "AppData - ORGBOX" ) break;
-                    case 0x3EA : ComOut( CGM_LEVEL1, "AppData - TTLTEXTOPTN" ) break;
-                    case 0x3EE : ComOut( CGM_LEVEL1, "AppData - TTLAUTOBUILD" ) break;
-                    case 0x44E : ComOut( CGM_LEVEL1, "AppData - BULTEXTOPTN" ) break;
-                    case 0x452 : ComOut( CGM_LEVEL1, "AppData - BULLETOPTN" )
-                    {
-                        mpChart->mBulletOption = *( BulletOption*)( pAppData );
-                    }
-                    break;
-                    case 0x454 : ComOut( CGM_LEVEL1, "AppData - BULLETLINES" )
-                    {
-                        mpChart->mBulletLines = *( BulletLines*)( pAppData );
-                    }
-                    break;
-                    case 0x456 : ComOut( CGM_LEVEL1, "AppData - BULAUTOBUILD" ) break;
-                    case 0x4B2 : ComOut( CGM_LEVEL1, "AppData - TBLTEXTOPTN" ) break;
-                    case 0x4B6 : ComOut( CGM_LEVEL1, "AppData - TBLOPTN" ) break;
-                    case 0x4B8 : ComOut( CGM_LEVEL1, "AppData - TBLCOLOPTN" ) break;
-                    case 0x4BA : ComOut( CGM_LEVEL1, "AppData - TBLLEGENDOPTN" ) break;
-                    case 0x4BC : ComOut( CGM_LEVEL1, "AppData - TBLRANGEOPTN" ) break;
-                    case 0x4BE : ComOut( CGM_LEVEL1, "AppData - TBLROWOPTN" ) break;
-                    case 0x4C0 : ComOut( CGM_LEVEL1, "AppData - TBLAUTOBUILD" ) break;
-                    case 0x518 : ComOut( CGM_LEVEL1, "AppData - PIECHARTOPTN" ) break;
-                    case 0x51A : ComOut( CGM_LEVEL1, "AppData - PIELEGENDOPTN" ) break;
-                    case 0x51C : ComOut( CGM_LEVEL1, "AppData - PIETEXTOPTN" ) break;
-                    case 0x51E : ComOut( CGM_LEVEL1, "AppData - PIEOPTN" ) break;
-                    case 0x520 : ComOut( CGM_LEVEL1, "AppData - PIEPCTLABOPTN" ) break;
-                    case 0x522 : ComOut( CGM_LEVEL1, "AppData - PIEVALLABOPTN" ) break;
-                    case 0x524 : ComOut( CGM_LEVEL1, "AppData - PIESLICE" ) break;
-                    case 0x57A : ComOut( CGM_LEVEL1, "AppData - XYAXISOPTN" ) break;
-                    case 0x57C : ComOut( CGM_LEVEL1, "AppData - XYGRIDOPTN" ) break;
-                    case 0x57D : ComOut( CGM_LEVEL1, "AppData - XYGRIDSHOWFILL" ) break;
-                    case 0x57E : ComOut( CGM_LEVEL1, "AppData - XYSERIESOPTN" ) break;
-                    case 0x580 : ComOut( CGM_LEVEL1, "AppData - XYSTYLEOPTN" ) break;
-                    case 0x582 : ComOut( CGM_LEVEL1, "AppData - XYTABLEOPTN" ) break;
-                    case 0x584 : ComOut( CGM_LEVEL1, "AppData - XYTEXTOPTN" ) break;
-                    case 0x586 : ComOut( CGM_LEVEL1, "AppData - XYDATAOPTN" ) break;
-                    case 0x58A : ComOut( CGM_LEVEL1, "AppData - XYLEGENDOPN" ) break;
-                    case 0x58C : ComOut( CGM_LEVEL1, "AppData - XYCALCULATION" ) break;
-                    case 0x58E : ComOut( CGM_LEVEL1, "AppData - XYXVALUE" ) break;
-                    case 0x590 : ComOut( CGM_LEVEL1, "AppData - XYYVALUE" ) break;
-                    case 0x592 : ComOut( CGM_LEVEL1, "AppData - XYXEXTVALUE" ) break;
-                    case 0x618 : ComOut( CGM_LEVEL1, "AppData - IOC_CHTCOLRTAB" ) break;
-                    case 0x619 : ComOut( CGM_LEVEL1, "AppData - IOC_CHTFONTTAB" ) break;
-                    case 0x1fff : ComOut( CGM_LEVEL1, "AppData - 0x1fff" ) break;
-                    default : ComOut( CGM_LEVEL1, "UNKNOWN Application Data" ) break;
-                }
-            }
-            mnParaSize = mnElementSize;
-            break;
-        }
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-    }
-};
-
diff --git a/goodies/source/filter.vcl/icgm/classx.cxx b/goodies/source/filter.vcl/icgm/classx.cxx
deleted file mode 100644
index 9b75c6d1a3f9..000000000000
--- a/goodies/source/filter.vcl/icgm/classx.cxx
+++ /dev/null
@@ -1,265 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: classx.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <main.hxx>
-#include <outact.hxx>
-
-// ---------------------------------------------------------------
-
-#define ImplSetUnderlineMode()                                  \
-                                                                \
-    sal_uInt32 nMode = ImplGetUI16();                               \
-    switch ( nMode )                                            \
-    {                                                           \
-        case 1 : pElement->eUnderlineMode = UM_LOW; break;      \
-        case 2 : pElement->eUnderlineMode = UM_HIGH; break;     \
-        case 4 : pElement->eUnderlineMode = UM_STRIKEOUT; break;\
-        case 8 : pElement->eUnderlineMode = UM_OVERSCORE; break;\
-        default: pElement->eUnderlineMode = UM_OFF; break;      \
-    }                                                           \
-    pElement->nUnderlineColor = ImplGetBitmapColor();
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass6()
-{
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_LEVEL1, "Escape" )
-        {
-            long    nIdentifier = ImplGetI( pElement->nIntegerPrecision );
-            switch ( nIdentifier )
-            {
-                case 0 : ComOut( CGM_DESCRIPTION, "inquire function support" ) break;
-                case -1 : ComOut( CGM_DESCRIPTION, "set underline mode" )
-                {
-                    ImplSetUnderlineMode()
-                }
-                break;
-                case -2 : ComOut( CGM_DESCRIPTION, "set script mode" ) break;
-                case -3 : ComOut( CGM_DESCRIPTION, "set shadow mode" ) break;
-                case -6 : ComOut( CGM_DESCRIPTION, "inquire origin offset" ) break;
-                case -8 : ComOut( CGM_DESCRIPTION, "set media size" ) break;
-                case -10 : ComOut( CGM_DESCRIPTION, "set character mode" ) break;
-                case -14 : ComOut( CGM_DESCRIPTION, "resolution mode" ) break;
-                case -17 : ComOut( CGM_DESCRIPTION, "line cap" ) break;
-                case -18 : ComOut( CGM_DESCRIPTION, "line join" ) break;
-                case -19 : ComOut( CGM_DESCRIPTION, "edge join" ) break;
-                case -30 : ComOut( CGM_DESCRIPTION, "media type" ) break;
-                case -31 : ComOut( CGM_DESCRIPTION, "number of copies" ) break;
-                case -32 : ComOut( CGM_DESCRIPTION, "orientation" ) break;
-                case -33 : ComOut( CGM_DESCRIPTION, "device color representation" ) break;
-                case -34 : ComOut( CGM_DESCRIPTION, "device font list" ) break;
-                case -35 : ComOut( CGM_DESCRIPTION, "color reversal mode" ) break;
-                case -36 : ComOut( CGM_DESCRIPTION, "line cap attributes" ) break;
-                case -37 : ComOut( CGM_DESCRIPTION, "begin effect" ) break;
-                case -38 : ComOut( CGM_DESCRIPTION, "end effect" ) break;
-                case -39 : ComOut( CGM_DESCRIPTION, "begin effect definition" ) break;
-                case -40 : ComOut( CGM_DESCRIPTION, "end effect definition" ) break;
-                case -41 : ComOut( CGM_DESCRIPTION, "end style definition" ) break;
-                case -42 : ComOut( CGM_DESCRIPTION, "begin eps data" ) break;
-                case -43 : ComOut( CGM_DESCRIPTION, "eps data" ) break;
-                case -44 : ComOut( CGM_DESCRIPTION, "end eps data" ) break;
-                case -45 : ComOut( CGM_DESCRIPTION, "set background style" ) break;
-                case -46 : ComOut( CGM_DESCRIPTION, "set eps mode" ) break;
-                case -47 : ComOut( CGM_DESCRIPTION, "fill mode" ) break;
-                case -48 : ComOut( CGM_DESCRIPTION, "begin symbol" ) break;
-                case -49 : ComOut( CGM_DESCRIPTION, "end symbol" ) break;
-                case -50 : ComOut( CGM_DESCRIPTION, "begin layer" ) break;
-                case -51 : ComOut( CGM_DESCRIPTION, "end layer" ) break;
-                case -52 : ComOut( CGM_DESCRIPTION, "layer visibility" ) break;
-                case -53 : ComOut( CGM_DESCRIPTION, "inquire foreign data" ) break;
-                case -54 : ComOut( CGM_DESCRIPTION, "set text offset" ) break;
-                case -55 : ComOut( CGM_DESCRIPTION, "begin group" ) break;
-                case -56 : ComOut( CGM_DESCRIPTION, "end group" ) break;
-                case -100 : ComOut( CGM_DESCRIPTION, "begin patch" ) break;
-                case -101 : ComOut( CGM_DESCRIPTION, "end patch" ) break;
-                case -102 : ComOut( CGM_DESCRIPTION, "begin block text region" ) break;
-                case -103 : ComOut( CGM_DESCRIPTION, "end block text region" ) break;
-                case -120 : ComOut( CGM_DESCRIPTION, "region margins" ) break;
-                case -121 : ComOut( CGM_DESCRIPTION, "region expansions" ) break;
-                case -122 : ComOut( CGM_DESCRIPTION, "region anchor" ) break;
-                case -123 : ComOut( CGM_DESCRIPTION, "paragraph horizontal align" ) break;
-                case -124 : ComOut( CGM_DESCRIPTION, "paragraph vertical align" ) break;
-                case -125 : ComOut( CGM_DESCRIPTION, "region line flow" ) break;
-                case -130 : ComOut( CGM_DESCRIPTION, "paragraph spacing" ) break;
-                case -131 : ComOut( CGM_DESCRIPTION, "paragraph identation" ) break;
-                case -132 : ComOut( CGM_DESCRIPTION, "paragraph tabs" ) break;
-                case -133 : ComOut( CGM_DESCRIPTION, "paragraph bullet" ) break;
-                case -134 : ComOut( CGM_DESCRIPTION, "paragraph bulet level" ) break;
-                case -135 : ComOut( CGM_DESCRIPTION, "line horuzontal align" ) break;
-                case -136 : ComOut( CGM_DESCRIPTION, "line vertical align" ) break;
-                case -137 : ComOut( CGM_DESCRIPTION, "line spacing" ) break;
-                case -138 : ComOut( CGM_DESCRIPTION, "word wrap" ) break;
-                case -150 : ComOut( CGM_DESCRIPTION, "forward advance distance" ) break;
-                case -151 : ComOut( CGM_DESCRIPTION, "word spacing" ) break;
-                case -152 : ComOut( CGM_DESCRIPTION, "external leading" ) break;
-                case -160 : ComOut( CGM_DESCRIPTION, "set gradient offset" ) break;
-                case -161 : ComOut( CGM_DESCRIPTION, "set gradient edge" ) break;
-                case -162 : ComOut( CGM_DESCRIPTION, "set gradient angle" ) break;
-                case -163 : ComOut( CGM_DESCRIPTION, "set gradient description" ) break;
-                case -164 : ComOut( CGM_DESCRIPTION, "set gradient style" ) break;
-                case -165 : ComOut( CGM_DESCRIPTION, "set back ground style" ) break;
-                case -170 : ComOut( CGM_DESCRIPTION, "geometric pattern draw style" ) break;
-                case -190 : ComOut( CGM_DESCRIPTION, "set character width" ) break;
-                case -191 : ComOut( CGM_DESCRIPTION, "hyperlink definitions" ) break;
-                case -192 : ComOut( CGM_DESCRIPTION, "set color name for pantone" ) break;
-                case -32746 : ComOut( CGM_DESCRIPTION, "set text font" ) break;
-                case -32747 : ComOut( CGM_DESCRIPTION, "font selection mode" ) break;
-                case -32752 : ComOut( CGM_DESCRIPTION, "connecting edge" ) break;
-                case -32753 : ComOut( CGM_DESCRIPTION, "set drawing mode" ) break;
-                case -32754 : ComOut( CGM_DESCRIPTION, "inquire clip rectangle" ) break;
-                case -32755 : ComOut( CGM_DESCRIPTION, "protection region indicator" ) break;
-                case -32756 : ComOut( CGM_DESCRIPTION, "end protection region" ) break;
-                case -32757 : ComOut( CGM_DESCRIPTION, "begin protection region" ) break;
-                case -32758 : ComOut( CGM_DESCRIPTION, "geometric pattern definition" ) break;
-                case -32759 : ComOut( CGM_DESCRIPTION, "hatch style definition" ) break;
-                case -32760 : ComOut( CGM_DESCRIPTION, "close figure" ) break;
-                case -32761 : ComOut( CGM_DESCRIPTION, "end figure" )
-                {
-                    mpOutAct->EndFigure();
-                    mbFigure = sal_False;
-                }
-                break;
-                case -32762 : ComOut( CGM_DESCRIPTION, "begin figure" )
-                {
-                    mbFigure = sal_True;
-                    mpOutAct->BeginFigure();
-                }
-                break;
-                case -32763 : ComOut( CGM_DESCRIPTION, "pop transformatin" ) break;
-                case -32764 : ComOut( CGM_DESCRIPTION, "push transformation" ) break;
-                case -32765 : ComOut( CGM_DESCRIPTION, "copy segment" ) break;
-                case -32766 : ComOut( CGM_DESCRIPTION, "endseg" ) break;
-                case -32767 : ComOut( CGM_DESCRIPTION, "begin segment" ) break;
-                default : ComOut( CGM_DESCRIPTION, "????????????????????????????????" ) break;
-            }
-            mnParaSize = mnElementSize;
-        }
-        break;
-        case 0x02 : ComOut( CGM_LEVEL1, "Get Escape" ) break;
-        case 0x11 : ComOut( CGM_GDSF_ONLY, "Set Underline Mode" )
-        {
-            ImplSetUnderlineMode();
-        }
-        break;
-        case 0x12 : ComOut( CGM_GDSF_ONLY, "Set Script Mode" ) break;
-        case 0x13 : ComOut( CGM_GDSF_ONLY, "Set Shadow Mode" ) break;
-        case 0x18 : ComOut( CGM_GDSF_ONLY, "Set Media Size" ) break;
-        case 0x20 : ComOut( CGM_GDSF_ONLY, "Set Character Mode" ) break;
-        case 0x24 : ComOut( CGM_GDSF_ONLY, "Resolution Mode" ) break;
-        case 0x27 : ComOut( CGM_GDSF_ONLY, "Line Cap" ) break;
-        case 0x28 : ComOut( CGM_GDSF_ONLY, "Line Join" ) break;
-        case 0x29 : ComOut( CGM_GDSF_ONLY, "Edge Join" ) break;
-        case 0x40 : ComOut( CGM_GDSF_ONLY, "Media Type" ) break;
-        case 0x41 : ComOut( CGM_GDSF_ONLY, "Number of Copies" ) break;
-        case 0x42 : ComOut( CGM_GDSF_ONLY, "Origin" ) break;
-        case 0x45 : ComOut( CGM_GDSF_ONLY, "Color Reversal Mode" ) break;
-        case 0x46 : ComOut( CGM_GDSF_ONLY, "Line Cap Attributes" ) break;
-        case 0x49 : ComOut( CGM_GDSF_ONLY, "Begin Effect Definition" ) break;
-        case 0x50 : ComOut( CGM_GDSF_ONLY, "End Effect Definition" ) break;
-        case 0x51 : ComOut( CGM_GDSF_ONLY, "Line End Style Attributes" ) break;
-        case 0x52 : ComOut( CGM_GDSF_ONLY, "Begin Data" ) break;
-        case 0x53 : ComOut( CGM_GDSF_ONLY, "Data" ) break;
-        case 0x54 : ComOut( CGM_GDSF_ONLY, "End Data" ) break;
-        case 0x55 : ComOut( CGM_GDSF_ONLY, "Set Background Style" ) break;
-        case 0x56 : ComOut( CGM_GDSF_ONLY, "Set EPS Mode" ) break;
-        case 0x57 : ComOut( CGM_GDSF_ONLY, "Fill Mode" ) break;
-        case 0x58 : ComOut( CGM_GDSF_ONLY, "Begin Symbol" ) break;
-        case 0x59 : ComOut( CGM_GDSF_ONLY, "End Symbol" ) break;
-        case 0x60 : ComOut( CGM_GDSF_ONLY, "Begin Layer" ) break;
-        case 0x61 : ComOut( CGM_GDSF_ONLY, "End Layer" ) break;
-        case 0x62 : ComOut( CGM_GDSF_ONLY, "Layer Visibility" ) break;
-        case 0x64 : ComOut( CGM_GDSF_ONLY, "Set Text Offset" ) break;
-        case 0xFF : ComOut( CGM_GDSF_ONLY, "Inquire Function Support" ) break;
-        case 0xFE : ComOut( CGM_GDSF_ONLY, "Inquire Origin" ) break;
-        case 0xFD : ComOut( CGM_GDSF_ONLY, "Inquire Foreign Data Mode" ) break;
-        case 0xFC : ComOut( CGM_GDSF_ONLY, "Inquire Text Extent" ) break;
-        case 0xFB : ComOut( CGM_GDSF_ONLY, "Inquire DPI" ) break;
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass8()
-{
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_LEVEL2, "Copy Segment" ) break;                     // NS
-        case 0x02 : ComOut( CGM_LEVEL2, "Inheritance Filter" ) break;               // NS
-        case 0x03 : ComOut( CGM_LEVEL2, "Clip Inheritance" ) break;                 // NS
-        case 0x04 : ComOut( CGM_LEVEL2, "Segment Transformation" ) break;
-        case 0x05 : ComOut( CGM_LEVEL2, "Segment HighLighting" ) break;             // NS
-        case 0x06 : ComOut( CGM_LEVEL2, "Segment Display Priority" ) break;         // NS
-        case 0x07 : ComOut( CGM_LEVEL2, "Segment Pick Priority" ) break;            // NS
-        case 0xfe : ComOut( CGM_GDSF_ONLY, "INQ Current Position" ) break;
-        case 0xff : ComOut( CGM_GDSF_ONLY, "INQ Inserted Object Extent" ) break;
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;                           // NS
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass9()
-{
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_UNKNOWN_LEVEL, "Pixel Array" ) break;                   // NS
-        case 0x02 : ComOut( CGM_UNKNOWN_LEVEL, "Create Bitmap" ) break;                 // NS
-        case 0x03 : ComOut( CGM_UNKNOWN_LEVEL, "Delete Bitmap" ) break;                 // NS
-        case 0x04 : ComOut( CGM_UNKNOWN_LEVEL, "Select Drawing Bitmap" ) break;         // NS
-        case 0x05 : ComOut( CGM_UNKNOWN_LEVEL, "Display Bitmap" ) break;                // NS
-        case 0x06 : ComOut( CGM_UNKNOWN_LEVEL, "Drawing Mode" ) break;
-        case 0x07 : ComOut( CGM_UNKNOWN_LEVEL, "Mapped Bitmap ForeGrnd Color" ) break;  // NS
-        case 0x08 : ComOut( CGM_UNKNOWN_LEVEL, "Fill Bitmap" ) break;                   // NS
-        case 0x09 : ComOut( CGM_UNKNOWN_LEVEL, "Two Operand BitBlt" ) break;            // NS
-        case 0x0a : ComOut( CGM_UNKNOWN_LEVEL, "Three Operand BitBlt" ) break;          // NS
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-    }
-};
-
-// ---------------------------------------------------------------
-
-void CGM::ImplDoClass15()
-{
-    switch ( mnElementID )
-    {
-        case 0x01 : ComOut( CGM_UNKNOWN_LEVEL, "Inquire Error Stack" ) break;
-        case 0x02 : ComOut( CGM_UNKNOWN_LEVEL, "Pop Error Stack" ) break;
-        case 0x03 : ComOut( CGM_UNKNOWN_LEVEL, "Empty Error Stack" ) break;
-        default: ComOut( CGM_UNKNOWN_COMMAND, "" ) break;
-    }
-};
-
-// ---------------------------------------------------------------
diff --git a/goodies/source/filter.vcl/icgm/elements.cxx b/goodies/source/filter.vcl/icgm/elements.cxx
deleted file mode 100644
index 7c5b99c43539..000000000000
--- a/goodies/source/filter.vcl/icgm/elements.cxx
+++ /dev/null
@@ -1,398 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: elements.cxx,v $
- * $Revision: 1.6.38.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_goodies.hxx"
-
-#include "elements.hxx"
-
-// ---------------------------------------------------------------
-
-
-CGMElements::CGMElements( CGM& rCGM ) :
-    mpCGM ( &rCGM )
-{
-    Init();
-};
-
-// ---------------------------------------------------------------
-
-CGMElements::~CGMElements()
-{
-    DeleteTable( aHatchTable );
-    DeleteAllBundles( aLineList );
-    DeleteAllBundles( aMarkerList );
-    DeleteAllBundles( aEdgeList );
-    DeleteAllBundles( aTextList );
-    DeleteAllBundles( aFillList );
-}
-
-// ---------------------------------------------------------------
-
-CGMElements& CGMElements::operator=( CGMElements& rSource )
-{
-    sal_uInt32 nIndex;
-
-    nVDCIntegerPrecision = rSource.nVDCIntegerPrecision;
-    nIntegerPrecision = rSource.nIntegerPrecision;
-    eRealPrecision = rSource.eRealPrecision;
-    nRealSize = rSource.nRealSize;
-    nIndexPrecision = rSource.nIndexPrecision;
-    nColorPrecision = rSource.nColorPrecision;
-    nColorIndexPrecision = rSource.nColorIndexPrecision;
-
-    nMetaFileVersion = rSource.nMetaFileVersion;
-    eScalingMode = rSource.eScalingMode;
-    nScalingFactor = rSource.nScalingFactor;
-    eVDCType = rSource.eVDCType;
-    eVDCRealPrecision = rSource.eVDCRealPrecision;
-    nVDCRealSize = rSource.nVDCRealSize;
-    aVDCExtent = rSource.aVDCExtent;
-    aVDCExtentMaximum = rSource.aVDCExtentMaximum;
-    eDeviceViewPortMode = rSource.eDeviceViewPortMode;
-    nDeviceViewPortScale = rSource.nDeviceViewPortScale;
-    eDeviceViewPortMap = rSource.eDeviceViewPortMap;
-    eDeviceViewPortMapH = rSource.eDeviceViewPortMapH;
-    eDeviceViewPortMapV = rSource.eDeviceViewPortMapV;
-    aDeviceViewPort = rSource.aDeviceViewPort;
-    nMitreLimit = rSource.nMitreLimit;
-    eClipIndicator = rSource.eClipIndicator;
-    aClipRect = rSource.aClipRect;
-    eColorSelectionMode = rSource.eColorSelectionMode;
-    eColorModel = rSource.eColorModel;
-    nColorMaximumIndex = rSource.nColorMaximumIndex;
-    nLatestColorMaximumIndex = rSource.nLatestColorMaximumIndex;
-
-    for ( nIndex = 1; nIndex < 256; nIndex++ )      // do not overwrite the background color
-    {
-        aColorTableEntryIs[ nIndex ] = rSource.aColorTableEntryIs[ nIndex ];
-        aColorTable[ nIndex ] = rSource.aColorTable[ nIndex ];
-        aLatestColorTable[ nIndex ] = rSource.aColorTable[ nIndex ];
-    }
-
-    for ( nIndex = 0; nIndex < 8; nIndex++ )
-    {
-        nColorValueExtent[ nIndex ] = rSource.nColorValueExtent[ nIndex ];
-    }
-    nAspectSourceFlags = rSource.nAspectSourceFlags;
-
-    CopyAllBundles( rSource.aLineList, aLineList );
-    aLineBundle = rSource.aLineBundle;
-    pLineBundle = (LineBundle*)GetBundle( aLineList, rSource.pLineBundle->GetIndex() );
-    eLineWidthSpecMode = rSource.eLineWidthSpecMode;
-    eLineCapType = rSource.eLineCapType;
-    eLineJoinType = rSource.eLineJoinType;
-
-    CopyAllBundles( rSource.aMarkerList, aMarkerList );
-    aMarkerBundle = rSource.aMarkerBundle;
-    pMarkerBundle = (MarkerBundle*)GetBundle( aMarkerList, rSource.pMarkerBundle->GetIndex() );
-    eMarkerSizeSpecMode = rSource.eMarkerSizeSpecMode;
-
-    CopyAllBundles( rSource.aEdgeList, aEdgeList );
-    aEdgeBundle = rSource.aEdgeBundle;
-    pEdgeBundle = (EdgeBundle*)GetBundle( aEdgeList, rSource.pEdgeBundle->GetIndex() );
-    eEdgeVisibility = rSource.eEdgeVisibility;
-    eEdgeWidthSpecMode = rSource.eEdgeWidthSpecMode;
-
-    CopyAllBundles( rSource.aTextList, aTextList );
-    aTextBundle = rSource.aTextBundle;
-    pTextBundle = (TextBundle*)GetBundle( aTextList, rSource.pTextBundle->GetIndex() );
-    nCharacterHeight = rSource.nCharacterHeight;
-    nCharacterOrientation[ 0 ] = rSource.nCharacterOrientation[ 0 ];
-    nCharacterOrientation[ 1 ] = rSource.nCharacterOrientation[ 1 ];
-    nCharacterOrientation[ 2 ] = rSource.nCharacterOrientation[ 2 ];
-    nCharacterOrientation[ 3 ] = rSource.nCharacterOrientation[ 3 ];
-    eUnderlineMode = rSource.eUnderlineMode;
-    nUnderlineColor = rSource.nUnderlineColor;
-    eTextPath = rSource.eTextPath;
-    eTextAlignmentH = rSource.eTextAlignmentH;
-    eTextAlignmentV = rSource.eTextAlignmentV;
-    nTextAlignmentHCont = rSource.nTextAlignmentHCont;
-    nTextAlignmentVCont = rSource.nTextAlignmentVCont;
-    nCharacterSetIndex = rSource.nCharacterSetIndex;
-    nAlternateCharacterSetIndex = rSource.nAlternateCharacterSetIndex;
-    aFontList = rSource.aFontList;
-    eCharacterCodingA = rSource.eCharacterCodingA;
-
-    CopyAllBundles( rSource.aFillList, aFillList );
-    aFillBundle = rSource.aFillBundle;
-    pFillBundle = (FillBundle*)GetBundle( aFillList, rSource.pFillBundle->GetIndex() );
-    aFillRefPoint = rSource.aFillRefPoint;
-    eTransparency = rSource.eTransparency;
-    nAuxiliaryColor = rSource.nAuxiliaryColor;
-
-    DeleteTable( aHatchTable );
-    HatchEntry* pSource = (HatchEntry*)rSource.aHatchTable.First();
-    while ( pSource )
-    {
-        sal_uInt32  nKey = rSource.aHatchTable.GetKey( pSource );
-        aHatchTable.Insert( nKey, new HatchEntry( *pSource ) );
-        pSource = (HatchEntry*)rSource.aHatchTable.Next();
-    }
-    bSegmentCount = rSource.bSegmentCount;
-    return (*this);
-}
-
-// ---------------------------------------------------------------
-
-void CGMElements::Init()
-{
-
-    nIntegerPrecision = nIndexPrecision = 2;
-    nRealSize = nVDCRealSize = 4;
-    nColorIndexPrecision = 1;
-    nColorPrecision = 1;
-    nVDCIntegerPrecision = 2;
-    eRealPrecision = eVDCRealPrecision = RP_FIXED;      //RP_FLOAT;
-
-    nMetaFileVersion = 1;
-    eScalingMode = SM_ABSTRACT;
-    eVDCType = VDC_INTEGER;
-    aVDCExtent.Left = aVDCExtent.Bottom = 0;
-//  aVDCExtent.Right = aVDCExtent.Top = 32767;
-    aVDCExtent.Right = aVDCExtent.Top = 1.0;
-    aVDCExtentMaximum.Left = aVDCExtentMaximum.Bottom = 0;
-//  aVDCExtentMaximum.Right = aVDCExtentMaximum.Top = 32767;
-    aVDCExtentMaximum.Right = aVDCExtentMaximum.Top = 1.0;
-
-    eDeviceViewPortMode = DVPM_FRACTION;
-    nDeviceViewPortScale = 1;
-    eDeviceViewPortMap = DVPM_FORCED;
-    eDeviceViewPortMapH = DVPMH_LEFT;
-    eDeviceViewPortMapV = DVPMV_BOTTOM;
-    aDeviceViewPort.Left = 0;
-    aDeviceViewPort.Top = 1;
-    aDeviceViewPort.Right = 0;
-    aDeviceViewPort.Bottom = 1;
-
-    nMitreLimit = 32767;
-    eClipIndicator = CI_ON;
-    aClipRect = aVDCExtent;
-
-    eColorSelectionMode = CSM_INDEXED;
-    eColorModel = CM_RGB;
-    nColorMaximumIndex = 63;
-    int i;
-    for ( i = 0; i < 256; aColorTableEntryIs[ i++ ] = 0 ) ;
-    aColorTable[ 0 ] = 0;
-    for ( i = 1; i < 256; aColorTable[ i++ ] = 0xffffff ) ;
-    nLatestColorMaximumIndex = 63;
-    aLatestColorTable[ 0 ] = 0;
-    for ( i = 1; i < 256; aLatestColorTable[ i++ ] = 0xffffff ) ;
-    nColorValueExtent[ 0 ] = nColorValueExtent[ 1 ] = nColorValueExtent[ 2 ] = 0;
-    nColorValueExtent[ 3 ] = nColorValueExtent[ 4 ] = nColorValueExtent[ 5 ] = 255;
-
-    nAspectSourceFlags = 0;     // all flags are individual
-
-    eLineWidthSpecMode = SM_SCALED;         // line parameter
-    eLineCapType = LCT_NONE;
-    eLineJoinType = LJT_NONE;
-    pLineBundle = &aLineBundle;                 // line bundle parameter
-    aLineBundle.SetIndex( 1 );
-    aLineBundle.eLineType = LT_SOLID;
-    aLineBundle.nLineWidth = 1;
-    aLineBundle.SetColor( 0xffffff );
-    InsertBundle( aLineList, aLineBundle );
-
-    eMarkerSizeSpecMode = SM_SCALED;            // marker parameter
-    pMarkerBundle = &aMarkerBundle;             // marker bundle parameter
-    aMarkerBundle.SetIndex( 1 );
-    aMarkerBundle.eMarkerType = MT_STAR;
-    aMarkerBundle.nMarkerSize = 1;
-    aMarkerBundle.SetColor( 0xffffff );
-    InsertBundle( aMarkerList, aMarkerBundle );
-
-    eEdgeVisibility = EV_OFF;                   // edge parameter
-    eEdgeWidthSpecMode = SM_SCALED;
-    pEdgeBundle = &aEdgeBundle;                 // edge bundle parameter
-    aEdgeBundle.SetIndex( 1 );
-    aEdgeBundle.eEdgeType = ET_SOLID;
-    aEdgeBundle.nEdgeWidth = 1;
-    aEdgeBundle.SetColor( 0xffffff );
-    InsertBundle( aEdgeList, aEdgeBundle );
-
-    nCharacterHeight = 327;                     // text parameter
-    nCharacterOrientation[0] = 0;
-    nCharacterOrientation[1] = 1;
-    nCharacterOrientation[2] = 1;
-    nCharacterOrientation[3] = 0;
-    eUnderlineMode = UM_OFF;
-    nUnderlineColor = 0xffffff;
-    eTextPath = TPR_RIGHT;
-    eTextAlignmentH = TAH_NORMAL;
-    eTextAlignmentV = TAV_NORMAL;
-    nCharacterSetIndex = nAlternateCharacterSetIndex = 1;
-    eCharacterCodingA = CCA_BASIC_7;
-    pTextBundle = &aTextBundle;                 // text bundle parameter
-    aTextBundle.SetIndex( 1 );
-    aTextBundle.nTextFontIndex = 1;
-    aTextBundle.eTextPrecision = TPR_STRING;
-    aTextBundle.nCharacterExpansion = 1;
-    aTextBundle.nCharacterSpacing = 0;
-    aTextBundle.SetColor( 0xffffff );
-    InsertBundle( aTextList, aTextBundle );
-
-    pFillBundle = &aFillBundle;                 // fill bundle parameter
-    aFillBundle.SetIndex( 1 );
-    aFillBundle.eFillInteriorStyle = FIS_HOLLOW;
-    aFillBundle.nFillHatchIndex = 1;
-    aFillBundle.nFillPatternIndex = 1;
-    aFillBundle.SetColor( 0xffffff );
-    InsertBundle( aFillList, aFillBundle );
-
-    ImplInsertHatch( 0, 0, 0, 0 );
-    ImplInsertHatch( 1, 0, 125, 0 );
-    ImplInsertHatch( 2, 0, 125, 900 );
-    ImplInsertHatch( 3, 0, 125, 450 );
-    ImplInsertHatch( 4, 0, 125, 1350 );
-    ImplInsertHatch( 5, 1, 125, 0 );
-    ImplInsertHatch( 6, 1, 125, 450 );
-    ImplInsertHatch( -1, 0, 75, 0 );
-    ImplInsertHatch( -2, 0, 75, 900 );
-    ImplInsertHatch( -3, 0, 75, 450 );
-    ImplInsertHatch( -4, 0, 75, 1350 );
-    ImplInsertHatch( -5, 1, 75, 0 );
-    ImplInsertHatch( -6, 1, 75, 450 );
-    ImplInsertHatch( -7, 2, 125, 0 );
-    ImplInsertHatch( -8, 2, 125, 900 );
-    ImplInsertHatch( -9, 2, 125, 450 );
-    ImplInsertHatch( -10, 2, 125, 1350 );
-    ImplInsertHatch( -11, 0, 40, 0 );
-    ImplInsertHatch( -12, 0, 40, 900 );
-    ImplInsertHatch( -13, 0, 40, 450 );
-    ImplInsertHatch( -14, 0, 40, 1350 );
-    ImplInsertHatch( -15, 1, 40, 0 );
-    ImplInsertHatch( -16, 1, 40, 900 );
-    ImplInsertHatch( -21, 0, 250, 0 );
-    ImplInsertHatch( -22, 0, 250, 900 );
-    ImplInsertHatch( -23, 0, 250, 450 );
-    ImplInsertHatch( -24, 0, 250, 1350 );
-    ImplInsertHatch( -25, 1, 250, 0 );
-    ImplInsertHatch( -26, 1, 250, 450 );
-
-    eTransparency = T_ON;
-
-    nBackGroundColor = nAuxiliaryColor = 0;
-
-    bSegmentCount = sal_False;
-}
-
-// ---------------------------------------------------------------
-
-void CGMElements::ImplInsertHatch( sal_Int32 nKey, int nStyle, long nDistance, long nAngle )
-{
-    HatchEntry*     pHatchEntry;
-    pHatchEntry = new HatchEntry;
-    aHatchTable.Insert( (sal_uInt32)nKey, pHatchEntry );
-    pHatchEntry->HatchStyle = nStyle;
-    pHatchEntry->HatchDistance = nDistance;
-    pHatchEntry->HatchAngle = nAngle;
-}
-
-// ---------------------------------------------------------------
-
-void CGMElements::DeleteTable( Table& rTable )
-{
-    HatchEntry* pPtr = (HatchEntry*)rTable.First();
-    while ( pPtr )
-    {
-        delete pPtr;
-        pPtr = (HatchEntry*)rTable.Next();
-    }
-    rTable.Clear();
-}
-
-// ---------------------------------------------------------------
-
-void CGMElements::DeleteAllBundles( List& rList )
-{
-    void* pPtr = rList.First();
-    while( pPtr )
-    {
-        delete (Bundle*)pPtr;
-        pPtr = rList.Next();
-    }
-};
-
-
-// ---------------------------------------------------------------
-
-void CGMElements::CopyAllBundles( List& rSource, List& rDest )
-{
-    DeleteAllBundles( rDest );
-    rDest.Clear();
-
-    void* pPtr = rSource.First();
-    while( pPtr )
-    {
-        Bundle* pTempBundle = ( (Bundle*)pPtr)->Clone();
-        rDest.Insert( pTempBundle, LIST_APPEND );
-        pPtr = rSource.Next();
-    }
-};
-
-// ---------------------------------------------------------------
-
-Bundle* CGMElements::GetBundleIndex( sal_uInt32 nIndex, List& rList, Bundle& rBundle )
-{
-    rBundle.SetIndex( nIndex );
-    Bundle* pBundle = GetBundle( rList, nIndex );
-    if ( !pBundle )
-        pBundle = InsertBundle( rList, rBundle );
-    return pBundle;
-}
-
-// ---------------------------------------------------------------
-
-Bundle* CGMElements::GetBundle( List& rList, long nIndex )
-{
-    Bundle* pBundle = (Bundle*)rList.First();
-    while( pBundle && ( pBundle->GetIndex() != nIndex ) )
-    {
-        pBundle = (Bundle*)rList.Next();
-    }
-    return pBundle;
-}
-
-// ---------------------------------------------------------------
-
-Bundle* CGMElements::InsertBundle( List& rList, Bundle& rBundle )
-{
-    Bundle* pBundle = GetBundle( rList, rBundle.GetIndex() );
-    if ( pBundle )
-    {
-        rList.Remove( pBundle );
-        delete pBundle;
-    }
-    pBundle = rBundle.Clone();
-    rList.Insert( pBundle, LIST_APPEND );
-    return pBundle;
-};
-
diff --git a/goodies/source/filter.vcl/icgm/elements.hxx b/goodies/source/filter.vcl/icgm/elements.hxx
deleted file mode 100644
index 4df6c8602a2c..000000000000
--- a/goodies/source/filter.vcl/icgm/elements.hxx
+++ /dev/null
@@ -1,148 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: elements.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 CGM_ELEMENTS_HXX_
-#define CGM_ELEMENTS_HXX_
-
-#include "main.hxx"
-#include <tools/table.hxx>
-
-#define nBackGroundColor    aColorTable[ 0 ]
-
-class CGMElements
-{
-        void                ImplInsertHatch( sal_Int32 Key, int Style, long Distance, long Angle );
-    public:
-        CGM*                mpCGM;
-        long                nMetaFileVersion;
-
-        sal_uInt32              nIntegerPrecision;  // maybe 1, 2, 4 Bytes
-        sal_uInt32              nIndexPrecision;    //   "      "       "
-        RealPrecision       eRealPrecision;
-        sal_uInt32              nRealSize;          // maybe 4 or 8 bytes
-        sal_uInt32              nColorPrecision;    //   "      "       "
-        sal_uInt32              nColorIndexPrecision;//  "      "       "
-
-        ScalingMode         eScalingMode;
-        double              nScalingFactor;
-
-        VDCType             eVDCType;           // Integer / Real
-        sal_uInt32              nVDCIntegerPrecision;
-        RealPrecision       eVDCRealPrecision;
-        sal_uInt32              nVDCRealSize;
-        FloatRect           aVDCExtent;
-        FloatRect           aVDCExtentMaximum;
-
-        DeviceViewPortMode  eDeviceViewPortMode;
-        double              nDeviceViewPortScale;
-        DeviceViewPortMap   eDeviceViewPortMap;
-        DeviceViewPortMapH  eDeviceViewPortMapH;
-        DeviceViewPortMapV  eDeviceViewPortMapV;
-        FloatRect           aDeviceViewPort;
-
-        double              nMitreLimit;
-
-        ClipIndicator       eClipIndicator;
-        FloatRect           aClipRect;
-
-        ColorSelectionMode  eColorSelectionMode;
-        ColorModel          eColorModel;
-        sal_uInt32              nColorMaximumIndex;             // default 63
-        sal_uInt32              nLatestColorMaximumIndex;       // default 63
-        sal_Int8                aColorTableEntryIs[ 256 ];
-        sal_uInt32              aColorTable[ 256 ];
-        sal_uInt32              aLatestColorTable[ 256 ];
-        sal_uInt32              nColorValueExtent[ 8 ]; // RGB, CMYK
-
-        // ASPECT SOURCE FLAGS
-        sal_uInt32              nAspectSourceFlags; // bit = 0 -> INDIVIDUAL
-                                                //       1 -> BUNDLED
-
-        LineBundle*         pLineBundle;        // Pointer to the current LineBundleIndex
-        LineBundle          aLineBundle;
-        List                aLineList;
-        SpecMode            eLineWidthSpecMode;
-        LineCapType         eLineCapType;
-        LineJoinType        eLineJoinType;
-
-        MarkerBundle*       pMarkerBundle;      // Pointer to the current MarkerBundleIndex
-        MarkerBundle        aMarkerBundle;
-        List                aMarkerList;
-        SpecMode            eMarkerSizeSpecMode;
-
-        EdgeBundle*         pEdgeBundle;        // Pointer to the current EdgeBundleIndex
-        EdgeBundle          aEdgeBundle;
-        List                aEdgeList;
-        EdgeVisibility      eEdgeVisibility;
-        SpecMode            eEdgeWidthSpecMode;
-
-        TextBundle*         pTextBundle;        // Pointer to the current TextBundleIndex
-        TextBundle          aTextBundle;
-        List                aTextList;
-        double              nCharacterHeight;
-        double              nCharacterOrientation[ 4 ];
-        UnderlineMode       eUnderlineMode;
-        sal_uInt32              nUnderlineColor;
-        TextPath            eTextPath;
-        TextAlignmentH      eTextAlignmentH;
-        TextAlignmentV      eTextAlignmentV;
-        double              nTextAlignmentHCont;
-        double              nTextAlignmentVCont;
-        long                nCharacterSetIndex;
-        long                nAlternateCharacterSetIndex;
-        CharacterCodingA    eCharacterCodingA;
-        CGMFList            aFontList;
-
-        FillBundle*         pFillBundle;        // Pointer to the current EdgeBundleIndex
-        FillBundle          aFillBundle;
-        List                aFillList;
-        FloatPoint          aFillRefPoint;
-        Table               aHatchTable;
-
-        Transparency        eTransparency;
-
-        sal_uInt32              nAuxiliaryColor;
-
-        // Delimiter Counts -> which will be increased by each 'begin' operation
-        //                     and decreased by each 'end' operation
-        sal_Bool                bSegmentCount;
-                            CGMElements( CGM& rCGM );
-                            ~CGMElements();
-        CGMElements&        operator=( CGMElements& );
-        void                Init();
-        void                DeleteTable( Table& );
-        Bundle*             GetBundleIndex( sal_uInt32 nIndex, List&, Bundle& );
-        Bundle*             GetBundle( List& rList, long nIndex );
-        Bundle*             InsertBundle( List&, Bundle& );
-        void                DeleteAllBundles( List& );
-        void                CopyAllBundles( List& Source, List& Dest );
-};
-
-#endif
-
diff --git a/goodies/source/filter.vcl/icgm/exports.map b/goodies/source/filter.vcl/icgm/exports.map
deleted file mode 100644
index eaa1db885d5e..000000000000
--- a/goodies/source/filter.vcl/icgm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-CGMIMPORTER_1_0 {
-        global:
-                ImportCGM;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/icgm/main.hxx b/goodies/source/filter.vcl/icgm/main.hxx
deleted file mode 100644
index cdc4b052d3ad..000000000000
--- a/goodies/source/filter.vcl/icgm/main.hxx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: main.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 CGM_MAIN_HXX
-#define CGM_MAIN_HXX
-
-#include "cgm.hxx"
-
-// ---------------------------------------------------------------
-
-#define CGM_LEVEL1                      0x0001  // VERSION 1 METAFILE
-#define CGM_LEVEL2                      0x0002
-#define CGM_LEVEL3                      0x0003
-#define CGM_GDSF_ONLY                   0x00F0
-#define CGM_UNKNOWN_LEVEL               0x00F1
-#define CGM_UNKNOWN_COMMAND             0x00F2
-#define CGM_DESCRIPTION                 0x00F3
-
-#define CGM_EXTENDED_PRIMITIVES_SET     0x0100  // INDICATES PRIMITIVES WHICH ARE AVAILABLE IN
-                                                // LEVEL 1 BUT ARE NOT DEFINED IN ISO 7942(GKS)
-#define CGM_DRAWING_PLUS_CONTROL_SET    0x0200  // INDICATES THAT THIS IS AN ADDITIONAL LEVEL 1
-                                                // ELEMENT
-#define ComOut( Level, Description ) if ( mpCommentOut ) ImplComment( Level, Description );
-
-#define BMCOL( _col ) BitmapColor( (sal_Int8)(_col >> 16 ), (sal_Int8)( _col >> 8 ), (sal_Int8)_col )
-#define ALIGN2( _nElementSize ) { _nElementSize = ( _nElementSize + 1 ) & ~1; }
-#define ALIGN4( _nElementSize ) { _nElementSize = ( _nElementSize + 3 ) & ~3; }
-#define ALIGN8( _nElementSize ) { _nElementSize = ( _nElementSize + 7 ) & ~7; }
-
-#include <vcl/salbtype.hxx>
-#include <tools/stream.hxx>
-#include <tools/list.hxx>
-#include "bundles.hxx"
-#include "bitmap.hxx"
-#include "elements.hxx"
-
-
-#endif
-
diff --git a/goodies/source/filter.vcl/icgm/makefile.mk b/goodies/source/filter.vcl/icgm/makefile.mk
deleted file mode 100644
index ee62bbfb051c..000000000000
--- a/goodies/source/filter.vcl/icgm/makefile.mk
+++ /dev/null
@@ -1,84 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-PRJNAME=goodies
-TARGET=icgm
-ENABLE_EXCEPTIONS=TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/cgm.obj		\
-            $(SLO)$/chart.obj	\
-            $(SLO)$/class0.obj	\
-            $(SLO)$/class1.obj	\
-            $(SLO)$/class2.obj	\
-            $(SLO)$/class3.obj	\
-            $(SLO)$/class4.obj	\
-            $(SLO)$/class5.obj	\
-            $(SLO)$/class7.obj	\
-            $(SLO)$/classx.obj	\
-            $(SLO)$/outact.obj	\
-            $(SLO)$/actimpr.obj	\
-            $(SLO)$/bundles.obj	\
-            $(SLO)$/bitmap.obj	\
-            $(SLO)$/elements.obj
-#			$(SLO)$/svdem.obj
-
-SHL1TARGET	=	icg$(DLLPOSTFIX)
-SHL1IMPLIB	=	icgm
-SHL1VERSIONMAP=exports.map
-SHL1DEF		=	$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS	=	$(SLB)$/icgm.lib
-
-DEF1NAME=$(SHL1TARGET)
-
-.IF "$(GUI)"=="OS2"
-SHL1OBJS	=	$(SLO)$/class0.obj
-.ENDIF
-
-SHL1STDLIBS = \
-            $(TKLIB)		\
-            $(VCLLIB)		\
-            $(UNOTOOLSLIB)	\
-            $(TOOLSLIB)		\
-            $(CPPULIB)		\
-            $(SALLIB)
-.ENDIF
-
-# --- Targets --------------------------------------------------------------
-
-.INCLUDE : target.mk
-
diff --git a/goodies/source/filter.vcl/icgm/outact.cxx b/goodies/source/filter.vcl/icgm/outact.cxx
deleted file mode 100644
index 22eac554a109..000000000000
--- a/goodies/source/filter.vcl/icgm/outact.cxx
+++ /dev/null
@@ -1,203 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: outact.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <outact.hxx>
-#include <vcl/gradient.hxx>
-
-using namespace ::com::sun::star;
-
-// ---------------------------------------------------------------
-
-CGMOutAct::CGMOutAct( CGM& rCGM )
-{
-    mpCGM = &rCGM;
-    mnCurrentPage = 0;
-    mnGroupActCount = mnGroupLevel = 0;
-    mpGroupLevel = new sal_uInt32[ CGM_OUTACT_MAX_GROUP_LEVEL ];
-    mpPoints = (Point*)new sal_Int8[ 0x2000 * sizeof( Point ) ];
-    mpFlags = new BYTE[ 0x2000 ];
-
-    mnIndex = 0;
-    mpGradient = NULL;
-};
-
-// ---------------------------------------------------------------
-
-CGMOutAct::~CGMOutAct()
-{
-    delete[] (sal_Int8*) mpPoints;
-    delete[] mpFlags;
-    delete[] mpGroupLevel;
-
-    if ( mpGradient )
-        delete mpGradient;
-};
-
-// ---------------------------------------------------------------
-
-void CGMOutAct::BeginFigure()
-{
-    if ( mnIndex )
-        EndFigure();
-
-    BeginGroup();
-    mnIndex = 0;
-}
-
-// ---------------------------------------------------------------
-
-void CGMOutAct::CloseRegion()
-{
-    if ( mnIndex > 2 )
-    {
-        NewRegion();
-        DrawPolyPolygon( maPolyPolygon );
-        maPolyPolygon.Clear();
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGMOutAct::NewRegion()
-{
-    if ( mnIndex > 2 )
-    {
-        Polygon aPolygon( mnIndex, mpPoints, mpFlags );
-        maPolyPolygon.Insert( aPolygon );
-    }
-    mnIndex = 0;
-}
-
-// ---------------------------------------------------------------
-
-void CGMOutAct::EndFigure()
-{
-    NewRegion();
-    DrawPolyPolygon( maPolyPolygon );
-    maPolyPolygon.Clear();
-    EndGroup();
-    mnIndex = 0;
-}
-
-// ---------------------------------------------------------------
-
-void CGMOutAct::RegPolyLine( Polygon& rPolygon, sal_Bool bReverse )
-{
-    USHORT nPoints = rPolygon.GetSize();
-    if ( nPoints )
-    {
-        if ( bReverse )
-        {
-            for ( USHORT i = 0; i <  nPoints; i++ )
-            {
-                mpPoints[ mnIndex + i ] = rPolygon.GetPoint( nPoints - i - 1 );
-                mpFlags[ mnIndex + i ] = (sal_Int8)rPolygon.GetFlags( nPoints - i - 1 );
-            }
-        }
-        else
-        {
-            for ( USHORT i = 0; i <  nPoints; i++ )
-            {
-                mpPoints[ mnIndex + i ] = rPolygon.GetPoint( i );
-                mpFlags[ mnIndex + i ] = (sal_Int8)rPolygon.GetFlags( i );
-            }
-        }
-        mnIndex = mnIndex + nPoints;
-    }
-}
-
-// ---------------------------------------------------------------
-
-void CGMOutAct::SetGradientOffset( long nHorzOfs, long nVertOfs, sal_uInt32 /*nType*/ )
-{
-    if ( !mpGradient )
-        mpGradient = new awt::Gradient;
-    mpGradient->XOffset = ( (sal_uInt16)nHorzOfs & 0x7f );
-    mpGradient->YOffset = ( (sal_uInt16)nVertOfs & 0x7f );
-}
-
-// ---------------------------------------------------------------
-
-void CGMOutAct::SetGradientAngle( long nAngle )
-{
-    if ( !mpGradient )
-        mpGradient = new awt::Gradient;
-    mpGradient->Angle = sal::static_int_cast< sal_Int16 >(nAngle);
-}
-
-// ---------------------------------------------------------------
-
-void CGMOutAct::SetGradientDescriptor( sal_uInt32 nColorFrom, sal_uInt32 nColorTo )
-{
-    if ( !mpGradient )
-        mpGradient = new awt::Gradient;
-    mpGradient->StartColor = nColorFrom;
-    mpGradient->EndColor = nColorTo;
-}
-
-// ---------------------------------------------------------------
-
-void CGMOutAct::SetGradientStyle( sal_uInt32 nStyle, double /*fRatio*/ )
-{
-    if ( !mpGradient )
-        mpGradient = new awt::Gradient;
-    switch ( nStyle )
-    {
-        case 0xff :
-        {
-            mpGradient->Style = awt::GradientStyle_AXIAL;
-        }
-        break;
-        case 4 :
-        {
-            mpGradient->Style = awt::GradientStyle_RADIAL;          // CONICAL
-        }
-        break;
-        case 3 :
-        {
-            mpGradient->Style = awt::GradientStyle_RECT;
-        }
-        break;
-        case 2 :
-        {
-            mpGradient->Style = awt::GradientStyle_ELLIPTICAL;
-        }
-        break;
-        default :
-        {
-            mpGradient->Style = awt::GradientStyle_LINEAR;
-        }
-    }
-}
-
-
diff --git a/goodies/source/filter.vcl/icgm/outact.hxx b/goodies/source/filter.vcl/icgm/outact.hxx
deleted file mode 100644
index 3a78d6b73199..000000000000
--- a/goodies/source/filter.vcl/icgm/outact.hxx
+++ /dev/null
@@ -1,151 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: outact.hxx,v $
- * $Revision: 1.7 $
- *
- * 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 CGM_OUTACT_HXX_
-#define CGM_OUTACT_HXX_
-
-#include <com/sun/star/awt/Gradient.hpp>
-#include <com/sun/star/drawing/XDrawPages.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-
-
-#define CGM_OUTACT_MAX_GROUP_LEVEL 64
-
-#include "cgm.hxx"
-#include <chart.hxx>
-#include <tools/poly.hxx>
-
-typedef struct NodeFrameSet
-{
-    Point       nTopLeft;
-    Point       nBottomRight;
-    ::com::sun::star::awt::Size     nSize;
-} NodeFrameSet;
-
-class CGM;
-class VclGradient;
-class CGMOutAct
-{
-    protected:
-        sal_uInt16                  mnCurrentPage;          // defaulted to zero
-
-        sal_uInt32                  mnGroupActCount;        // grouping
-        sal_uInt32                  mnGroupLevel;
-        sal_uInt32*                 mpGroupLevel;
-
-        USHORT                  mnIndex;                // figure
-        BYTE*                   mpFlags;
-        Point*                  mpPoints;
-        PolyPolygon             maPolyPolygon;
-        ::com::sun::star::awt::Gradient*            mpGradient;
-
-        CGM*                    mpCGM;
-
-    public:
-                                CGMOutAct( CGM& rCGM );
-    virtual                     ~CGMOutAct();
-    virtual void                FirstOutPut() { mpCGM->mbFirstOutPut = sal_False; } ;
-    virtual void                InsertPage() { mnCurrentPage++; } ;
-    virtual void                BeginGroup() {} ;
-    virtual void                EndGroup() {};
-    virtual void                EndGrouping() {} ;
-    void                        BeginFigure() ;
-    void                        CloseRegion() ;
-    void                        NewRegion() ;
-    void                        EndFigure() ;
-    void                        RegPolyLine( Polygon&, sal_Bool bReverse = sal_False ) ;
-    void                        SetGradientOffset( long nHorzOfs, long nVertOfs, sal_uInt32 nType );
-    void                        SetGradientAngle( long nAngle );
-    void                        SetGradientDescriptor( sal_uInt32 nColorFrom, sal_uInt32 nColorTo );
-    void                        SetGradientStyle( sal_uInt32 nStyle, double fRatio );
-    virtual void                DrawRectangle( FloatRect& ) {} ;
-    virtual void                DrawEllipse( FloatPoint&, FloatPoint&, double& ) {} ;
-    virtual void                DrawEllipticalArc( FloatPoint&, FloatPoint&, double&,
-                                    sal_uInt32, double&, double&) {} ;
-    virtual void                DrawBitmap( CGMBitmapDescriptor* ) {} ;
-    virtual void                DrawPolygon( Polygon& ) {} ;
-    virtual void                DrawPolyLine( Polygon& ) {} ;
-    virtual void                DrawPolybezier( Polygon& ) {} ;
-    virtual void                DrawPolyPolygon( PolyPolygon& ) {} ;
-    virtual void                DrawText( ::com::sun::star::awt::Point&, ::com::sun::star::awt::Size&, char*, sal_uInt32, FinalFlag ) {} ;
-    virtual void                AppendText( char*, sal_uInt32, FinalFlag ) {} ;
-    virtual sal_uInt32              DrawText( TextEntry*, NodeFrameSet&, sal_uInt32 ) { return 0; } ;
-    virtual void                DrawChart(){} ;
-};
-
-class CGMImpressOutAct : public CGMOutAct
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPages >               maXDrawPages;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >                maXDrawPage;
-
-//  ::com::sun::star::uno::Reference< XServiceRegistry >            maXServiceRegistry;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >        maXMultiServiceFactory;
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >        maXServiceManagerSC;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >                   maXShape;
-    sal_Bool                        ImplCreateShape( const ::rtl::OUString& rType );
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >           maXPropSet;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes >                  maXShapes;
-
-    sal_uInt32                      nFinalTextCount;
-
-    sal_Bool                        ImplInitPage();
-    void                        ImplSetOrientation( FloatPoint& RefPoint, double& Orientation ) ;
-    void                        ImplSetLineBundle() ;
-    void                        ImplSetFillBundle() ;
-    void                        ImplSetTextBundle( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & ) ;
-public:
-                                CGMImpressOutAct( CGM&, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > & ) ;
-                                ~CGMImpressOutAct() {} ;
-    virtual void                InsertPage() ;
-    virtual void                BeginGroup() ;
-    virtual void                EndGroup() ;
-    virtual void                EndGrouping() ;
-    virtual void                DrawRectangle( FloatRect& ) ;
-    virtual void                DrawEllipse( FloatPoint& center, FloatPoint&, double& Orientation ) ;
-    virtual void                DrawEllipticalArc( FloatPoint& center, FloatPoint& size, double& orientation,
-                                    sal_uInt32 etype, double& startangle, double& endangle ) ;
-    virtual void                DrawBitmap( CGMBitmapDescriptor* ) ;
-    virtual void                DrawPolygon( Polygon& ) ;
-    virtual void                DrawPolyLine( Polygon& ) ;
-    virtual void                DrawPolybezier( Polygon& ) ;
-    virtual void                DrawPolyPolygon( PolyPolygon& ) ;
-    virtual void                DrawText( ::com::sun::star::awt::Point& TextRectPos, ::com::sun::star::awt::Size& TextRectSize, char* String, sal_uInt32 StringSize, FinalFlag ) ;
-    virtual void                AppendText( char* String, sal_uInt32 StringSize, FinalFlag ) ;
-    virtual sal_uInt32              DrawText( TextEntry*, NodeFrameSet&, sal_uInt32 ) ;
-    virtual void                DrawChart();
-};
-
-
-#endif
-
diff --git a/goodies/source/filter.vcl/idxf/dxf2mtf.cxx b/goodies/source/filter.vcl/idxf/dxf2mtf.cxx
deleted file mode 100644
index 654b66888f67..000000000000
--- a/goodies/source/filter.vcl/idxf/dxf2mtf.cxx
+++ /dev/null
@@ -1,983 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxf2mtf.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <string.h>
-#include <vcl/gdimtf.hxx>
-#include <vcl/virdev.hxx>
-#include <tools/poly.hxx>
-#include "dxf2mtf.hxx"
-
-#include <math.h>
-
-
-ULONG DXF2GDIMetaFile::CountEntities(const DXFEntities & rEntities)
-{
-    const DXFBasicEntity * pBE;
-    ULONG nRes;
-
-    nRes=0;
-    for (pBE=rEntities.pFirst; pBE!=NULL; pBE=pBE->pSucc) nRes++;
-    return nRes;
-}
-
-
-void DXF2GDIMetaFile::MayCallback(ULONG /*nMainEntitiesProcessed*/)
-{
-    // ULONG nPercent;
-/*
-    if (pCallback!=NULL && nMainEntitiesCount!=0) {
-        nPercent=nMinPercent+(nMaxPercent-nMinPercent)*nMainEntitiesProcessed/nMainEntitiesCount;
-        if (nPercent>=nLastPercent+4) {
-            if (((*pCallback)(pCallerData,(USHORT)nPercent))==TRUE) bStatus=FALSE;
-            nLastPercent=nPercent;
-        }
-    }
-*/
-}
-
-Color DXF2GDIMetaFile::ConvertColor(BYTE nColor)
-{
-    return Color(
-        pDXF->aPalette.GetRed( nColor ),
-        pDXF->aPalette.GetGreen( nColor ),
-        pDXF->aPalette.GetBlue( nColor ) );
-}
-
-long DXF2GDIMetaFile::GetEntityColor(const DXFBasicEntity & rE)
-{
-    long nColor;
-    const DXFLayer * pLayer;
-
-    nColor=rE.nColor;
-    if (nColor==256) {
-        if (rE.sLayer[0]=='0' && rE.sLayer[1]==0) nColor=nParentLayerColor;
-        else {
-            pLayer=pDXF->aTables.SearchLayer(rE.sLayer);
-            if (pLayer!=NULL) nColor=pLayer->nColor;
-            else nColor=nParentLayerColor;
-        }
-    }
-    else if (nColor==0) nColor=nBlockColor;
-    return nColor;
-}
-
-DXFLineInfo DXF2GDIMetaFile::LTypeToDXFLineInfo(const char * sLineType)
-{
-    const DXFLType * pLT;
-    DXFLineInfo aDXFLineInfo;
-
-    pLT=pDXF->aTables.SearchLType(sLineType);
-    if (pLT==NULL || pLT->nDashCount == 0) {
-        aDXFLineInfo.eStyle = LINE_SOLID;
-    }
-    else {
-        sal_Int32 i;
-        double x;
-        aDXFLineInfo.eStyle = LINE_DASH;
-        for (i=0; i < (pLT->nDashCount); i++) {
-            x = pLT->fDash[i] * pDXF->getGlobalLineTypeScale();
-// ####
-            // x = (sal_Int32) rTransform.TransLineWidth( pLT->fDash[i] * pDXF->getGlobalLineTypeScale() );
-            if ( x >= 0.0 ) {
-                if ( aDXFLineInfo.nDotCount == 0 ) {
-                    aDXFLineInfo.nDotCount ++;
-                    aDXFLineInfo.fDotLen = x;
-                }
-                else if ( aDXFLineInfo.fDotLen == x ) {
-                    aDXFLineInfo.nDotCount ++;
-                }
-                else if ( aDXFLineInfo.nDashCount == 0 ) {
-                    aDXFLineInfo.nDashCount ++;
-                    aDXFLineInfo.fDashLen = x;
-                }
-                else if ( aDXFLineInfo.fDashLen == x ) {
-                    aDXFLineInfo.nDashCount ++;
-                }
-                else {
-                    // It is impossible to be converted.
-                }
-            }
-            else {
-                if ( aDXFLineInfo.fDistance == 0 ) {
-                    aDXFLineInfo.fDistance = -1 * x;
-                }
-                else {
-                    // It is impossible to be converted.
-                }
-            }
-
-        }
-    }
-
-#if 0
-    if (aDXFLineInfo.DashCount > 0 && aDXFLineInfo.DashLen == 0.0)
-        aDXFLineInfo.DashLen ( 1 );
-    if (aDXFLineInfo.DotCount > 0 && aDXFLineInfo.DotLen() == 0.0)
-        aDXFLineInfo.SetDotLen( 1 );
-    if (aDXFLineInfo.GetDashCount > 0 || aDXFLineInfo.GetDotCount > 0)
-        if (aDXFLineInfo.GetDistance() == 0)
-            aDXFLineInfo.SetDistance( 1 );
-#endif
-
-    return aDXFLineInfo;
-}
-
-DXFLineInfo DXF2GDIMetaFile::GetEntityDXFLineInfo(const DXFBasicEntity & rE)
-{
-    DXFLineInfo aDXFLineInfo;
-    const DXFLayer * pLayer;
-
-    aDXFLineInfo.eStyle = LINE_SOLID;
-    aDXFLineInfo.fWidth = 0;
-    aDXFLineInfo.nDashCount = 0;
-    aDXFLineInfo.fDashLen = 0;
-    aDXFLineInfo.nDotCount = 0;
-    aDXFLineInfo.fDotLen = 0;
-    aDXFLineInfo.fDistance = 0;
-
-    if (strcmp(rE.sLineType,"BYLAYER")==0) {
-        if (rE.sLayer[0]=='0' && rE.sLayer[1]==0) aDXFLineInfo=aParentLayerDXFLineInfo;
-        else {
-            pLayer=pDXF->aTables.SearchLayer(rE.sLayer);
-            if (pLayer!=NULL) aDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
-            else aDXFLineInfo=aParentLayerDXFLineInfo;
-        }
-    }
-    else if (strcmp(rE.sLineType,"BYBLOCK")==0) {
-        aDXFLineInfo=aBlockDXFLineInfo;
-    }
-    else aDXFLineInfo=LTypeToDXFLineInfo(rE.sLineType);
-    return aDXFLineInfo;
-}
-
-
-BOOL DXF2GDIMetaFile::SetLineAttribute(const DXFBasicEntity & rE, ULONG /*nWidth*/)
-{
-    long nColor;
-    Color aColor;
-
-    nColor=GetEntityColor(rE);
-    if (nColor<0) return FALSE;
-    aColor=ConvertColor((BYTE)nColor);
-
-    if (aActLineColor!=aColor) {
-        pVirDev->SetLineColor( aActLineColor = aColor );
-    }
-
-    if (aActFillColor!=Color( COL_TRANSPARENT )) {
-        pVirDev->SetFillColor(aActFillColor = Color( COL_TRANSPARENT ));
-    }
-    return TRUE;
-}
-
-
-BOOL DXF2GDIMetaFile::SetAreaAttribute(const DXFBasicEntity & rE)
-{
-    long nColor;
-    Color aColor;
-
-    nColor=GetEntityColor(rE);
-    if (nColor<0) return FALSE;
-    aColor=ConvertColor((BYTE)nColor);
-
-    if (aActLineColor!=aColor) {
-        pVirDev->SetLineColor( aActLineColor = aColor );
-    }
-
-    if ( aActFillColor == Color( COL_TRANSPARENT ) || aActFillColor != aColor) {
-        pVirDev->SetFillColor( aActFillColor = aColor );
-    }
-    return TRUE;
-}
-
-
-BOOL DXF2GDIMetaFile::SetFontAttribute(const DXFBasicEntity & rE, short nAngle, USHORT nHeight, double /*fWidthScale*/)
-{
-    long nColor;
-    Color aColor;
-    Font aFont;
-
-    nAngle=-nAngle;
-    while (nAngle>3600) nAngle-=3600;
-    while (nAngle<0) nAngle+=3600;
-
-    nColor=GetEntityColor(rE);
-    if (nColor<0) return FALSE;
-    aColor=ConvertColor((BYTE)nColor);
-
-    aFont.SetColor(aColor);
-    aFont.SetTransparent(TRUE);
-    aFont.SetFamily(FAMILY_SWISS);
-    aFont.SetSize(Size(0,nHeight));
-    aFont.SetAlign(ALIGN_BASELINE);
-    aFont.SetOrientation(nAngle);
-    if (aActFont!=aFont) {
-        aActFont=aFont;
-        pVirDev->SetFont(aActFont);
-    }
-
-    return TRUE;
-}
-
-
-void DXF2GDIMetaFile::DrawLineEntity(const DXFLineEntity & rE, const DXFTransform & rTransform)
-{
-    if (SetLineAttribute(rE)) {
-        Point aP0,aP1;
-        rTransform.Transform(rE.aP0,aP0);
-        rTransform.Transform(rE.aP1,aP1);
-
-        DXFLineInfo aDXFLineInfo;
-        aDXFLineInfo=GetEntityDXFLineInfo(rE);
-        LineInfo aLineInfo;
-        aLineInfo = rTransform.Transform(aDXFLineInfo);
-
-#if 0
-        printf("%f\n", rTransform.TransLineWidth(1000.0));
-
-        // LINE_NONE = 0, LINE_SOLID = 1, LINE_DASH = 2, LineStyle_FORCE_EQUAL_SIZE = SAL_MAX_ENUM
-        aLineInfo.SetStyle( LINE_DASH );
-        aLineInfo.SetWidth( 300 );
-        aLineInfo.SetDashCount( 2 );
-        aLineInfo.SetDashLen( 100 );
-        aLineInfo.SetDotCount( 1 );
-        aLineInfo.SetDotLen( 0 );
-        aLineInfo.SetDistance( 500 );
-#endif
-
-        pVirDev->DrawLine(aP0,aP1,aLineInfo);
-        if (rE.fThickness!=0) {
-            Point aP2,aP3;
-            rTransform.Transform(rE.aP0+DXFVector(0,0,rE.fThickness),aP2);
-            rTransform.Transform(rE.aP1+DXFVector(0,0,rE.fThickness),aP3);
-            pVirDev->DrawLine(aP2,aP3);
-            pVirDev->DrawLine(aP0,aP2);
-            pVirDev->DrawLine(aP1,aP3);
-        }
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawPointEntity(const DXFPointEntity & rE, const DXFTransform & rTransform)
-{
-
-    if (SetLineAttribute(rE)) {
-        Point aP0;
-        rTransform.Transform(rE.aP0,aP0);
-        if (rE.fThickness==0) pVirDev->DrawPixel(aP0);
-        else {
-            Point aP1;
-            rTransform.Transform(rE.aP0+DXFVector(0,0,rE.fThickness),aP1);
-            pVirDev->DrawLine(aP0,aP1);
-        }
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawCircleEntity(const DXFCircleEntity & rE, const DXFTransform & rTransform)
-{
-    double frx,fry,fAng;
-    USHORT nPoints,i;
-    DXFVector aC;
-
-    if (SetLineAttribute(rE)==FALSE) return;
-    rTransform.Transform(rE.aP0,aC);
-    if (rE.fThickness==0 && rTransform.TransCircleToEllipse(rE.fRadius,frx,fry)==TRUE) {
-        pVirDev->DrawEllipse(
-            Rectangle((long)(aC.fx-frx+0.5),(long)(aC.fy-fry+0.5),
-                      (long)(aC.fx+frx+0.5),(long)(aC.fy+fry+0.5)));
-    }
-    else {
-        nPoints=OptPointsPerCircle;
-        Polygon aPoly(nPoints);
-        for (i=0; i<nPoints; i++) {
-            fAng=2*3.14159265359/(double)(nPoints-1)*(double)i;
-            rTransform.Transform(
-                rE.aP0+DXFVector(rE.fRadius*cos(fAng),rE.fRadius*sin(fAng),0),
-                aPoly[i]
-            );
-        }
-        pVirDev->DrawPolyLine(aPoly);
-        if (rE.fThickness!=0) {
-            Polygon aPoly2(nPoints);
-            for (i=0; i<nPoints; i++) {
-                fAng=2*3.14159265359/(double)(nPoints-1)*(double)i;
-                rTransform.Transform(
-                    rE.aP0+DXFVector(rE.fRadius*cos(fAng),rE.fRadius*sin(fAng),rE.fThickness),
-                    aPoly2[i]
-                );
-
-            }
-            pVirDev->DrawPolyLine(aPoly2);
-            for (i=0; i<nPoints-1; i++) pVirDev->DrawLine(aPoly[i],aPoly2[i]);
-        }
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawArcEntity(const DXFArcEntity & rE, const DXFTransform & rTransform)
-{
-    double frx,fry,fA1,fdA,fAng;
-    USHORT nPoints,i;
-    DXFVector aC;
-    Point aPS,aPE;
-
-    if (SetLineAttribute(rE)==FALSE) return;
-    fA1=rE.fStart;
-    fdA=rE.fEnd-fA1;
-    while (fdA>=360.0) fdA-=360.0;
-    while (fdA<=0) fdA+=360.0;
-    rTransform.Transform(rE.aP0,aC);
-    if (rE.fThickness==0 && fdA>5.0 && rTransform.TransCircleToEllipse(rE.fRadius,frx,fry)==TRUE) {
-        DXFVector aVS(cos(fA1/180.0*3.14159265359),sin(fA1/180.0*3.14159265359),0.0);
-        aVS*=rE.fRadius;
-        aVS+=rE.aP0;
-        DXFVector aVE(cos((fA1+fdA)/180.0*3.14159265359),sin((fA1+fdA)/180.0*3.14159265359),0.0);
-        aVE*=rE.fRadius;
-        aVE+=rE.aP0;
-        if (rTransform.Mirror()==TRUE) {
-            rTransform.Transform(aVS,aPS);
-            rTransform.Transform(aVE,aPE);
-        }
-        else {
-            rTransform.Transform(aVS,aPE);
-            rTransform.Transform(aVE,aPS);
-        }
-        pVirDev->DrawArc(
-            Rectangle((long)(aC.fx-frx+0.5),(long)(aC.fy-fry+0.5),
-                      (long)(aC.fx+frx+0.5),(long)(aC.fy+fry+0.5)),
-            aPS,aPE
-        );
-    }
-    else {
-        nPoints=(USHORT)(fdA/360.0*(double)OptPointsPerCircle+0.5);
-        if (nPoints<2) nPoints=2;
-        Polygon aPoly(nPoints);
-        for (i=0; i<nPoints; i++) {
-            fAng=3.14159265359/180.0 * ( fA1 + fdA/(double)(nPoints-1)*(double)i );
-            rTransform.Transform(
-                rE.aP0+DXFVector(rE.fRadius*cos(fAng),rE.fRadius*sin(fAng),0),
-                aPoly[i]
-            );
-        }
-        pVirDev->DrawPolyLine(aPoly);
-        if (rE.fThickness!=0) {
-            Polygon aPoly2(nPoints);
-            for (i=0; i<nPoints; i++) {
-                fAng=3.14159265359/180.0 * ( fA1 + fdA/(double)(nPoints-1)*(double)i );
-                rTransform.Transform(
-                    rE.aP0+DXFVector(rE.fRadius*cos(fAng),rE.fRadius*sin(fAng),rE.fThickness),
-                    aPoly2[i]
-                );
-            }
-            pVirDev->DrawPolyLine(aPoly2);
-            for (i=0; i<nPoints; i++) pVirDev->DrawLine(aPoly[i],aPoly2[i]);
-        }
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawTraceEntity(const DXFTraceEntity & rE, const DXFTransform & rTransform)
-{
-    if (SetLineAttribute(rE)) {
-        Polygon aPoly(4);
-        rTransform.Transform(rE.aP0,aPoly[0]);
-        rTransform.Transform(rE.aP1,aPoly[1]);
-        rTransform.Transform(rE.aP3,aPoly[2]);
-        rTransform.Transform(rE.aP2,aPoly[3]);
-        pVirDev->DrawPolygon(aPoly);
-        if (rE.fThickness!=0) {
-            USHORT i;
-            Polygon aPoly2(4);
-            DXFVector aVAdd(0,0,rE.fThickness);
-            rTransform.Transform(rE.aP0+aVAdd,aPoly2[0]);
-            rTransform.Transform(rE.aP1+aVAdd,aPoly2[1]);
-            rTransform.Transform(rE.aP3+aVAdd,aPoly2[2]);
-            rTransform.Transform(rE.aP2+aVAdd,aPoly2[3]);
-            pVirDev->DrawPolygon(aPoly2);
-            for (i=0; i<4; i++) pVirDev->DrawLine(aPoly[i],aPoly2[i]);
-        }
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawSolidEntity(const DXFSolidEntity & rE, const DXFTransform & rTransform)
-{
-    if (SetAreaAttribute(rE)) {
-        USHORT nN;
-        if (rE.aP2==rE.aP3) nN=3; else nN=4;
-        Polygon aPoly(nN);
-        rTransform.Transform(rE.aP0,aPoly[0]);
-        rTransform.Transform(rE.aP1,aPoly[1]);
-        rTransform.Transform(rE.aP3,aPoly[2]);
-        if (nN>3) rTransform.Transform(rE.aP2,aPoly[3]);
-        pVirDev->DrawPolygon(aPoly);
-        if (rE.fThickness!=0) {
-            Polygon aPoly2(nN);
-            DXFVector aVAdd(0,0,rE.fThickness);
-            rTransform.Transform(rE.aP0+aVAdd,aPoly2[0]);
-            rTransform.Transform(rE.aP1+aVAdd,aPoly2[1]);
-            rTransform.Transform(rE.aP3+aVAdd,aPoly2[2]);
-            if (nN>3) rTransform.Transform(rE.aP2+aVAdd,aPoly2[3]);
-            pVirDev->DrawPolygon(aPoly2);
-            if (SetLineAttribute(rE)) {
-                USHORT i;
-                for (i=0; i<nN; i++) pVirDev->DrawLine(aPoly[i],aPoly2[i]);
-            }
-        }
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawTextEntity(const DXFTextEntity & rE, const DXFTransform & rTransform)
-{
-    DXFVector aV;
-    Point aPt;
-    double fA;
-    USHORT nHeight;
-    short nAng;
-    ByteString  aStr( rE.sText );
-    DXFTransform aT( DXFTransform(rE.fXScale,rE.fHeight,1.0,rE.fRotAngle,rE.aP0), rTransform );
-    aT.TransDir(DXFVector(0,1,0),aV);
-    nHeight=(USHORT)(aV.Abs()+0.5);
-    fA=aT.CalcRotAngle();
-    nAng=(short)(fA*10.0+0.5);
-    aT.TransDir(DXFVector(1,0,0),aV);
-    if ( SetFontAttribute( rE,nAng, nHeight, aV. Abs() ) )
-    {
-        String aUString( aStr, pDXF->getTextEncoding() );
-        aT.Transform( DXFVector( 0, 0, 0 ), aPt );
-        pVirDev->DrawText( aPt, aUString );
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawInsertEntity(const DXFInsertEntity & rE, const DXFTransform & rTransform)
-{
-    const DXFBlock * pB;
-    pB=pDXF->aBlocks.Search(rE.sName);
-    if (pB!=NULL) {
-        DXFTransform aDXFTransform1(1.0,1.0,1.0,DXFVector(0.0,0.0,0.0)-pB->aBasePoint);
-        DXFTransform aDXFTransform2(rE.fXScale,rE.fYScale,rE.fZScale,rE.fRotAngle,rE.aP0);
-        DXFTransform aT(
-            DXFTransform( aDXFTransform1, aDXFTransform2 ),
-            rTransform
-        );
-        long nSavedBlockColor, nSavedParentLayerColor;
-        DXFLineInfo aSavedBlockDXFLineInfo, aSavedParentLayerDXFLineInfo;
-        nSavedBlockColor=nBlockColor;
-        nSavedParentLayerColor=nParentLayerColor;
-        aSavedBlockDXFLineInfo=aBlockDXFLineInfo;
-        aSavedParentLayerDXFLineInfo=aParentLayerDXFLineInfo;
-        nBlockColor=GetEntityColor(rE);
-        aBlockDXFLineInfo=GetEntityDXFLineInfo(rE);
-        if (rE.sLayer[0]!='0' || rE.sLayer[1]!=0) {
-            DXFLayer * pLayer=pDXF->aTables.SearchLayer(rE.sLayer);
-            if (pLayer!=NULL) {
-                nParentLayerColor=pLayer->nColor;
-                aParentLayerDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
-            }
-        }
-        DrawEntities(*pB,aT,FALSE);
-        aBlockDXFLineInfo=aSavedBlockDXFLineInfo;
-        aParentLayerDXFLineInfo=aSavedParentLayerDXFLineInfo;
-        nBlockColor=nSavedBlockColor;
-        nParentLayerColor=nSavedParentLayerColor;
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawAttribEntity(const DXFAttribEntity & rE, const DXFTransform & rTransform)
-{
-    if ((rE.nAttrFlags&1)==0) {
-        DXFVector aV;
-        Point aPt;
-        double fA;
-        USHORT nHeight;
-        short nAng;
-        ByteString aStr( rE.sText );
-        DXFTransform aT( DXFTransform( rE.fXScale, rE.fHeight, 1.0, rE.fRotAngle, rE.aP0 ), rTransform );
-        aT.TransDir(DXFVector(0,1,0),aV);
-        nHeight=(USHORT)(aV.Abs()+0.5);
-        fA=aT.CalcRotAngle();
-        nAng=(short)(fA*10.0+0.5);
-        aT.TransDir(DXFVector(1,0,0),aV);
-        if (SetFontAttribute(rE,nAng,nHeight,aV.Abs()))
-        {
-            String aUString( aStr, pDXF->getTextEncoding() );
-            aT.Transform( DXFVector( 0, 0, 0 ), aPt );
-            pVirDev->DrawText( aPt, aUString );
-        }
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawPolyLineEntity(const DXFPolyLineEntity & rE, const DXFTransform & rTransform)
-{
-    USHORT i,nPolySize;
-    double fW;
-    const DXFBasicEntity * pBE;
-
-    nPolySize=0;
-    pBE=rE.pSucc;
-    while (pBE!=NULL && pBE->eType==DXF_VERTEX) {
-        nPolySize++;
-        pBE=pBE->pSucc;
-    }
-    if (nPolySize<2) return;
-    Polygon aPoly(nPolySize);
-    fW=0.0;
-    pBE=rE.pSucc;
-    for (i=0; i<nPolySize; i++) {
-        rTransform.Transform(((DXFVertexEntity*)pBE)->aP0,aPoly[i]);
-        if (i+1<nPolySize || (rE.nFlags&1)!=0) {
-            if (((DXFVertexEntity*)pBE)->fSWidth>=0.0) fW+=((DXFVertexEntity*)pBE)->fSWidth;
-            else fW+=rE.fSWidth;
-            if (((DXFVertexEntity*)pBE)->fEWidth>=0.0) fW+=((DXFVertexEntity*)pBE)->fEWidth;
-            else fW+=rE.fEWidth;
-        }
-        pBE=pBE->pSucc;
-    }
-    fW/=2.0;
-    if ((rE.nFlags&1)!=0) fW/=(double)nPolySize;
-    else fW/=(double)(nPolySize-1);
-    if (SetLineAttribute(rE,rTransform.TransLineWidth(fW))) {
-        if ((rE.nFlags&1)!=0) pVirDev->DrawPolygon(aPoly);
-        else pVirDev->DrawPolyLine(aPoly);
-        if (rE.fThickness!=0) {
-            Polygon aPoly2(nPolySize);
-            pBE=rE.pSucc;
-            for (i=0; i<nPolySize; i++) {
-                rTransform.Transform(
-                   (((DXFVertexEntity*)pBE)->aP0)+DXFVector(0,0,rE.fThickness),
-                   aPoly2[i]
-                );
-                pBE=pBE->pSucc;
-            }
-            if ((rE.nFlags&1)!=0) pVirDev->DrawPolygon(aPoly2);
-            else pVirDev->DrawPolyLine(aPoly2);
-            for (i=0; i<nPolySize; i++) pVirDev->DrawLine(aPoly[i],aPoly2[i]);
-        }
-    }
-}
-
-void DXF2GDIMetaFile::DrawLWPolyLineEntity(const DXFLWPolyLineEntity & rE, const DXFTransform & rTransform )
-{
-    sal_Int32 i, nPolySize = rE.nCount;
-    if ( nPolySize && rE.pP )
-    {
-        Polygon aPoly( (sal_uInt16)nPolySize);
-        for ( i = 0; i < nPolySize; i++ )
-        {
-            rTransform.Transform( rE.pP[ (sal_uInt16)i ], aPoly[ (sal_uInt16)i ] );
-        }
-        double fW = rE.fConstantWidth;
-        if ( SetLineAttribute( rE, rTransform.TransLineWidth( fW ) ) )
-        {
-            if ( ( rE.nFlags & 1 ) != 0 )
-                pVirDev->DrawPolygon( aPoly );
-            else
-                pVirDev->DrawPolyLine( aPoly );
-                // ####
-                //pVirDev->DrawPolyLine( aPoly, aDXFLineInfo );
-        }
-    }
-}
-
-void DXF2GDIMetaFile::DrawHatchEntity(const DXFHatchEntity & rE, const DXFTransform & rTransform )
-{
-    if ( rE.nBoundaryPathCount )
-    {
-        SetAreaAttribute( rE );
-        sal_Int32 j = 0;
-        PolyPolygon aPolyPoly;
-        for ( j = 0; j < rE.nBoundaryPathCount; j++ )
-        {
-            DXFPointArray aPtAry;
-            const DXFBoundaryPathData& rPathData = rE.pBoundaryPathData[ j ];
-            if ( rPathData.bIsPolyLine )
-            {
-                sal_Int32 i;
-                for( i = 0; i < rPathData.nPointCount; i++ )
-                {
-                    Point aPt;
-                    rTransform.Transform( rPathData.pP[ i ], aPt );
-                    aPtAry.push_back( aPt );
-                }
-            }
-            else
-            {
-                sal_uInt32 i;
-                for ( i = 0; i < rPathData.aEdges.size(); i++ )
-                {
-                    const DXFEdgeType* pEdge = rPathData.aEdges[ i ];
-                    switch( pEdge->nEdgeType )
-                    {
-                        case 1 :
-                        {
-                            Point aPt;
-                            rTransform.Transform( ((DXFEdgeTypeLine*)pEdge)->aStartPoint, aPt );
-                            aPtAry.push_back( aPt );
-                            rTransform.Transform( ((DXFEdgeTypeLine*)pEdge)->aEndPoint, aPt );
-                            aPtAry.push_back( aPt );
-                        }
-                        break;
-                        case 2 :
-                        {
-/*
-                            double frx,fry,fA1,fdA,fAng;
-                            USHORT nPoints,i;
-                            DXFVector aC;
-                            Point aPS,aPE;
-                            fA1=((DXFEdgeTypeCircularArc*)pEdge)->fStartAngle;
-                            fdA=((DXFEdgeTypeCircularArc*)pEdge)->fEndAngle - fA1;
-                            while ( fdA >= 360.0 )
-                                fdA -= 360.0;
-                            while ( fdA <= 0 )
-                                fdA += 360.0;
-                            rTransform.Transform(((DXFEdgeTypeCircularArc*)pEdge)->aCenter, aC);
-                            if ( fdA > 5.0 && rTransform.TransCircleToEllipse(((DXFEdgeTypeCircularArc*)pEdge)->fRadius,frx,fry ) == TRUE )
-                            {
-                                DXFVector aVS(cos(fA1/180.0*3.14159265359),sin(fA1/180.0*3.14159265359),0.0);
-                                aVS*=((DXFEdgeTypeCircularArc*)pEdge)->fRadius;
-                                aVS+=((DXFEdgeTypeCircularArc*)pEdge)->aCenter;
-                                DXFVector aVE(cos((fA1+fdA)/180.0*3.14159265359),sin((fA1+fdA)/180.0*3.14159265359),0.0);
-                                aVE*=((DXFEdgeTypeCircularArc*)pEdge)->fRadius;
-                                aVE+=((DXFEdgeTypeCircularArc*)pEdge)->aCenter;
-                                if ( rTransform.Mirror() == TRUE )
-                                {
-                                    rTransform.Transform(aVS,aPS);
-                                    rTransform.Transform(aVE,aPE);
-                                }
-                                else
-                                {
-                                    rTransform.Transform(aVS,aPE);
-                                    rTransform.Transform(aVE,aPS);
-                                }
-                                pVirDev->DrawArc(
-                                    Rectangle((long)(aC.fx-frx+0.5),(long)(aC.fy-fry+0.5),
-                                              (long)(aC.fx+frx+0.5),(long)(aC.fy+fry+0.5)),
-                                    aPS,aPE
-                                );
-                            }
-*/
-                        }
-                        break;
-                        case 3 :
-                        case 4 :
-                        break;
-                    }
-                }
-            }
-            sal_uInt16 i, nSize = (sal_uInt16)aPtAry.size();
-            if ( nSize )
-            {
-                Polygon aPoly( nSize );
-                for ( i = 0; i < nSize; i++ )
-                    aPoly[ i ] = aPtAry[ i ];
-                aPolyPoly.Insert( aPoly, POLYPOLY_APPEND );
-            }
-        }
-        if ( aPolyPoly.Count() )
-            pVirDev->DrawPolyPolygon( aPolyPoly );
-    }
-}
-
-void DXF2GDIMetaFile::Draw3DFaceEntity(const DXF3DFaceEntity & rE, const DXFTransform & rTransform)
-{
-    USHORT nN,i;
-    if (SetLineAttribute(rE)) {
-        if (rE.aP2==rE.aP3) nN=3; else nN=4;
-        Polygon aPoly(nN);
-        rTransform.Transform(rE.aP0,aPoly[0]);
-        rTransform.Transform(rE.aP1,aPoly[1]);
-        rTransform.Transform(rE.aP2,aPoly[2]);
-        if (nN>3) rTransform.Transform(rE.aP3,aPoly[3]);
-        if ((rE.nIEFlags&0x0f)==0) pVirDev->DrawPolygon(aPoly);
-        else {
-            for (i=0; i<nN; i++) {
-                if ( (rE.nIEFlags & (1<<i)) == 0 ) {
-                    pVirDev->DrawLine(aPoly[i],aPoly[(i+1)%nN]);
-                }
-            }
-        }
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawDimensionEntity(const DXFDimensionEntity & rE, const DXFTransform & rTransform)
-{
-    const DXFBlock * pB;
-    pB=pDXF->aBlocks.Search(rE.sPseudoBlock);
-    if (pB!=NULL) {
-        DXFTransform aT(
-            DXFTransform(1.0,1.0,1.0,DXFVector(0.0,0.0,0.0)-pB->aBasePoint),
-            rTransform
-        );
-        long nSavedBlockColor, nSavedParentLayerColor;
-        DXFLineInfo aSavedBlockDXFLineInfo, aSavedParentLayerDXFLineInfo;
-        nSavedBlockColor=nBlockColor;
-        nSavedParentLayerColor=nParentLayerColor;
-        aSavedBlockDXFLineInfo=aBlockDXFLineInfo;
-        aSavedParentLayerDXFLineInfo=aParentLayerDXFLineInfo;
-        nBlockColor=GetEntityColor(rE);
-        aBlockDXFLineInfo=GetEntityDXFLineInfo(rE);
-        if (rE.sLayer[0]!='0' || rE.sLayer[1]!=0) {
-            DXFLayer * pLayer=pDXF->aTables.SearchLayer(rE.sLayer);
-            if (pLayer!=NULL) {
-                nParentLayerColor=pLayer->nColor;
-                aParentLayerDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
-            }
-        }
-        DrawEntities(*pB,aT,FALSE);
-        aBlockDXFLineInfo=aSavedBlockDXFLineInfo;
-        aParentLayerDXFLineInfo=aSavedParentLayerDXFLineInfo;
-        nBlockColor=nSavedBlockColor;
-        nParentLayerColor=nSavedParentLayerColor;
-    }
-}
-
-
-void DXF2GDIMetaFile::DrawEntities(const DXFEntities & rEntities,
-                                   const DXFTransform & rTransform,
-                                   BOOL bTopEntities)
-{
-    ULONG nCount=0;
-    DXFTransform aET;
-    const DXFTransform * pT;
-
-    const DXFBasicEntity * pE=rEntities.pFirst;
-
-    while (pE!=NULL && bStatus==TRUE) {
-        if (pE->nSpace==0) {
-            if (pE->aExtrusion.fz==1.0) {
-                pT=&rTransform;
-            }
-            else {
-                aET=DXFTransform(DXFTransform(pE->aExtrusion),rTransform);
-                pT=&aET;
-            }
-            switch (pE->eType) {
-            case DXF_LINE:
-                DrawLineEntity((DXFLineEntity&)*pE,*pT);
-                break;
-            case DXF_POINT:
-                DrawPointEntity((DXFPointEntity&)*pE,*pT);
-                break;
-            case DXF_CIRCLE:
-                DrawCircleEntity((DXFCircleEntity&)*pE,*pT);
-                break;
-            case DXF_ARC:
-                DrawArcEntity((DXFArcEntity&)*pE,*pT);
-                break;
-            case DXF_TRACE:
-                DrawTraceEntity((DXFTraceEntity&)*pE,*pT);
-                break;
-            case DXF_SOLID:
-                DrawSolidEntity((DXFSolidEntity&)*pE,*pT);
-                break;
-            case DXF_TEXT:
-                DrawTextEntity((DXFTextEntity&)*pE,*pT);
-                break;
-            case DXF_INSERT:
-                DrawInsertEntity((DXFInsertEntity&)*pE,*pT);
-                break;
-            case DXF_ATTRIB:
-                DrawAttribEntity((DXFAttribEntity&)*pE,*pT);
-                break;
-            case DXF_POLYLINE:
-                DrawPolyLineEntity((DXFPolyLineEntity&)*pE,*pT);
-                break;
-            case DXF_LWPOLYLINE :
-                DrawLWPolyLineEntity((DXFLWPolyLineEntity&)*pE, *pT);
-                break;
-            case DXF_HATCH :
-                DrawHatchEntity((DXFHatchEntity&)*pE, *pT);
-                break;
-            case DXF_3DFACE:
-                Draw3DFaceEntity((DXF3DFaceEntity&)*pE,*pT);
-                break;
-            case DXF_DIMENSION:
-                DrawDimensionEntity((DXFDimensionEntity&)*pE,*pT);
-                break;
-            default:
-                break;  // four other values not handled -Wall
-            }
-        }
-        pE=pE->pSucc;
-        nCount++;
-        if (bTopEntities) MayCallback(nCount);
-    }
-}
-
-
-DXF2GDIMetaFile::DXF2GDIMetaFile()
-{
-}
-
-
-DXF2GDIMetaFile::~DXF2GDIMetaFile()
-{
-}
-
-
-BOOL DXF2GDIMetaFile::Convert(const DXFRepresentation & rDXF, GDIMetaFile & rMTF, USHORT nminpercent, USHORT nmaxpercent)
-{
-    double fWidth,fHeight,fScale;
-    DXFTransform aTransform;
-    Size aPrefSize;
-    const DXFLayer * pLayer;
-    const DXFVPort * pVPort;
-
-    pVirDev = new VirtualDevice;
-    pDXF    = &rDXF;
-    bStatus = TRUE;
-
-    OptPointsPerCircle=50;
-
-    nMinPercent=(ULONG)nminpercent;
-    nMaxPercent=(ULONG)nmaxpercent;
-    nLastPercent=nMinPercent;
-    nMainEntitiesCount=CountEntities(pDXF->aEntities);
-
-    nBlockColor=7;
-    aBlockDXFLineInfo.eStyle = LINE_SOLID;
-    aBlockDXFLineInfo.fWidth = 0;
-    aBlockDXFLineInfo.nDashCount = 0;
-    aBlockDXFLineInfo.fDashLen = 0;
-    aBlockDXFLineInfo.nDotCount = 0;
-    aBlockDXFLineInfo.fDotLen = 0;
-    aBlockDXFLineInfo.fDistance = 0;
-
-    pLayer=pDXF->aTables.SearchLayer("0");
-    if (pLayer!=NULL) {
-        nParentLayerColor=pLayer->nColor & 0xff;
-        aParentLayerDXFLineInfo=LTypeToDXFLineInfo(pLayer->sLineType);
-    }
-    else {
-        nParentLayerColor=7;
-        aParentLayerDXFLineInfo.eStyle = LINE_SOLID;
-        aParentLayerDXFLineInfo.fWidth = 0;
-        aParentLayerDXFLineInfo.nDashCount = 0;
-        aParentLayerDXFLineInfo.fDashLen = 0;
-        aParentLayerDXFLineInfo.nDotCount = 0;
-        aParentLayerDXFLineInfo.fDotLen = 0;
-        aParentLayerDXFLineInfo.fDistance = 0;
-    }
-
-    pVirDev->EnableOutput(FALSE);
-    rMTF.Record(pVirDev);
-
-    aActLineColor = pVirDev->GetLineColor();
-    aActFillColor = pVirDev->GetFillColor();
-    aActFont = pVirDev->GetFont();
-
-    pVPort=pDXF->aTables.SearchVPort("*ACTIVE");
-    if (pVPort!=NULL) {
-        if (pVPort->aDirection.fx==0 && pVPort->aDirection.fy==0)
-            pVPort=NULL;
-    }
-
-    if (pVPort==NULL) {
-        if (pDXF->aBoundingBox.bEmpty==TRUE)
-            bStatus=FALSE;
-        else {
-            fWidth=pDXF->aBoundingBox.fMaxX-pDXF->aBoundingBox.fMinX;
-            fHeight=pDXF->aBoundingBox.fMaxY-pDXF->aBoundingBox.fMinY;
-            if (fWidth<=0 || fHeight<=0) {
-                bStatus=FALSE;
-                fScale = 0;  // -Wall added this...
-            }
-            else {
-//              if (fWidth<500.0 || fHeight<500.0 || fWidth>32767.0 || fHeight>32767.0) {
-                    if (fWidth>fHeight)
-                        fScale=10000.0/fWidth;
-                    else
-                        fScale=10000.0/fHeight;
-//              }
-//              else
-//                  fScale=1.0;
-                aTransform=DXFTransform(fScale,-fScale,fScale,
-                                        DXFVector(-pDXF->aBoundingBox.fMinX*fScale,
-                                                   pDXF->aBoundingBox.fMaxY*fScale,
-                                                  -pDXF->aBoundingBox.fMinZ*fScale));
-            }
-            aPrefSize.Width() =(long)(fWidth*fScale+1.5);
-            aPrefSize.Height()=(long)(fHeight*fScale+1.5);
-        }
-    }
-    else {
-        fHeight=pVPort->fHeight;
-        fWidth=fHeight*pVPort->fAspectRatio;
-//      if (fWidth<500.0 || fHeight<500.0 || fWidth>32767.0 || fHeight>32767.0) {
-            if (fWidth>fHeight)
-                fScale=10000.0/fWidth;
-            else
-                fScale=10000.0/fHeight;
-//      }
-//      else
-//          fScale=1.0;
-        aTransform=DXFTransform(
-            DXFTransform(pVPort->aDirection,pVPort->aTarget),
-            DXFTransform(
-                DXFTransform(1.0,-1.0,1.0,DXFVector(fWidth/2-pVPort->fCenterX,fHeight/2+pVPort->fCenterY,0)),
-                DXFTransform(fScale,fScale,fScale,DXFVector(0,0,0))
-            )
-        );
-        aPrefSize.Width() =(long)(fWidth*fScale+1.5);
-        aPrefSize.Height()=(long)(fHeight*fScale+1.5);
-    }
-
-    if (bStatus==TRUE)
-        DrawEntities(pDXF->aEntities,aTransform,TRUE);
-
-    rMTF.Stop();
-
-    if ( bStatus==TRUE )
-    {
-        rMTF.SetPrefSize( aPrefSize );
-
-        // MapMode einfach, falls Grafik dann nicht zu klein wird (<0,5cm),
-        // auf 1/100-mm (1/10-mm) setzen
-        if( ( aPrefSize.Width() < 500 ) && ( aPrefSize.Height() < 500 ) )
-            rMTF.SetPrefMapMode( MapMode( MAP_10TH_MM ) );
-        else
-            rMTF.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
-    }
-
-    delete pVirDev;
-    return bStatus;
-}
-
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxf2mtf.hxx b/goodies/source/filter.vcl/idxf/dxf2mtf.hxx
deleted file mode 100644
index a1bf99639430..000000000000
--- a/goodies/source/filter.vcl/idxf/dxf2mtf.hxx
+++ /dev/null
@@ -1,131 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxf2mtf.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.
- *
- ************************************************************************/
-
-#ifndef _DXF2MTF_HXX
-#define _DXF2MTF_HXX
-
-#include "dxfreprd.hxx"
-#include <vcl/font.hxx>
-#include <vcl/lineinfo.hxx>
-
-// MT: NOOLDSV, someone should change the code...
-enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
-enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
-                  BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG,
-                  BRUSH_25, BRUSH_50, BRUSH_75,
-                  BRUSH_BITMAP };
-
-
-class DXF2GDIMetaFile {
-private:
-
-    VirtualDevice * pVirDev;
-    const DXFRepresentation * pDXF;
-    BOOL bStatus;
-
-    USHORT OptPointsPerCircle;
-
-    ULONG nMinPercent;
-    ULONG nMaxPercent;
-    ULONG nLastPercent;
-    ULONG nMainEntitiesCount;
-
-    long        nBlockColor;
-    DXFLineInfo aBlockDXFLineInfo;
-    long        nParentLayerColor;
-    DXFLineInfo aParentLayerDXFLineInfo;
-    Color       aActLineColor;
-    Color       aActFillColor;
-    Font        aActFont;
-
-    ULONG CountEntities(const DXFEntities & rEntities);
-
-    void MayCallback(ULONG nMainEntitiesProcessed);
-
-    Color ConvertColor(BYTE nColor);
-
-    long GetEntityColor(const DXFBasicEntity & rE);
-
-    DXFLineInfo LTypeToDXFLineInfo(const char * sLineType);
-
-    DXFLineInfo GetEntityDXFLineInfo(const DXFBasicEntity & rE);
-
-    BOOL SetLineAttribute(const DXFBasicEntity & rE, ULONG nWidth=0);
-
-    BOOL SetAreaAttribute(const DXFBasicEntity & rE);
-
-    BOOL SetFontAttribute(const DXFBasicEntity & rE, short nAngle,
-                          USHORT nHeight, double fWidthScale);
-
-    void DrawLineEntity(const DXFLineEntity & rE, const DXFTransform & rTransform);
-
-    void DrawPointEntity(const DXFPointEntity & rE, const DXFTransform & rTransform);
-
-    void DrawCircleEntity(const DXFCircleEntity & rE, const DXFTransform & rTransform);
-
-    void DrawArcEntity(const DXFArcEntity & rE, const DXFTransform & rTransform);
-
-    void DrawTraceEntity(const DXFTraceEntity & rE, const DXFTransform & rTransform);
-
-    void DrawSolidEntity(const DXFSolidEntity & rE, const DXFTransform & rTransform);
-
-    void DrawTextEntity(const DXFTextEntity & rE, const DXFTransform & rTransform);
-
-    void DrawInsertEntity(const DXFInsertEntity & rE, const DXFTransform & rTransform);
-
-    void DrawAttribEntity(const DXFAttribEntity & rE, const DXFTransform & rTransform);
-
-    void DrawPolyLineEntity(const DXFPolyLineEntity & rE, const DXFTransform & rTransform);
-
-    void Draw3DFaceEntity(const DXF3DFaceEntity & rE, const DXFTransform & rTransform);
-
-    void DrawDimensionEntity(const DXFDimensionEntity & rE, const DXFTransform & rTransform);
-
-    void DrawLWPolyLineEntity( const DXFLWPolyLineEntity & rE, const DXFTransform & rTransform );
-
-    void DrawHatchEntity( const DXFHatchEntity & rE, const DXFTransform & rTransform );
-
-    void DrawEntities(const DXFEntities & rEntities,
-                      const DXFTransform & rTransform,
-                      BOOL bTopEntities);
-
-public:
-
-    DXF2GDIMetaFile();
-    ~DXF2GDIMetaFile();
-
-    BOOL Convert( const DXFRepresentation & rDXF, GDIMetaFile & rMTF, USHORT nMinPercent, USHORT nMaxPercent);
-
-};
-
-
-#endif
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxfblkrd.cxx b/goodies/source/filter.vcl/idxf/dxfblkrd.cxx
deleted file mode 100644
index 590301f857ee..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfblkrd.cxx
+++ /dev/null
@@ -1,142 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfblkrd.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <string.h>
-#include <dxfblkrd.hxx>
-
-
-//----------------------------------------------------------------------------
-//---------------- DXFBlock --------------------------------------------------
-//----------------------------------------------------------------------------
-
-
-DXFBlock::DXFBlock()
-{
-    pSucc=NULL;
-}
-
-
-DXFBlock::~DXFBlock()
-{
-}
-
-
-void DXFBlock::Read(DXFGroupReader & rDGR)
-{
-    sName[0]=0;
-    sAlsoName[0]=0;
-    aBasePoint.fx=0.0;
-    aBasePoint.fy=0.0;
-    aBasePoint.fz=0.0;
-    nFlags=0;
-    sXRef[0]=0;
-
-    while (rDGR.Read()!=0)
-    {
-        switch (rDGR.GetG())
-        {
-            case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-            case  3: strncpy( sAlsoName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-            case 70: nFlags=rDGR.GetI(); break;
-            case 10: aBasePoint.fx=rDGR.GetF(); break;
-            case 20: aBasePoint.fy=rDGR.GetF(); break;
-            case 30: aBasePoint.fz=rDGR.GetF(); break;
-            case  1: strncpy( sXRef, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        }
-    }
-    DXFEntities::Read(rDGR);
-}
-
-
-//----------------------------------------------------------------------------
-//---------------- DXFBlocks -------------------------------------------------
-//----------------------------------------------------------------------------
-
-
-DXFBlocks::DXFBlocks()
-{
-    pFirst=NULL;
-}
-
-
-DXFBlocks::~DXFBlocks()
-{
-    Clear();
-}
-
-
-void DXFBlocks::Read(DXFGroupReader & rDGR)
-{
-    DXFBlock * pB, * * ppSucc;
-
-    ppSucc=&pFirst;
-    while (*ppSucc!=NULL) ppSucc=&((*ppSucc)->pSucc);
-
-    for (;;) {
-        while (rDGR.GetG()!=0) rDGR.Read();
-        if (strcmp(rDGR.GetS(),"ENDSEC")==0 ||
-            strcmp(rDGR.GetS(),"EOF")==0) break;
-        if (strcmp(rDGR.GetS(),"BLOCK")==0) {
-            pB=new DXFBlock;
-            pB->Read(rDGR);
-            *ppSucc=pB;
-            ppSucc=&(pB->pSucc);
-        }
-        else rDGR.Read();
-    }
-}
-
-
-DXFBlock * DXFBlocks::Search(const char * sName) const
-{
-    DXFBlock * pB;
-    for (pB=pFirst; pB!=NULL; pB=pB->pSucc) {
-        if (strcmp(sName,pB->sName)==0) break;
-    }
-    return pB;
-}
-
-
-void DXFBlocks::Clear()
-{
-    DXFBlock * ptmp;
-
-    while (pFirst!=NULL) {
-        ptmp=pFirst;
-        pFirst=ptmp->pSucc;
-        delete ptmp;
-    }
-}
-
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxfblkrd.hxx b/goodies/source/filter.vcl/idxf/dxfblkrd.hxx
deleted file mode 100644
index 8468ca204601..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfblkrd.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfblkrd.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _DXFBLKRD_HXX
-#define _DXFBLKRD_HXX
-
-#include <dxfentrd.hxx>
-
-//----------------------------------------------------------------------------
-//---------------- Ein Block (= Menge von Entities) --------------------------
-//----------------------------------------------------------------------------
-
-class DXFBlock : public DXFEntities {
-
-public:
-
-    DXFBlock * pSucc;
-        // Zeiger auf naechsten Block in der Liste DXFBlocks::pFirst
-
-    // Eigenschaften des Blocks, durch Gruppencodes kommentiert:
-    char sName[DXF_MAX_STRING_LEN+1];     //  2
-    char sAlsoName[DXF_MAX_STRING_LEN+1]; //  3
-    long nFlags;                          // 70
-    DXFVector aBasePoint;                 // 10,20,30
-    char sXRef[DXF_MAX_STRING_LEN+1];     //  1
-
-    DXFBlock();
-    ~DXFBlock();
-
-    void Read(DXFGroupReader & rDGR);
-        // Liest den Block (einschliesslich der Entities) per rGDR
-        // aus einer DXF-Datei bis zu einem ENDBLK, ENDSEC oder EOF.
-};
-
-
-//----------------------------------------------------------------------------
-//---------------- Eine Menge von Bloecken -----------------------------------
-//----------------------------------------------------------------------------
-
-class DXFBlocks {
-
-public:
-
-    DXFBlock * pFirst;
-        // Liste der Bloecke, READ ONLY!
-
-    DXFBlocks();
-    ~DXFBlocks();
-
-    void Read(DXFGroupReader & rDGR);
-        // Liesst alle Bloecke per rDGR bis zu einem ENDSEC oder EOF.
-
-    DXFBlock * Search(const char * sName) const;
-        // Sucht einen Block mit dem Namen, liefert NULL bei Misserfolg.
-
-    void Clear();
-        // Loescht alle Bloecke;
-
-};
-
-#endif
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxfentrd.cxx b/goodies/source/filter.vcl/idxf/dxfentrd.cxx
deleted file mode 100644
index f7a957bfa811..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfentrd.cxx
+++ /dev/null
@@ -1,874 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfentrd.cxx,v $
- * $Revision: 1.7 $
- *
- * 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_goodies.hxx"
-
-#include <string.h>
-#include <dxfentrd.hxx>
-
-//--------------------------DXFBasicEntity--------------------------------------
-
-DXFBasicEntity::DXFBasicEntity(DXFEntityType eThisType)
-{
-    eType=eThisType;
-    pSucc=NULL;
-    strncpy(sLayer,"0", 2 );
-    strncpy(sLineType,"BYLAYER", 8 );
-    fElevation=0;
-    fThickness=0;
-    nColor=256;
-    nSpace=0;
-    aExtrusion.fx=0.0;
-    aExtrusion.fy=0.0;
-    aExtrusion.fz=1.0;
-}
-
-void DXFBasicEntity::Read(DXFGroupReader & rDGR)
-{
-    while (rDGR.Read()!=0) EvaluateGroup(rDGR);
-}
-
-void DXFBasicEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG())
-    {
-        case   8: strncpy( sLayer, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case   6: strncpy( sLineType, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case  38: fElevation=rDGR.GetF(); break;
-        case  39: fThickness=rDGR.GetF(); break;
-        case  62: nColor=rDGR.GetI(); break;
-        case  67: nSpace=rDGR.GetI(); break;
-        case 210: aExtrusion.fx=rDGR.GetF(); break;
-        case 220: aExtrusion.fy=rDGR.GetF(); break;
-        case 230: aExtrusion.fz=rDGR.GetF(); break;
-    }
-}
-
-DXFBasicEntity::~DXFBasicEntity()
-{
-}
-
-//--------------------------DXFLineEntity---------------------------------------
-
-DXFLineEntity::DXFLineEntity() : DXFBasicEntity(DXF_LINE)
-{
-}
-
-void DXFLineEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 11: aP1.fx=rDGR.GetF(); break;
-        case 21: aP1.fy=rDGR.GetF(); break;
-        case 31: aP1.fz=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFPointEntity--------------------------------------
-
-DXFPointEntity::DXFPointEntity() : DXFBasicEntity(DXF_POINT)
-{
-}
-
-void DXFPointEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFCircleEntity-------------------------------------
-
-DXFCircleEntity::DXFCircleEntity() : DXFBasicEntity(DXF_CIRCLE)
-{
-    fRadius=1.0;
-}
-
-void DXFCircleEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 40: fRadius=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFArcEntity----------------------------------------
-
-DXFArcEntity::DXFArcEntity() : DXFBasicEntity(DXF_ARC)
-{
-    fRadius=1.0;
-    fStart=0;
-    fEnd=360.0;
-}
-
-void DXFArcEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 40: fRadius=rDGR.GetF(); break;
-        case 50: fStart=rDGR.GetF(); break;
-        case 51: fEnd=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFTraceEntity--------------------------------------
-
-DXFTraceEntity::DXFTraceEntity() : DXFBasicEntity(DXF_TRACE)
-{
-}
-
-void DXFTraceEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 11: aP1.fx=rDGR.GetF(); break;
-        case 21: aP1.fy=rDGR.GetF(); break;
-        case 31: aP1.fz=rDGR.GetF(); break;
-        case 12: aP2.fx=rDGR.GetF(); break;
-        case 22: aP2.fy=rDGR.GetF(); break;
-        case 32: aP2.fz=rDGR.GetF(); break;
-        case 13: aP3.fx=rDGR.GetF(); break;
-        case 23: aP3.fy=rDGR.GetF(); break;
-        case 33: aP3.fz=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFSolidEntity--------------------------------------
-
-DXFSolidEntity::DXFSolidEntity() : DXFBasicEntity(DXF_SOLID)
-{
-}
-
-void DXFSolidEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 11: aP1.fx=rDGR.GetF(); break;
-        case 21: aP1.fy=rDGR.GetF(); break;
-        case 31: aP1.fz=rDGR.GetF(); break;
-        case 12: aP2.fx=rDGR.GetF(); break;
-        case 22: aP2.fy=rDGR.GetF(); break;
-        case 32: aP2.fz=rDGR.GetF(); break;
-        case 13: aP3.fx=rDGR.GetF(); break;
-        case 23: aP3.fy=rDGR.GetF(); break;
-        case 33: aP3.fz=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFTextEntity---------------------------------------
-
-DXFTextEntity::DXFTextEntity() : DXFBasicEntity(DXF_TEXT)
-{
-    fHeight=1.0;
-    sText[0]=0;
-    fRotAngle=0.0;
-    fXScale=1.0;
-    fOblAngle=0.0;
-    strncpy( sStyle, "STANDARD", 9 );
-    nGenFlags=0;
-    nHorzJust=0;
-    nVertJust=0;
-}
-
-void DXFTextEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 40: fHeight=rDGR.GetF(); break;
-        case  1: strncpy( sText, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case 50: fRotAngle=rDGR.GetF(); break;
-        case 41: fXScale=rDGR.GetF(); break;
-        case 42: fOblAngle=rDGR.GetF(); break;
-        case  7: strncpy( sStyle, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case 71: nGenFlags=rDGR.GetI(); break;
-        case 72: nHorzJust=rDGR.GetI(); break;
-        case 73: nVertJust=rDGR.GetI(); break;
-        case 11: aAlign.fx=rDGR.GetF(); break;
-        case 21: aAlign.fy=rDGR.GetF(); break;
-        case 31: aAlign.fz=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFShapeEntity--------------------------------------
-
-DXFShapeEntity::DXFShapeEntity() : DXFBasicEntity(DXF_SHAPE)
-{
-    fSize=1.0;
-    sName[0]=0;
-    fRotAngle=0;
-    fXScale=1.0;
-    fOblAngle=0;
-}
-
-void DXFShapeEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 40: fSize=rDGR.GetF(); break;
-        case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case 50: fRotAngle=rDGR.GetF(); break;
-        case 41: fXScale=rDGR.GetF(); break;
-        case 51: fOblAngle=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFInsertEntity-------------------------------------
-
-DXFInsertEntity::DXFInsertEntity() : DXFBasicEntity(DXF_INSERT)
-{
-    nAttrFlag=0;
-    sName[0]=0;
-    fXScale=1.0;
-    fYScale=1.0;
-    fZScale=1.0;
-    fRotAngle=0.0;
-    nColCount=1;
-    nRowCount=1;
-    fColSpace=0.0;
-    fRowSpace=0.0;
-}
-
-void DXFInsertEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 66: nAttrFlag=rDGR.GetI(); break;
-        case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 41: fXScale=rDGR.GetF(); break;
-        case 42: fYScale=rDGR.GetF(); break;
-        case 43: fZScale=rDGR.GetF(); break;
-        case 50: fRotAngle=rDGR.GetF(); break;
-        case 70: nColCount=rDGR.GetI(); break;
-        case 71: nRowCount=rDGR.GetI(); break;
-        case 44: fColSpace=rDGR.GetF(); break;
-        case 45: fRowSpace=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFAttDefEntity-------------------------------------
-
-DXFAttDefEntity::DXFAttDefEntity() : DXFBasicEntity(DXF_ATTDEF)
-{
-    fHeight=1.0;
-    sDefVal[0]=0;
-    sPrompt[0]=0;
-    sTagStr[0]=0;
-    nAttrFlags=0;
-    nFieldLen=0;
-    fRotAngle=0.0;
-    fXScale=1.0;
-    fOblAngle=0.0;
-    strncpy( sStyle, "STANDARD", 9 );
-    nGenFlags=0;
-    nHorzJust=0;
-    nVertJust=0;
-}
-
-void DXFAttDefEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 40: fHeight=rDGR.GetF(); break;
-        case  1: strncpy( sDefVal, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case  3: strncpy( sPrompt, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case  2: strncpy( sTagStr, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case 70: nAttrFlags=rDGR.GetI(); break;
-        case 73: nFieldLen=rDGR.GetI(); break;
-        case 50: fRotAngle=rDGR.GetF(); break;
-        case 41: fXScale=rDGR.GetF(); break;
-        case 51: fOblAngle=rDGR.GetF(); break;
-        case  7: strncpy( sStyle, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case 71: nGenFlags=rDGR.GetI(); break;
-        case 72: nHorzJust=rDGR.GetI(); break;
-        case 74: nVertJust=rDGR.GetI(); break;
-        case 11: aAlign.fx=rDGR.GetF(); break;
-        case 21: aAlign.fy=rDGR.GetF(); break;
-        case 31: aAlign.fz=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFAttribEntity-------------------------------------
-
-DXFAttribEntity::DXFAttribEntity() : DXFBasicEntity(DXF_ATTRIB)
-{
-    fHeight=1.0;
-    sText[0]=0;
-    sTagStr[0]=0;
-    nAttrFlags=0;
-    nFieldLen=0;
-    fRotAngle=0.0;
-    fXScale=1.0;
-    fOblAngle=0.0;
-    strncpy( sStyle, "STANDARD", 9 );
-    nGenFlags=0;
-    nHorzJust=0;
-    nVertJust=0;
-}
-
-void DXFAttribEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 40: fHeight=rDGR.GetF(); break;
-        case  1: strncpy( sText, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case  2: strncpy( sTagStr, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case 70: nAttrFlags=rDGR.GetI(); break;
-        case 73: nFieldLen=rDGR.GetI(); break;
-        case 50: fRotAngle=rDGR.GetF(); break;
-        case 41: fXScale=rDGR.GetF(); break;
-        case 51: fOblAngle=rDGR.GetF(); break;
-        case  7: strncpy( sStyle, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        case 71: nGenFlags=rDGR.GetI(); break;
-        case 72: nHorzJust=rDGR.GetI(); break;
-        case 74: nVertJust=rDGR.GetI(); break;
-        case 11: aAlign.fx=rDGR.GetF(); break;
-        case 21: aAlign.fy=rDGR.GetF(); break;
-        case 31: aAlign.fz=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFPolyLine-----------------------------------------
-
-DXFPolyLineEntity::DXFPolyLineEntity() : DXFBasicEntity(DXF_POLYLINE)
-{
-    fElevation=0.0;
-    nFlags=0;
-    fSWidth=0.0;
-    fEWidth=0.0;
-    nMeshMCount=0;
-    nMeshNCount=0;
-    nMDensity=0;
-    nNDensity=0;
-    nCSSType=0;
-}
-
-void DXFPolyLineEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 30: fElevation=rDGR.GetF(); break;
-        case 70: nFlags=rDGR.GetI(); break;
-        case 40: fSWidth=rDGR.GetF(); break;
-        case 41: fEWidth=rDGR.GetF(); break;
-        case 71: nMeshMCount=rDGR.GetI(); break;
-        case 72: nMeshNCount=rDGR.GetI(); break;
-        case 73: nMDensity=rDGR.GetI(); break;
-        case 74: nNDensity=rDGR.GetI(); break;
-        case 75: nCSSType=rDGR.GetI(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFLWPolyLine---------------------------------------
-
-DXFLWPolyLineEntity::DXFLWPolyLineEntity() :
-    DXFBasicEntity( DXF_LWPOLYLINE ),
-    nIndex( 0 ),
-    nCount( 0 ),
-    nFlags( 0 ),
-    fConstantWidth( 0.0 ),
-    fStartWidth( 0.0 ),
-    fEndWidth( 0.0 ),
-    pP( NULL )
-{
-}
-
-void DXFLWPolyLineEntity::EvaluateGroup( DXFGroupReader & rDGR )
-{
-    switch ( rDGR.GetG() )
-    {
-        case 90 :
-        {
-            nCount = rDGR.GetI();
-            if ( nCount )
-                pP = new DXFVector[ nCount ];
-        }
-        break;
-        case 70: nFlags = rDGR.GetI(); break;
-        case 43: fConstantWidth = rDGR.GetF(); break;
-        case 40: fStartWidth = rDGR.GetF(); break;
-        case 41: fEndWidth = rDGR.GetF(); break;
-        case 10:
-        {
-            if ( pP && ( nIndex < nCount ) )
-                pP[ nIndex ].fx = rDGR.GetF();
-        }
-        break;
-        case 20:
-        {
-            if ( pP && ( nIndex < nCount ) )
-                pP[ nIndex++ ].fy = rDGR.GetF();
-        }
-        break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-DXFLWPolyLineEntity::~DXFLWPolyLineEntity()
-{
-    delete[] pP;
-}
-
-//--------------------------DXFHatchEntity-------------------------------------
-
-DXFEdgeTypeLine::DXFEdgeTypeLine() :
-    DXFEdgeType( 1 )
-{
-
-}
-DXFEdgeTypeLine::~DXFEdgeTypeLine()
-{
-
-}
-sal_Bool DXFEdgeTypeLine::EvaluateGroup( DXFGroupReader & rDGR )
-{
-    sal_Bool bExecutingGroupCode = sal_True;
-    switch ( rDGR.GetG() )
-    {
-        case 10 : aStartPoint.fx = rDGR.GetF(); break;
-        case 20 : aStartPoint.fy = rDGR.GetF(); break;
-        case 11 : aEndPoint.fx = rDGR.GetF(); break;
-        case 21 : aEndPoint.fy = rDGR.GetF(); break;
-        default : bExecutingGroupCode = sal_False; break;
-    }
-    return  bExecutingGroupCode;
-}
-
-DXFEdgeTypeCircularArc::DXFEdgeTypeCircularArc() :
-    DXFEdgeType( 2 ),
-    fRadius( 0.0 ),
-    fStartAngle( 0.0 ),
-    fEndAngle( 0.0 ),
-    nIsCounterClockwiseFlag( 0 )
-{
-}
-DXFEdgeTypeCircularArc::~DXFEdgeTypeCircularArc()
-{
-}
-sal_Bool DXFEdgeTypeCircularArc::EvaluateGroup( DXFGroupReader & rDGR )
-{
-    sal_Bool bExecutingGroupCode = sal_True;
-    switch ( rDGR.GetG() )
-    {
-        case 10 : aCenter.fx = rDGR.GetF(); break;
-        case 20 : aCenter.fy = rDGR.GetF(); break;
-        case 40 : fRadius = rDGR.GetF(); break;
-        case 50 : fStartAngle = rDGR.GetF(); break;
-        case 51 : fEndAngle = rDGR.GetF(); break;
-        case 73 : nIsCounterClockwiseFlag = rDGR.GetI(); break;
-        default : bExecutingGroupCode = sal_False; break;
-    }
-    return  bExecutingGroupCode;
-}
-
-DXFEdgeTypeEllipticalArc::DXFEdgeTypeEllipticalArc() :
-    DXFEdgeType( 3 ),
-    fLength( 0.0 ),
-    fStartAngle( 0.0 ),
-    fEndAngle( 0.0 ),
-    nIsCounterClockwiseFlag( 0 )
-{
-}
-DXFEdgeTypeEllipticalArc::~DXFEdgeTypeEllipticalArc()
-{
-
-}
-sal_Bool DXFEdgeTypeEllipticalArc::EvaluateGroup( DXFGroupReader & rDGR )
-{
-    sal_Bool bExecutingGroupCode = sal_True;
-    switch( rDGR.GetG() )
-    {
-        case 10 : aCenter.fx = rDGR.GetF(); break;
-        case 20 : aCenter.fy = rDGR.GetF(); break;
-        case 11 : aEndPoint.fx = rDGR.GetF(); break;
-        case 21 : aEndPoint.fy = rDGR.GetF(); break;
-        case 40 : fLength = rDGR.GetF(); break;
-        case 50 : fStartAngle = rDGR.GetF(); break;
-        case 51 : fEndAngle = rDGR.GetF(); break;
-        case 73 : nIsCounterClockwiseFlag = rDGR.GetI(); break;
-        default : bExecutingGroupCode = sal_False; break;
-    }
-    return  bExecutingGroupCode;
-}
-
-DXFEdgeTypeSpline::DXFEdgeTypeSpline() :
-    DXFEdgeType( 4 ),
-    nDegree( 0 ),
-    nRational( 0 ),
-    nPeriodic( 0 ),
-    nKnotCount( 0 ),
-    nControlCount( 0 )
-{
-}
-DXFEdgeTypeSpline::~DXFEdgeTypeSpline()
-{
-
-}
-sal_Bool DXFEdgeTypeSpline::EvaluateGroup( DXFGroupReader & rDGR )
-{
-    sal_Bool bExecutingGroupCode = sal_True;
-    switch ( rDGR.GetG() )
-    {
-        case 94 : nDegree = rDGR.GetI(); break;
-        case 73 : nRational = rDGR.GetI(); break;
-        case 74 : nPeriodic = rDGR.GetI(); break;
-        case 95 : nKnotCount = rDGR.GetI(); break;
-        case 96 : nControlCount = rDGR.GetI(); break;
-        default : bExecutingGroupCode = sal_False; break;
-    }
-    return  bExecutingGroupCode;
-}
-
-DXFBoundaryPathData::DXFBoundaryPathData() :
-    nFlags( 0 ),
-    nHasBulgeFlag( 0 ),
-    nIsClosedFlag( 0 ),
-    nPointCount( 0 ),
-    fBulge( 0.0 ),
-    nSourceBoundaryObjects( 0 ),
-    nEdgeCount( 0 ),
-    bIsPolyLine( sal_True ),
-    nPointIndex( 0 ),
-    pP( NULL )
-{
-}
-
-DXFBoundaryPathData::~DXFBoundaryPathData()
-{
-    sal_uInt32 i = 0;
-    for ( i = 0; i < aEdges.size(); i++ )
-        delete aEdges[ i ];
-    delete[] pP;
-}
-
-sal_Bool DXFBoundaryPathData::EvaluateGroup( DXFGroupReader & rDGR )
-{
-    sal_Bool bExecutingGroupCode = sal_True;
-    if ( bIsPolyLine )
-    {
-        switch( rDGR.GetG() )
-        {
-            case 92 :
-            {
-                nFlags = rDGR.GetI();
-                if ( ( nFlags & 2 ) == 0 )
-                    bIsPolyLine = sal_False;
-            }
-            break;
-            case 93 :
-            {
-                nPointCount = rDGR.GetI();
-                if ( nPointCount )
-                    pP = new DXFVector[ nPointCount ];
-            }
-            break;
-            case 72 : nHasBulgeFlag = rDGR.GetI(); break;
-            case 73 : nIsClosedFlag = rDGR.GetI(); break;
-            case 97 : nSourceBoundaryObjects = rDGR.GetI(); break;
-            case 42 : fBulge = rDGR.GetF(); break;
-            case 10:
-            {
-                if ( pP && ( nPointIndex < nPointCount ) )
-                    pP[ nPointIndex ].fx = rDGR.GetF();
-            }
-            break;
-            case 20:
-            {
-                if ( pP && ( nPointIndex < nPointCount ) )
-                    pP[ nPointIndex++ ].fy = rDGR.GetF();
-            }
-            break;
-
-            default : bExecutingGroupCode = sal_False; break;
-        }
-    }
-    else
-    {
-        if ( rDGR.GetG() == 93 )
-            nEdgeCount = rDGR.GetI();
-        else if ( rDGR.GetG() == 72 )
-        {
-            sal_Int32 nEdgeType = rDGR.GetI();
-            switch( nEdgeType )
-            {
-                case 1 : aEdges.push_back( new DXFEdgeTypeLine() ); break;
-                case 2 : aEdges.push_back( new DXFEdgeTypeCircularArc() ); break;
-                case 3 : aEdges.push_back( new DXFEdgeTypeEllipticalArc() ); break;
-                case 4 : aEdges.push_back( new DXFEdgeTypeSpline() ); break;
-            }
-        }
-        else if ( aEdges.size() )
-            aEdges[ aEdges.size() - 1 ]->EvaluateGroup( rDGR );
-        else
-            bExecutingGroupCode = sal_False;
-    }
-    return bExecutingGroupCode;
-}
-
-DXFHatchEntity::DXFHatchEntity() :
-    DXFBasicEntity( DXF_HATCH ),
-    bIsInBoundaryPathContext( sal_False ),
-    nCurrentBoundaryPathIndex( -1 ),
-    nFlags( 0 ),
-    nAssociativityFlag( 0 ),
-    nBoundaryPathCount( 0 ),
-    nHatchStyle( 0 ),
-    nHatchPatternType( 0 ),
-    fHatchPatternAngle( 0.0 ),
-    fHatchPatternScale( 1.0 ),
-    nHatchDoubleFlag( 0 ),
-    nHatchPatternDefinitionLines( 0 ),
-    fPixelSize( 1.0 ),
-    nNumberOfSeedPoints( 0 ),
-    pBoundaryPathData( NULL )
-{
-}
-
-void DXFHatchEntity::EvaluateGroup( DXFGroupReader & rDGR )
-{
-    switch ( rDGR.GetG() )
-    {
-//      case 10 : aElevationPoint.fx = rDGR.GetF(); break;
-//      case 20 : aElevationPoint.fy = rDGR.GetF(); break;
-//      case 30 : aElevationPoint.fz = rDGR.GetF(); break;
-        case 70 : nFlags = rDGR.GetI(); break;
-        case 71 : nAssociativityFlag = rDGR.GetI(); break;
-        case 91 :
-        {
-            bIsInBoundaryPathContext = sal_True;
-            nBoundaryPathCount = rDGR.GetI();
-            if ( nBoundaryPathCount )
-                pBoundaryPathData = new DXFBoundaryPathData[ nBoundaryPathCount ];
-        }
-        break;
-        case 75 :
-        {
-            nHatchStyle = rDGR.GetI();
-            bIsInBoundaryPathContext = sal_False;
-        }
-        break;
-        case 76 : nHatchPatternType = rDGR.GetI(); break;
-        case 52 : fHatchPatternAngle = rDGR.GetF(); break;
-        case 41 : fHatchPatternScale = rDGR.GetF(); break;
-        case 77 : nHatchDoubleFlag = rDGR.GetI(); break;
-        case 78 : nHatchPatternDefinitionLines = rDGR.GetI(); break;
-        case 47 : fPixelSize = rDGR.GetF(); break;
-        case 98 : nNumberOfSeedPoints = rDGR.GetI(); break;
-
-        //!! passthrough !!
-        case 92 : nCurrentBoundaryPathIndex++;
-        default:
-        {
-            sal_Bool bExecutingGroupCode = sal_False;
-            if ( bIsInBoundaryPathContext )
-            {
-                if ( ( nCurrentBoundaryPathIndex >= 0 ) &&
-                    ( nCurrentBoundaryPathIndex < nBoundaryPathCount ) )
-                    bExecutingGroupCode = pBoundaryPathData[ nCurrentBoundaryPathIndex ].EvaluateGroup( rDGR );
-            }
-            if ( bExecutingGroupCode == sal_False )
-                DXFBasicEntity::EvaluateGroup(rDGR);
-        }
-        break;
-    }
-}
-
-DXFHatchEntity::~DXFHatchEntity()
-{
-    delete[] pBoundaryPathData;
-}
-
-//--------------------------DXFVertexEntity-------------------------------------
-
-DXFVertexEntity::DXFVertexEntity() : DXFBasicEntity(DXF_VERTEX)
-{
-    fSWidth=-1.0;
-    fEWidth=-1.0;
-    fBulge=0.0;
-    nFlags=0;
-    fCFTDir=0.0;
-
-}
-
-void DXFVertexEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 40: fSWidth=rDGR.GetF(); break;
-        case 41: fEWidth=rDGR.GetF(); break;
-        case 42: fBulge=rDGR.GetF(); break;
-        case 70: nFlags=rDGR.GetI(); break;
-        case 50: fCFTDir=rDGR.GetF(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//--------------------------DXFSeqEndEntity-------------------------------------
-
-DXFSeqEndEntity::DXFSeqEndEntity() : DXFBasicEntity(DXF_SEQEND)
-{
-}
-
-//--------------------------DXF3DFace-------------------------------------------
-
-DXF3DFaceEntity::DXF3DFaceEntity() : DXFBasicEntity(DXF_3DFACE)
-{
-    nIEFlags=0;
-}
-
-void DXF3DFaceEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case 10: aP0.fx=rDGR.GetF(); break;
-        case 20: aP0.fy=rDGR.GetF(); break;
-        case 30: aP0.fz=rDGR.GetF(); break;
-        case 11: aP1.fx=rDGR.GetF(); break;
-        case 21: aP1.fy=rDGR.GetF(); break;
-        case 31: aP1.fz=rDGR.GetF(); break;
-        case 12: aP2.fx=rDGR.GetF(); break;
-        case 22: aP2.fy=rDGR.GetF(); break;
-        case 32: aP2.fz=rDGR.GetF(); break;
-        case 13: aP3.fx=rDGR.GetF(); break;
-        case 23: aP3.fy=rDGR.GetF(); break;
-        case 33: aP3.fz=rDGR.GetF(); break;
-        case 70: nIEFlags=rDGR.GetI(); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-
-//--------------------------DXFDimensionEntity----------------------------------
-
-DXFDimensionEntity::DXFDimensionEntity() : DXFBasicEntity(DXF_DIMENSION)
-{
-    sPseudoBlock[0]=0;
-}
-
-void DXFDimensionEntity::EvaluateGroup(DXFGroupReader & rDGR)
-{
-    switch (rDGR.GetG()) {
-        case  2: strncpy( sPseudoBlock, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        default: DXFBasicEntity::EvaluateGroup(rDGR);
-    }
-}
-
-//---------------------------- DXFEntites --------------------------------------
-
-void DXFEntities::Read(DXFGroupReader & rDGR)
-{
-    DXFBasicEntity * pE, * * ppSucc;
-
-    ppSucc=&pFirst;
-    while (*ppSucc!=NULL) ppSucc=&((*ppSucc)->pSucc);
-
-    while (rDGR.GetG()!=0) rDGR.Read();
-
-    while (strcmp(rDGR.GetS(),"ENDBLK")!=0 &&
-           strcmp(rDGR.GetS(),"ENDSEC")!=0 &&
-           strcmp(rDGR.GetS(),"EOF")!=0 )
-    {
-
-        if      (strcmp(rDGR.GetS(),"LINE"      )==0) pE=new DXFLineEntity;
-        else if (strcmp(rDGR.GetS(),"POINT"     )==0) pE=new DXFPointEntity;
-        else if (strcmp(rDGR.GetS(),"CIRCLE"    )==0) pE=new DXFCircleEntity;
-        else if (strcmp(rDGR.GetS(),"ARC"       )==0) pE=new DXFArcEntity;
-        else if (strcmp(rDGR.GetS(),"TRACE"     )==0) pE=new DXFTraceEntity;
-        else if (strcmp(rDGR.GetS(),"SOLID"     )==0) pE=new DXFSolidEntity;
-        else if (strcmp(rDGR.GetS(),"TEXT"      )==0) pE=new DXFTextEntity;
-        else if (strcmp(rDGR.GetS(),"SHAPE"     )==0) pE=new DXFShapeEntity;
-        else if (strcmp(rDGR.GetS(),"INSERT"    )==0) pE=new DXFInsertEntity;
-        else if (strcmp(rDGR.GetS(),"ATTDEF"    )==0) pE=new DXFAttDefEntity;
-        else if (strcmp(rDGR.GetS(),"ATTRIB"    )==0) pE=new DXFAttribEntity;
-        else if (strcmp(rDGR.GetS(),"POLYLINE"  )==0) pE=new DXFPolyLineEntity;
-        else if (strcmp(rDGR.GetS(),"LWPOLYLINE")==0) pE=new DXFLWPolyLineEntity;
-        else if (strcmp(rDGR.GetS(),"VERTEX"    )==0) pE=new DXFVertexEntity;
-        else if (strcmp(rDGR.GetS(),"SEQEND"    )==0) pE=new DXFSeqEndEntity;
-        else if (strcmp(rDGR.GetS(),"3DFACE"    )==0) pE=new DXF3DFaceEntity;
-        else if (strcmp(rDGR.GetS(),"DIMENSION" )==0) pE=new DXFDimensionEntity;
-        else if (strcmp(rDGR.GetS(),"HATCH"     )==0) pE=new DXFHatchEntity;
-        else
-        {
-            do {
-                rDGR.Read();
-            } while (rDGR.GetG()!=0);
-            continue;
-        }
-        *ppSucc=pE;
-        ppSucc=&(pE->pSucc);
-        pE->Read(rDGR);
-    }
-}
-
-void DXFEntities::Clear()
-{
-    DXFBasicEntity * ptmp;
-
-    while (pFirst!=NULL) {
-        ptmp=pFirst;
-        pFirst=ptmp->pSucc;
-        delete ptmp;
-    }
-}
-
diff --git a/goodies/source/filter.vcl/idxf/dxfentrd.hxx b/goodies/source/filter.vcl/idxf/dxfentrd.hxx
deleted file mode 100644
index 8c0eee5d10d4..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfentrd.hxx
+++ /dev/null
@@ -1,605 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfentrd.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _DXFENTRD_HXX
-#define _DXFENTRD_HXX
-
-#include <dxfgrprd.hxx>
-#include <dxfvec.hxx>
-
-#include <deque>
-
-typedef std::deque< Point > DXFPointArray;
-
-//------------------------------------------------------------------------------
-//------------------------- Art eines Entity -----------------------------------
-//------------------------------------------------------------------------------
-
-enum DXFEntityType {
-    DXF_LINE,
-    DXF_POINT,
-    DXF_CIRCLE,
-    DXF_ARC,
-    DXF_TRACE,
-    DXF_SOLID,
-    DXF_TEXT,
-    DXF_SHAPE,
-    DXF_INSERT,
-    DXF_ATTDEF,
-    DXF_ATTRIB,
-    DXF_POLYLINE,
-    DXF_VERTEX,
-    DXF_SEQEND,
-    DXF_3DFACE,
-    DXF_DIMENSION,
-    DXF_LWPOLYLINE,
-    DXF_HATCH
-};
-
-//------------------------------------------------------------------------------
-//---------------------- Basisklasse fuer ein Entity ---------------------------
-//------------------------------------------------------------------------------
-
-class DXFBasicEntity {
-
-public:
-
-    DXFBasicEntity * pSucc;
-        // Zeiger auf naechstes Entity (in der Liste DXFEntities.pFirst)
-
-    DXFEntityType eType;
-        // Art des Entitys (Linie oder Kreis oder was)
-
-    // Eigenschaftenm, die alle Entities besitzen, jeweils
-    // durch den Gruppencode kommentiert:
-    char sLayer[DXF_MAX_STRING_LEN+1];    //  8
-    char sLineType[DXF_MAX_STRING_LEN+1]; //  6
-    double fElevation;                    // 38
-    double fThickness;                    // 39
-    long nColor;                          // 62
-    long nSpace;                          // 67
-    DXFVector aExtrusion;                 // 210,220,230
-
-protected:
-
-    DXFBasicEntity(DXFEntityType eThisType);
-        // Konstruktoren der Entities initialiseren immer mit Defaultwerten.
-
-public:
-
-    virtual ~DXFBasicEntity();
-    virtual void Read(DXFGroupReader & rDGR);
-        // Liest die Prameter ein, bis zur naechten 0-Gruppe
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-        // Diese Methode wird durch Read() fuer jeden Parameter (bzw. fuer jede
-        // Gruppe) aufgerufen.
-        // Sofern der Gruppencode dem Entity bekannt ist, wird der entsprechende
-        // Parameter geholt.
-
-};
-
-//------------------------------------------------------------------------------
-//---------------- die verschiedenen Arten von Entyties ------------------------
-//------------------------------------------------------------------------------
-
-//--------------------------Line------------------------------------------------
-
-class DXFLineEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0; // 10,20,30
-    DXFVector aP1; // 11,21,31
-
-    DXFLineEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Point-----------------------------------------------
-
-class DXFPointEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0; // 10,20,30
-
-    DXFPointEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Circle----------------------------------------------
-
-class DXFCircleEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0;  // 10,20,30
-    double fRadius; // 40
-
-    DXFCircleEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Arc-------------------------------------------------
-
-class DXFArcEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0;  // 10,20,30
-    double fRadius; // 40
-    double fStart;  // 50
-    double fEnd;    // 51
-
-    DXFArcEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Trace-----------------------------------------------
-
-class DXFTraceEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0; // 10,20,30
-    DXFVector aP1; // 11,21,31
-    DXFVector aP2; // 12,22,32
-    DXFVector aP3; // 13,23,33
-
-    DXFTraceEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Solid-----------------------------------------------
-
-class DXFSolidEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0; // 10,20,30
-    DXFVector aP1; // 11,21,31
-    DXFVector aP2; // 12,22,32
-    DXFVector aP3; // 13,23,33
-
-    DXFSolidEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Text------------------------------------------------
-
-class DXFTextEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0;                     // 10,20,30
-    double fHeight;                    // 40
-    char sText[DXF_MAX_STRING_LEN+1];  //  1
-    double fRotAngle;                  // 50
-    double fXScale;                    // 41
-    double fOblAngle;                  // 42
-    char sStyle[DXF_MAX_STRING_LEN+1]; //  7
-    long nGenFlags;                    // 71
-    long nHorzJust;                    // 72
-    long nVertJust;                    // 73
-    DXFVector aAlign;                  // 11,21,31
-
-    DXFTextEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Shape-----------------------------------------------
-
-class DXFShapeEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0;                    // 10,20,30
-    double fSize;                     // 40
-    char sName[DXF_MAX_STRING_LEN+1]; //  2
-    double fRotAngle;                 // 50
-    double fXScale;                   // 41
-    double fOblAngle;                 // 51
-
-    DXFShapeEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Insert----------------------------------------------
-
-class DXFInsertEntity : public DXFBasicEntity {
-
-public:
-
-    long nAttrFlag;                   // 66
-    char sName[DXF_MAX_STRING_LEN+1]; //  2
-    DXFVector aP0;                    // 10,20,30
-    double fXScale;                   // 41
-    double fYScale;                   // 42
-    double fZScale;                   // 43
-    double fRotAngle;                 // 50
-    long nColCount;                   // 70
-    long nRowCount;                   // 71
-    double fColSpace;                 // 44
-    double fRowSpace;                 // 45
-
-    DXFInsertEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------AttDef----------------------------------------------
-
-class DXFAttDefEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0;                      // 10,20,30
-    double fHeight;                     // 40
-    char sDefVal[DXF_MAX_STRING_LEN+1]; //  1
-    char sPrompt[DXF_MAX_STRING_LEN+1]; //  3
-    char sTagStr[DXF_MAX_STRING_LEN+1]; //  2
-    long nAttrFlags;                    // 70
-    long nFieldLen;                     // 73
-    double fRotAngle;                   // 50
-    double fXScale;                     // 41
-    double fOblAngle;                   // 51
-    char sStyle[DXF_MAX_STRING_LEN+1];  //  7
-    long nGenFlags;                     // 71
-    long nHorzJust;                     // 72
-    long nVertJust;                     // 74
-    DXFVector aAlign;                   // 11,21,31
-
-    DXFAttDefEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Attrib----------------------------------------------
-
-class DXFAttribEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0;                      // 10,20,30
-    double fHeight;                     // 40
-    char sText[DXF_MAX_STRING_LEN+1];   //  1
-    char sTagStr[DXF_MAX_STRING_LEN+1]; //  2
-    long nAttrFlags;                    // 70
-    long nFieldLen;                     // 73
-    double fRotAngle;                   // 50
-    double fXScale;                     // 41
-    double fOblAngle;                   // 51
-    char sStyle[DXF_MAX_STRING_LEN+1];  //  7
-    long nGenFlags;                     // 71
-    long nHorzJust;                     // 72
-    long nVertJust;                     // 74
-    DXFVector aAlign;                   // 11,21,31
-
-    DXFAttribEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------PolyLine--------------------------------------------
-
-class DXFPolyLineEntity : public DXFBasicEntity {
-
-public:
-
-    double fElevation; // 30
-    long nFlags;       // 70
-    double fSWidth;    // 40
-    double fEWidth;    // 41
-    long nMeshMCount;  // 71
-    long nMeshNCount;  // 72
-    long nMDensity;    // 73
-    long nNDensity;    // 74
-    long nCSSType;     // 75
-
-    DXFPolyLineEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-class DXFLWPolyLineEntity : public DXFBasicEntity
-{
-        sal_Int32   nIndex;
-
-    public :
-
-        sal_Int32   nCount;         // 90
-        sal_Int32   nFlags;         // 70   1 = closed, 128 = plinegen
-        double      fConstantWidth; // 43   (optional - default: 0, not used if fStartWidth and/or fEndWidth is used)
-        double      fStartWidth;    // 40
-        double      fEndWidth;      // 41
-
-        DXFVector*  pP;
-
-        DXFLWPolyLineEntity();
-        ~DXFLWPolyLineEntity();
-
-    protected :
-
-        virtual void EvaluateGroup( DXFGroupReader & rDGR );
-
-};
-
-//-------------------------- Hatch ---------------------------------------------
-
-struct DXFEdgeType
-{
-    sal_Int32 nEdgeType;
-
-    virtual ~DXFEdgeType(){};
-    virtual sal_Bool EvaluateGroup( DXFGroupReader & /*rDGR*/ ){ return sal_True; };
-
-    protected :
-
-        DXFEdgeType( sal_Int32 EdgeType ):nEdgeType(EdgeType){};
-};
-struct DXFEdgeTypeLine : public DXFEdgeType
-{
-    DXFVector aStartPoint;              // 10,20
-    DXFVector aEndPoint;                // 11,21
-    DXFEdgeTypeLine();
-    virtual ~DXFEdgeTypeLine();
-    virtual sal_Bool EvaluateGroup( DXFGroupReader & rDGR );
-};
-struct DXFEdgeTypeCircularArc : public DXFEdgeType
-{
-    DXFVector aCenter;                  // 10,20
-    double    fRadius;                  // 40
-    double    fStartAngle;              // 50
-    double    fEndAngle;                // 51
-    sal_Int32 nIsCounterClockwiseFlag;  // 73
-    DXFEdgeTypeCircularArc();
-    virtual ~DXFEdgeTypeCircularArc();
-    virtual sal_Bool EvaluateGroup( DXFGroupReader & rDGR );
-};
-struct DXFEdgeTypeEllipticalArc : public DXFEdgeType
-{
-    DXFVector aCenter;                  // 10,20
-    DXFVector aEndPoint;                // 11,21
-    double    fLength;                  // 40
-    double    fStartAngle;              // 50
-    double    fEndAngle;                // 51
-    sal_Int32 nIsCounterClockwiseFlag;  // 73
-
-    DXFEdgeTypeEllipticalArc();
-    virtual ~DXFEdgeTypeEllipticalArc();
-    virtual sal_Bool EvaluateGroup( DXFGroupReader & rDGR );
-};
-struct DXFEdgeTypeSpline : public DXFEdgeType
-{
-    sal_Int32 nDegree;                  // 94
-    sal_Int32 nRational;                // 73
-    sal_Int32 nPeriodic;                // 74
-    sal_Int32 nKnotCount;               // 75
-    sal_Int32 nControlCount;            // 76
-
-    DXFEdgeTypeSpline();
-    virtual ~DXFEdgeTypeSpline();
-    virtual sal_Bool EvaluateGroup( DXFGroupReader & rDGR );
-};
-
-typedef std::deque< DXFEdgeType* > DXFEdgeTypeArray;
-
-struct DXFBoundaryPathData
-{
-    sal_Int32           nFlags;                 // 92
-    sal_Int32           nHasBulgeFlag;          // 72
-    sal_Int32           nIsClosedFlag;          // 73
-    sal_Int32           nPointCount;            // 93
-    double              fBulge;                 // 42
-    sal_Int32           nSourceBoundaryObjects; // 97
-    sal_Int32           nEdgeCount;             // 93
-
-    sal_Bool            bIsPolyLine;
-    sal_Int32           nPointIndex;
-
-    DXFVector*          pP;
-    DXFEdgeTypeArray    aEdges;
-
-    DXFBoundaryPathData();
-    ~DXFBoundaryPathData();
-
-    sal_Bool EvaluateGroup( DXFGroupReader & rDGR );
-};
-
-class DXFHatchEntity : public DXFBasicEntity
-{
-        sal_Bool    bIsInBoundaryPathContext;
-        sal_Int32   nCurrentBoundaryPathIndex;
-
-    public :
-
-        DXFVector   aElevationPoint;
-        sal_Int32   nFlags;                         // 70 (solid fill = 1, pattern fill = 0)
-        sal_Int32   nAssociativityFlag;             // 71 (assoiciative = 1, non-associative = 0)
-        sal_Int32   nBoundaryPathCount;             // 91
-        sal_Int32   nHatchStyle;                    // 75 (odd parity = 0, outmost area = 1, entire area = 2 )
-        sal_Int32   nHatchPatternType;              // 76 (user defined = 0, predefined = 1, custom = 2)
-        double      fHatchPatternAngle;             // 52 (pattern fill only)
-        double      fHatchPatternScale;             // 41 (pattern fill only:scale or spacing)
-        sal_Int32   nHatchDoubleFlag;               // 77 (pattern fill only:double = 1, not double = 0)
-        sal_Int32   nHatchPatternDefinitionLines;   // 78
-        double      fPixelSize;                     // 47
-        sal_Int32   nNumberOfSeedPoints;            // 98
-
-        DXFBoundaryPathData* pBoundaryPathData;
-
-        DXFHatchEntity();
-        ~DXFHatchEntity();
-
-    protected :
-
-        virtual void EvaluateGroup( DXFGroupReader & rDGR );
-};
-
-
-//--------------------------Vertex----------------------------------------------
-
-class DXFVertexEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0;     // 10,20,30
-    double fSWidth;    // 40 (Wenn <0.0, dann gilt DXFPolyLine::fSWidth)
-    double fEWidth;    // 41 (Wenn <0.0, dann gilt DXFPolyLine::fEWidth)
-    double fBulge;     // 42
-    long nFlags;       // 70
-    double fCFTDir;    // 50
-
-    DXFVertexEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------SeqEnd----------------------------------------------
-
-class DXFSeqEndEntity : public DXFBasicEntity {
-
-public:
-
-    DXFSeqEndEntity();
-};
-
-//--------------------------3DFace----------------------------------------------
-
-class DXF3DFaceEntity : public DXFBasicEntity {
-
-public:
-
-    DXFVector aP0; // 10,20,30
-    DXFVector aP1; // 11,21,31
-    DXFVector aP2; // 12,22,32
-    DXFVector aP3; // 13,23,33
-    long nIEFlags; // 70
-
-    DXF3DFaceEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//--------------------------Dimension-------------------------------------------
-
-class DXFDimensionEntity : public DXFBasicEntity {
-
-public:
-
-    char sPseudoBlock[DXF_MAX_STRING_LEN+1]; //  2
-
-    DXFDimensionEntity();
-
-protected:
-
-    virtual void EvaluateGroup(DXFGroupReader & rDGR);
-};
-
-//------------------------------------------------------------------------------
-//----------- Eine Menge von Entities lesen und repraesentieren ----------------
-//------------------------------------------------------------------------------
-
-class DXFEntities {
-
-public:
-
-    DXFEntities();
-    ~DXFEntities();
-
-    DXFBasicEntity * pFirst; // Liste von Entities, READ ONLY!
-
-    void Read(DXFGroupReader & rDGR);
-        // Liest Entitis per rGDR aus einer DXF-Datei bis zu
-        // einem ENDBLK, ENDSEC oder EOF (der Gruppe 0).
-        // (Alle unbekannten Dinge werden uebersprungen)
-
-    void Clear();
-        // Loescht alle Entities
-};
-
-//------------------------------------------------------------------------------
-//--------------------------------- inlines ------------------------------------
-//------------------------------------------------------------------------------
-
-inline DXFEntities::DXFEntities()
-{
-    pFirst=NULL;
-}
-
-
-inline DXFEntities::~DXFEntities()
-{
-    Clear();
-}
-
-
-#endif
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxfgrprd.cxx b/goodies/source/filter.vcl/idxf/dxfgrprd.cxx
deleted file mode 100644
index e1849ec3682f..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfgrprd.cxx
+++ /dev/null
@@ -1,364 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfgrprd.cxx,v $
- * $Revision: 1.12 $
- *
- * 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_goodies.hxx"
-
-#include <string.h>
-#include <stdlib.h>
-#include <tools/stream.hxx>
-#include "dxfgrprd.hxx"
-
-// ----------------------------------------------------------------------------
-
-// we use an own ReadLine function, because Stream::ReadLine stops if
-// a 0-sign occurs; this functions converts 0-signs to blanks and reads
-// a complete line until a cr/lf is found
-
-BOOL DXFReadLine( SvStream& rIStm, ByteString& rStr )
-{
-    char  buf[256 + 1];
-    BOOL  bEnd = FALSE;
-    ULONG nOldFilePos = rIStm.Tell();
-    char  c = 0;
-
-    rStr.Erase();
-
-    while( !bEnd && !rIStm.GetError() )   // !!! nicht auf EOF testen,
-                                          // !!! weil wir blockweise
-                                          // !!! lesen
-    {
-        USHORT nLen = (USHORT)rIStm.Read( buf, sizeof(buf)-1 );
-        if( !nLen )
-        {
-            if( rStr.Len() == 0 )
-                return FALSE;
-            else
-                break;
-        }
-
-        for( USHORT n = 0; n < nLen ; n++ )
-        {
-            c = buf[n];
-            if( c != '\n' && c != '\r' )
-            {
-                if( !c )
-                    c = ' ';
-                rStr += c;
-            }
-            else
-            {
-                bEnd = TRUE;
-                break;
-            }
-        }
-    }
-
-    if( !bEnd && !rIStm.GetError() && rStr.Len() )
-        bEnd = TRUE;
-
-    nOldFilePos += rStr.Len();
-    if( rIStm.Tell() > nOldFilePos )
-        nOldFilePos++;
-    rIStm.Seek( nOldFilePos );  // seeken wg. obigem BlockRead!
-
-    if( bEnd && (c=='\r' || c=='\n'))  // Sonderbehandlung DOS-Dateien
-    {
-        char cTemp;
-        rIStm.Read((char*)&cTemp , sizeof(cTemp) );
-        if( cTemp == c || (cTemp != '\n' && cTemp != '\r') )
-            rIStm.Seek( nOldFilePos );
-    }
-
-    return bEnd;
-}
-
-// ------------------
-
-DXFGroupReader::DXFGroupReader(SvStream & rIStream, USHORT nminpercent, USHORT nmaxpercent ) :
-    rIS(rIStream)
-{
-    USHORT i;
-
-    nIBuffPos=0;
-    nIBuffSize=0;
-    bStatus=TRUE;
-    nLastG=0;
-    nGCount=0;
-
-    nMinPercent=(ULONG)nminpercent;
-    nMaxPercent=(ULONG)nmaxpercent;
-    nLastPercent=nMinPercent;
-
-    rIS.Seek(STREAM_SEEK_TO_END);
-    nFileSize=rIS.Tell();
-    rIS.Seek(0);
-
-    for (i=0; i<10; i++) S0_9[i][0]=0;
-    S100[ 0 ] = S102[ 0 ] = 0;
-    for (i=0; i<50; i++) F10_59[i]=0.0;
-    for (i=0; i<20; i++) I60_79[i]=0;
-    for (i=0; i<10; i++) I90_99[i]=0;
-    for (i=0; i< 8; i++) F140_147[i]=0.0;
-    for (i=0; i< 6; i++) I170_175[i]=0;
-    for (i=0; i<30; i++) F210_239[i]=0.0;
-    for (i=0; i<11; i++) S999_1009[i][0]=0;
-    for (i=0; i<50; i++) F1010_1059[i]=0.0;
-    for (i=0; i<20; i++) I1060_1079[i]=0;
-
-}
-
-
-USHORT DXFGroupReader::Read()
-{
-    sal_uInt16 nG = 0;
-    if ( bStatus )
-    {
-        nGCount++;
-        nG = (sal_uInt16)ReadI();
-        if ( bStatus )
-        {
-            char aTmp[ DXF_MAX_STRING_LEN + 1 ];
-
-            if      (nG<  10) ReadS(S0_9[nG]);
-            else if (nG<  60) F10_59[nG-10]=ReadF();
-            else if (nG<  80) I60_79[nG-60]=ReadI();
-            else if (nG<  90) ReadS( aTmp );
-            else if (nG<  99) I90_99[nG-90]=ReadI();
-            else if (nG==100) ReadS(S100);
-            else if (nG==102) ReadS(S102);
-            else if (nG==105) ReadS( aTmp );
-            else if (nG< 140) ReadS( aTmp );
-            else if (nG< 148) F140_147[nG-140]=ReadF();
-            else if (nG< 170) ReadS( aTmp );
-            else if (nG< 176) I170_175[nG-175]=ReadI();
-            else if (nG< 180) ReadI();
-            else if (nG< 210) ReadS( aTmp );
-            else if (nG< 240) F210_239[nG-210]=ReadF();
-            else if (nG<=369) ReadS( aTmp );
-            else if (nG< 999) ReadS( aTmp );
-            else if (nG<1010) ReadS(S999_1009[nG-999]);
-            else if (nG<1060) F1010_1059[nG-1010]=ReadF();
-            else if (nG<1080) I1060_1079[nG-1060]=ReadI();
-            else bStatus = sal_False;
-        }
-    }
-    if ( bStatus )
-        nLastG = nG;
-    else
-    {
-        nG = 0;
-        SetS( 0, "EOF" );
-        if ( nGCount != 0xffffffff )
-        {
-            // InfoBox(NULL,String("Fehler ab Gruppe Nr ")+String(nGCount)).Execute();
-            nGCount=0xffffffff;
-        }
-    }
-    nLastG = nG;
-    return nG;
-}
-
-
-long DXFGroupReader::GetI(USHORT nG)
-{
-    sal_Int32 nRetValue = 0;
-    if ( ( nG >= 60 ) && ( nG <= 79 ) )
-        nRetValue = I60_79[ nG - 60 ];
-    else if ( ( nG >= 90 ) && ( nG <= 99 ) )
-        nRetValue = I90_99[ nG - 90 ];
-    else if ( ( nG >= 170 ) && ( nG <= 175 ) )
-        nRetValue = I170_175[ nG - 170 ];
-    else if ( ( nG >= 1060 ) && ( nG <= 1079 ) )
-        nRetValue = I1060_1079[ nG - 1060 ];
-    return nRetValue;
-}
-
-double DXFGroupReader::GetF(USHORT nG)
-{
-    nG-=10;
-    if (nG<50) return F10_59[nG];
-    else {
-        nG-=130;
-        if (nG<8) return F140_147[nG];
-        else {
-            nG-=70;
-            if (nG<30) return F210_239[nG];
-            else {
-                nG-=800;
-                if (nG<50) return F1010_1059[nG];
-                else return 0;
-            }
-        }
-    }
-}
-
-const char * DXFGroupReader::GetS(USHORT nG)
-{
-    if (nG<10) return S0_9[nG];
-    else if ( nG == 100 )
-        return S100;
-    else if ( nG == 102 )
-        return S102;
-    else
-    {
-        nG-=999;
-        if (nG<11) return S999_1009[nG];
-        else return NULL;
-    }
-}
-
-void DXFGroupReader::SetF(USHORT nG, double fF)
-{
-    nG-=10;
-    if (nG<50) F10_59[nG]=fF;
-    else {
-        nG-=130;
-        if (nG<8) F140_147[nG]=fF;
-        else {
-            nG-=70;
-            if (nG<30) F210_239[nG]=fF;
-            else {
-                nG-=800;
-                if (nG<50) F1010_1059[nG]=fF;
-            }
-        }
-    }
-}
-
-
-void DXFGroupReader::SetS(USHORT nG, const char * sS)
-{
-    char* pPtr = NULL;
-    if ( nG < 10 )
-        pPtr = S0_9[ nG ];
-    else if ( nG == 100 )
-        pPtr = S100;
-    else if ( nG == 102 )
-        pPtr = S102;
-    else
-    {
-        nG -= 999;
-        if ( nG < 11 )
-            pPtr = S999_1009[ nG ];
-    }
-    if ( pPtr )
-        strncpy( pPtr, sS, DXF_MAX_STRING_LEN + 1 );
-}
-
-
-void DXFGroupReader::ReadLine(char * ptgt)
-{
-    ByteString  aStr;
-    ULONG       nLen;
-
-    DXFReadLine( rIS, aStr );
-
-    nLen = aStr.Len();
-    if ( nLen > DXF_MAX_STRING_LEN )
-        nLen = DXF_MAX_STRING_LEN;
-
-    memcpy( ptgt, aStr.GetBuffer(), nLen );
-    ptgt[ nLen ] = 0x00;
-/*
-    if ( pCallback )
-    {
-        const ULONG nPercent= nMinPercent + (nMaxPercent-nMinPercent)*rIS.Tell() / nFileSize;
-
-        if ( nPercent >= nLastPercent + 4 )
-        {
-            nLastPercent=nPercent;
-            if (((*pCallback)(pCallerData,(USHORT)nPercent))==TRUE)
-                bStatus=FALSE;
-        }
-    }
-*/
-}
-
-
-long DXFGroupReader::ReadI()
-{
-    char sl[DXF_MAX_STRING_LEN+1],*p;
-    long res,nv;
-
-    ReadLine(sl);
-
-    p=sl;
-
-    while(*p==0x20) p++;
-
-    if ((*p<'0' || *p>'9') && *p!='-') {
-        bStatus=FALSE;
-        return 0;
-    }
-
-    if (*p=='-') {
-        nv=-1;
-        p++;
-    }
-    else nv=1;
-
-    res=0;
-    do {
-        res=res*10+(long)(*p-'0');
-        p++;
-    } while (*p>='0' && *p<='9');
-
-    while (*p==0x20) p++;
-    if (*p!=0) {
-        bStatus=FALSE;
-        return 0;
-    }
-
-    return res*nv;
-}
-
-
-double DXFGroupReader::ReadF()
-{
-    char sl[DXF_MAX_STRING_LEN+1],*p;
-
-    ReadLine(sl);
-    p=sl;
-    while(*p==0x20) p++;
-    if ((*p<'0' || *p>'9') && *p!='.' && *p!='-') {
-        bStatus=FALSE;
-        return 0.0;
-    }
-    return atof(p);
-}
-
-
-void DXFGroupReader::ReadS(char * ptgt)
-{
-    ReadLine(ptgt);
-}
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxfgrprd.hxx b/goodies/source/filter.vcl/idxf/dxfgrprd.hxx
deleted file mode 100644
index 80a87ba4f4a8..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfgrprd.hxx
+++ /dev/null
@@ -1,158 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfgrprd.hxx,v $
- * $Revision: 1.7 $
- *
- * 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 _DXFGRPRD_HXX
-#define _DXFGRPRD_HXX
-
-#include <svtools/fltcall.hxx>
-
-#define DXF_MAX_STRING_LEN 256 // Max Stringlaenge (ohne die 0)
-
-
-class DXFGroupReader
-{
-
-public:
-
-    // Anmerkkung:
-    // sizeof(DXFGroupReader) ist gross, also nur dynamisch anlegen!
-
-    DXFGroupReader( SvStream & rIStream, USHORT nMinPercent, USHORT nMaxPercent );
-
-    BOOL GetStatus();
-
-    void SetError();
-
-    USHORT Read();
-        // Liesst die naechste Gruppe ein und liefert den Gruppencode zurueck.
-        // Im Falle eines Fehlers liefert GetStatus() FALSE, Gruppencode wird 0
-        // gesetzt, und es wird SetS(0,"EOF") ausgefuehrt.
-
-    USHORT GetG();
-        // Liefert den letzten Gruppencode (also was Read() zuletzt lieferte)
-
-    long   GetI();
-        // Liefert den Integer-Wert zur Gruppe, die vorher mit Read() gelesen wurde.
-        // Dabei muss es sich um einen Gruppencode fuer den Datentyp Integer
-        // gehandelt haben, wenn nicht, wird 0 gelieferet.
-
-    double GetF();
-        // Liefert den Floatingpoint-Wert zur Gruppe, die vorher mit Read() gelesen wurde.
-        // Dabei muss es sich um einen Gruppencode fuer den Datentyp Floatingpoint
-        // gehandelt haben, wenn nicht, wird 0 geliefert.
-
-    const char * GetS();
-        // Liefert den String zur Gruppe, die vorher mit Read() gelesen wurde.
-        // Dabei muss es sich um einen Gruppencode fuer den Datentyp String
-        // gehandelt haben, wenn nicht, wird NULL geliefert.
-
-    // Folgende drei Methoden arbeiten wie die obigen, nur kann auch ein anderer als der
-    // aktuelle Gruppencode angegeben werden. (DXFGroupReader speichert die Parameter
-    // zu allen Gruppencodes. Dadurch ist es moeglich, dass zunaechst mit Read() einige
-    // verschiedene Gruppen eingelesen werden, bevor sie ausgewertet werden.)
-    long         GetI(USHORT nG);
-    double       GetF(USHORT nG);
-    const char * GetS(USHORT nG);
-
-    // Mit folgenden Methoden koennen die aktuell gespeicherten Werte zu den
-    // Gruppencodes veraendert werden. (z.B. um Defaultwerte zu setzen, bevor
-    // 'blind' eine Menge von Gruppen eingelesen wird.)
-    void SetF(USHORT nG, double fF);
-    void SetS(USHORT nG, const char * sS); // (wird kopiert)
-
-private:
-
-    void   ReadLine(char * ptgt);
-    long   ReadI();
-    double ReadF();
-    void   ReadS(char * ptgt);
-
-    SvStream & rIS;
-    char sIBuff[1024];
-    USHORT nIBuffSize,nIBuffPos;
-    BOOL bStatus;
-    USHORT nLastG;
-    ULONG nGCount;
-
-    ULONG nMinPercent;
-    ULONG nMaxPercent;
-    ULONG nLastPercent;
-    ULONG nFileSize;
-
-    char   S0_9      [10][DXF_MAX_STRING_LEN+1]; // Strings  Gruppencodes 0..9
-    double F10_59    [50];      // Floats   Gruppencodes 10..59
-    long   I60_79    [20];      // Integers Gruppencodes 60..79
-    long   I90_99    [10];
-    char   S100      [DXF_MAX_STRING_LEN+1];
-    char   S102      [DXF_MAX_STRING_LEN+1];
-    double F140_147  [ 8];      // Floats   Gruppencodes 140..147
-    long   I170_175  [ 6];      // Integers Gruppencodes 170..175
-    double F210_239  [30];      // Floats   Gruppencodes 210..239
-    char   S999_1009 [11][DXF_MAX_STRING_LEN+1]; // Strings  Gruppencodes 999..1009
-    double F1010_1059[50];      // Floats   Gruppencodes 1010..1059
-    long   I1060_1079[20];      // Integers Gruppencodes 1060..1079
-
-};
-
-
-inline BOOL DXFGroupReader::GetStatus()
-{
-    return bStatus;
-}
-
-
-inline void DXFGroupReader::SetError()
-{
-    bStatus=FALSE;
-}
-
-inline USHORT DXFGroupReader::GetG()
-{
-    return nLastG;
-}
-
-inline long DXFGroupReader::GetI()
-{
-    return GetI(nLastG);
-}
-
-inline double DXFGroupReader::GetF()
-{
-    return GetF(nLastG);
-}
-
-inline const char * DXFGroupReader::GetS()
-{
-    return GetS(nLastG);
-}
-
-#endif
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxfreprd.cxx b/goodies/source/filter.vcl/idxf/dxfreprd.cxx
deleted file mode 100644
index 80b4cb599b73..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfreprd.cxx
+++ /dev/null
@@ -1,388 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfreprd.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <string.h>
-#include <dxfreprd.hxx>
-
-
-//------------------DXFBoundingBox--------------------------------------------
-
-
-void DXFBoundingBox::Union(const DXFVector & rVector)
-{
-    if (bEmpty==TRUE) {
-        fMinX=rVector.fx;
-        fMinY=rVector.fy;
-        fMinZ=rVector.fz;
-        fMaxX=rVector.fx;
-        fMaxY=rVector.fy;
-        fMaxZ=rVector.fz;
-        bEmpty=FALSE;
-    }
-    else {
-        if (fMinX>rVector.fx) fMinX=rVector.fx;
-        if (fMinY>rVector.fy) fMinY=rVector.fy;
-        if (fMinZ>rVector.fz) fMinZ=rVector.fz;
-        if (fMaxX<rVector.fx) fMaxX=rVector.fx;
-        if (fMaxY<rVector.fy) fMaxY=rVector.fy;
-        if (fMaxZ<rVector.fz) fMaxZ=rVector.fz;
-    }
-}
-
-
-//------------------DXFPalette------------------------------------------------
-
-
-DXFPalette::DXFPalette()
-{
-    short i,j,nHue,nNSat,nVal,nC[3],nmax,nmed,nmin;
-    BYTE nV;
-
-    pRed  =new BYTE[256];
-    pGreen=new BYTE[256];
-    pBlue =new BYTE[256];
-
-    // Farben 0 - 9 (normale Farben)
-    SetColor(0, 0x00, 0x00, 0x00); // eigentlich nie benutzt
-    SetColor(1, 0xff, 0x00, 0x00);
-    SetColor(2, 0xff, 0xff, 0x00);
-    SetColor(3, 0x00, 0xff, 0x00);
-    SetColor(4, 0x00, 0xff, 0xff);
-    SetColor(5, 0x00, 0x00, 0xff);
-    SetColor(6, 0xff, 0x00, 0xff);
-    SetColor(7, 0x0f, 0x0f, 0x0f); // eigentlich weiss ???
-    SetColor(8, 0x80, 0x80, 0x80);
-    SetColor(9, 0xc0, 0xc0, 0xc0);
-
-    // Farben 10 - 249
-    // (Universal-Palette: 24 Farbtoene * 5 Helligkeiten * 2 Saettigungen )
-    i=10;
-    for (nHue=0; nHue<24; nHue++) {
-        for (nVal=5; nVal>=1; nVal--) {
-            for (nNSat=0; nNSat<2; nNSat++) {
-                nmax=((nHue+3)>>3)%3;
-                j=nHue-(nmax<<3); if (j>4) j=j-24;
-                if (j>=0) {
-                    nmed=(nmax+1)%3;
-                    nmin=(nmax+2)%3;
-                }
-                else {
-                    nmed=(nmax+2)%3;
-                    nmin=(nmax+1)%3;
-                    j=-j;
-                }
-                nC[nmin]=0;
-                nC[nmed]=255*j/4;
-                nC[nmax]=255;
-                if (nNSat!=0) {
-                    for (j=0; j<3; j++) nC[j]=(nC[j]>>1)+128;
-                }
-                for (j=0; j<3; j++) nC[j]=nC[j]*nVal/5;
-                SetColor((BYTE)(i++),(BYTE)nC[0],(BYTE)nC[1],(BYTE)nC[2]);
-            }
-        }
-    }
-
-    // Farben 250 - 255 (Grautoenne)
-    for (i=0; i<6; i++) {
-        nV=(BYTE)(i*38+65);
-        SetColor((BYTE)(250+i),nV,nV,nV);
-    }
-}
-
-
-DXFPalette::~DXFPalette()
-{
-    delete[] pBlue;
-    delete[] pGreen;
-    delete[] pRed;
-}
-
-
-void DXFPalette::SetColor(BYTE nIndex, BYTE nRed, BYTE nGreen, BYTE nBlue)
-{
-    pRed[nIndex]=nRed;
-    pGreen[nIndex]=nGreen;
-    pBlue[nIndex]=nBlue;
-}
-
-
-//------------------DXFRepresentation-----------------------------------------
-
-
-DXFRepresentation::DXFRepresentation()
-{
-    setTextEncoding(RTL_TEXTENCODING_IBM_437);
-        setGlobalLineTypeScale(1.0);
-}
-
-
-DXFRepresentation::~DXFRepresentation()
-{
-}
-
-
-BOOL DXFRepresentation::Read( SvStream & rIStream, USHORT nMinPercent, USHORT nMaxPercent)
-{
-    DXFGroupReader * pDGR;
-    BOOL bRes;
-
-    aTables.Clear();
-    aBlocks.Clear();
-    aEntities.Clear();
-
-    pDGR = new DXFGroupReader( rIStream, nMinPercent, nMaxPercent );
-
-    pDGR->Read();
-    while (pDGR->GetG()!=0 || strcmp(pDGR->GetS(),"EOF")!=0) {
-        if (pDGR->GetG()==0 && strcmp(pDGR->GetS(),"SECTION")==0) {
-            if (pDGR->Read()!=2) {
-                pDGR->SetError();
-                break;
-            }
-            if      (strcmp(pDGR->GetS(),"HEADER"  )==0) ReadHeader(*pDGR);
-            else if (strcmp(pDGR->GetS(),"TABLES"  )==0) aTables.Read(*pDGR);
-            else if (strcmp(pDGR->GetS(),"BLOCKS"  )==0) aBlocks.Read(*pDGR);
-            else if (strcmp(pDGR->GetS(),"ENTITIES")==0) aEntities.Read(*pDGR);
-            else pDGR->Read();
-        }
-        else pDGR->Read();
-    }
-
-    bRes=pDGR->GetStatus();
-
-    delete pDGR;
-
-    if (bRes==TRUE && aBoundingBox.bEmpty==TRUE)
-        CalcBoundingBox(aEntities,aBoundingBox);
-
-    return bRes;
-}
-
-
-void DXFRepresentation::ReadHeader(DXFGroupReader & rDGR)
-{
-
-         while (rDGR.GetG()!=0 || (strcmp(rDGR.GetS(),"EOF")!=0 &&  strcmp(rDGR.GetS(),"ENDSEC")!=0) )
-         {
-                 if (rDGR.GetG()==9) {
-                         if (strcmp(rDGR.GetS(),"$EXTMIN")==0 ||
-                                 strcmp(rDGR.GetS(),"$EXTMAX")==0)
-                         {
-                                 DXFVector aVector;
-                                 rDGR.SetF(10,0.0);
-                                 rDGR.SetF(20,0.0);
-                                 rDGR.SetF(30,0.0);
-                                 do {
-                                         rDGR.Read();
-                                 } while (rDGR.GetG()!=9 && rDGR.GetG()!=0);
-                                 aVector.fx=rDGR.GetF(10);
-                                 aVector.fy=rDGR.GetF(20);
-                                 aVector.fz=rDGR.GetF(30);
-                                 aBoundingBox.Union(aVector);
-                         } else {
-                                 if (strcmp(rDGR.GetS(),"$DWGCODEPAGE")==0)
-                                 {
-                                         rDGR.Read();
-
-                                         // FIXME: we really need a whole table of
-                                         // $DWGCODEPAGE to encodings mappings
-                                         if ( (strcmp(rDGR.GetS(),"ANSI_932")==0) ||
-                          (strcmp(rDGR.GetS(),"ansi_932")==0) ||
-                                              (strcmp(rDGR.GetS(),"DOS932")==0) ||
-                                              (strcmp(rDGR.GetS(),"dos932")==0) )
-                                         {
-                                                 setTextEncoding(RTL_TEXTENCODING_MS_932);
-                                         }
-                                 }
-                 else if (strcmp(rDGR.GetS(),"$LTSCALE")==0)
-                                 {
-                                         rDGR.Read();
-                                         setGlobalLineTypeScale(getGlobalLineTypeScale() * rDGR.GetF());
-                                 }
-                                 else rDGR.Read();
-                         }
-                 }
-                 else rDGR.Read();
-         }
-}
-
-
-void DXFRepresentation::CalcBoundingBox(const DXFEntities & rEntities,
-                                        DXFBoundingBox & rBox)
-{
-    DXFBasicEntity * pBE=rEntities.pFirst;
-    while (pBE!=NULL) {
-        switch (pBE->eType) {
-            case DXF_LINE: {
-                const DXFLineEntity * pE = (DXFLineEntity*)pBE;
-                rBox.Union(pE->aP0);
-                rBox.Union(pE->aP1);
-                break;
-            }
-            case DXF_POINT: {
-                const DXFPointEntity * pE = (DXFPointEntity*)pBE;
-                rBox.Union(pE->aP0);
-                break;
-            }
-            case DXF_CIRCLE: {
-                const DXFCircleEntity * pE = (DXFCircleEntity*)pBE;
-                DXFVector aP;
-                aP=pE->aP0;
-                aP.fx-=pE->fRadius;
-                aP.fy-=pE->fRadius;
-                rBox.Union(aP);
-                aP=pE->aP0;
-                aP.fx+=pE->fRadius;
-                aP.fy+=pE->fRadius;
-                rBox.Union(aP);
-                break;
-            }
-            case DXF_ARC: {
-                const DXFArcEntity * pE = (DXFArcEntity*)pBE;
-                DXFVector aP;
-                aP=pE->aP0;
-                aP.fx-=pE->fRadius;
-                aP.fy-=pE->fRadius;
-                rBox.Union(aP);
-                aP=pE->aP0;
-                aP.fx+=pE->fRadius;
-                aP.fy+=pE->fRadius;
-                rBox.Union(aP);
-                break;
-            }
-            case DXF_TRACE: {
-                const DXFTraceEntity * pE = (DXFTraceEntity*)pBE;
-                rBox.Union(pE->aP0);
-                rBox.Union(pE->aP1);
-                rBox.Union(pE->aP2);
-                rBox.Union(pE->aP3);
-                break;
-            }
-            case DXF_SOLID: {
-                const DXFSolidEntity * pE = (DXFSolidEntity*)pBE;
-                rBox.Union(pE->aP0);
-                rBox.Union(pE->aP1);
-                rBox.Union(pE->aP2);
-                rBox.Union(pE->aP3);
-                break;
-            }
-            case DXF_TEXT: {
-                //const DXFTextEntity * pE = (DXFTextEntity*)pBE;
-                //???
-                break;
-            }
-            case DXF_SHAPE: {
-                //const DXFShapeEntity * pE = (DXFShapeEntity*)pBE;
-                //???
-                break;
-            }
-            case DXF_INSERT: {
-                const DXFInsertEntity * pE = (DXFInsertEntity*)pBE;
-                DXFBlock * pB;
-                DXFBoundingBox aBox;
-                DXFVector aP;
-                pB=aBlocks.Search(pE->sName);
-                if (pB==NULL) break;
-                CalcBoundingBox(*pB,aBox);
-                if (aBox.bEmpty==TRUE) break;
-                aP.fx=(aBox.fMinX-pB->aBasePoint.fx)*pE->fXScale+pE->aP0.fx;
-                aP.fy=(aBox.fMinY-pB->aBasePoint.fy)*pE->fYScale+pE->aP0.fy;
-                aP.fz=(aBox.fMinZ-pB->aBasePoint.fz)*pE->fZScale+pE->aP0.fz;
-                rBox.Union(aP);
-                aP.fx=(aBox.fMaxX-pB->aBasePoint.fx)*pE->fXScale+pE->aP0.fx;
-                aP.fy=(aBox.fMaxY-pB->aBasePoint.fy)*pE->fYScale+pE->aP0.fy;
-                aP.fz=(aBox.fMaxZ-pB->aBasePoint.fz)*pE->fZScale+pE->aP0.fz;
-                rBox.Union(aP);
-                break;
-            }
-            case DXF_ATTDEF: {
-                //const DXFAttDefEntity * pE = (DXFAttDefEntity*)pBE;
-                //???
-                break;
-            }
-            case DXF_ATTRIB: {
-                //const DXFAttribEntity * pE = (DXFAttribEntity*)pBE;
-                //???
-                break;
-            }
-            case DXF_VERTEX: {
-                const DXFVertexEntity * pE = (DXFVertexEntity*)pBE;
-                rBox.Union(pE->aP0);
-                break;
-            }
-            case DXF_3DFACE: {
-                const DXF3DFaceEntity * pE = (DXF3DFaceEntity*)pBE;
-                rBox.Union(pE->aP0);
-                rBox.Union(pE->aP1);
-                rBox.Union(pE->aP2);
-                rBox.Union(pE->aP3);
-                break;
-            }
-            case DXF_DIMENSION: {
-                const DXFDimensionEntity * pE = (DXFDimensionEntity*)pBE;
-                DXFBlock * pB;
-                DXFBoundingBox aBox;
-                DXFVector aP;
-                pB=aBlocks.Search(pE->sPseudoBlock);
-                if (pB==NULL) break;
-                CalcBoundingBox(*pB,aBox);
-                if (aBox.bEmpty==TRUE) break;
-                aP.fx=aBox.fMinX-pB->aBasePoint.fx;
-                aP.fy=aBox.fMinY-pB->aBasePoint.fy;
-                aP.fz=aBox.fMinZ-pB->aBasePoint.fz;
-                rBox.Union(aP);
-                aP.fx=aBox.fMaxX-pB->aBasePoint.fx;
-                aP.fy=aBox.fMaxY-pB->aBasePoint.fy;
-                aP.fz=aBox.fMaxZ-pB->aBasePoint.fz;
-                rBox.Union(aP);
-                break;
-            }
-            case DXF_POLYLINE: {
-                //const DXFAttribEntity * pE = (DXFAttribEntity*)pBE;
-                //???
-                break;
-            }
-            case DXF_SEQEND: {
-                //const DXFAttribEntity * pE = (DXFAttribEntity*)pBE;
-                //???
-                break;
-            }
-            case DXF_HATCH :
-                break;
-            case DXF_LWPOLYLINE :
-                break;
-        }
-        pBE=pBE->pSucc;
-    }
-}
diff --git a/goodies/source/filter.vcl/idxf/dxfreprd.hxx b/goodies/source/filter.vcl/idxf/dxfreprd.hxx
deleted file mode 100644
index 13ca7d022697..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfreprd.hxx
+++ /dev/null
@@ -1,141 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfreprd.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _DXFREPRD_HXX
-#define _DXFREPRD_HXX
-
-#include <dxfblkrd.hxx>
-#include <dxftblrd.hxx>
-
-
-//----------------------------------------------------------------------------
-//--------------------Nebensachen---------------------------------------------
-//----------------------------------------------------------------------------
-
-//-------------------Eine 3D-Min/Max-Box--------------------------------------
-
-class DXFBoundingBox {
-public:
-    BOOL bEmpty;
-    double fMinX;
-    double fMinY;
-    double fMinZ;
-    double fMaxX;
-    double fMaxY;
-    double fMaxZ;
-
-    DXFBoundingBox() { bEmpty=TRUE; }
-    void Union(const DXFVector & rVector);
-};
-
-
-//-------------------Die (konstante) Palette fuer DXF-------------------------
-
-class DXFPalette {
-
-public:
-
-    DXFPalette();
-    ~DXFPalette();
-
-    BYTE GetRed(BYTE nIndex) const;
-    BYTE GetGreen(BYTE nIndex) const;
-    BYTE GetBlue(BYTE nIndex) const;
-
-private:
-    BYTE * pRed;
-    BYTE * pGreen;
-    BYTE * pBlue;
-    void SetColor(BYTE nIndex, BYTE nRed, BYTE nGreen, BYTE nBlue);
-};
-
-
-//----------------------------------------------------------------------------
-//-----------------DXF Datei lesen und repraesentieren------------------------
-//----------------------------------------------------------------------------
-
-class DXFRepresentation {
-
-public:
-
-    DXFPalette aPalette;
-        // Die immer gleiche DXF-Farb-Palette
-
-    DXFBoundingBox aBoundingBox;
-        // Ist gleich den AutoCAD-Variablen EXTMIN, EXTMAX sofern in DXF-Datei
-        // vorhanden, anderenfalls wird die BoundingBox berechnet (in Read()).
-
-    DXFTables aTables;
-        // Die Tabellen der DXF-Datei
-
-    DXFBlocks aBlocks;
-        // Die Bloecke der DXF-Datei
-
-    DXFEntities aEntities;
-        // Die Entities (aus der Entities-Section) der DXF-Datei
-
-    rtl_TextEncoding mEnc;  // $DWGCODEPAGE
-
-    double mfGlobalLineTypeScale; // $LTSCALE
-
-    DXFRepresentation();
-    ~DXFRepresentation();
-
-        rtl_TextEncoding getTextEncoding() const;
-        void setTextEncoding(rtl_TextEncoding aEnc);
-
-        double getGlobalLineTypeScale() const;
-        void setGlobalLineTypeScale(double fGlobalLineTypeScale);
-
-    BOOL Read( SvStream & rIStream, USHORT nMinPercent, USHORT nMaxPercent);
-        // Liesst die komplette DXF-Datei ein.
-
-private:
-
-    void ReadHeader(DXFGroupReader & rDGR);
-    void CalcBoundingBox(const DXFEntities & rEntities,
-                         DXFBoundingBox & rBox);
-};
-
-//----------------------------------------------------------------------------
-//-------------------inlines--------------------------------------------------
-//----------------------------------------------------------------------------
-
-inline BYTE DXFPalette::GetRed(BYTE nIndex) const { return pRed[nIndex]; }
-inline BYTE DXFPalette::GetGreen(BYTE nIndex) const { return pGreen[nIndex]; }
-inline BYTE DXFPalette::GetBlue(BYTE nIndex) const { return pBlue[nIndex]; }
-inline rtl_TextEncoding DXFRepresentation::getTextEncoding() const { return mEnc; }
-inline void DXFRepresentation::setTextEncoding(rtl_TextEncoding aEnc) { mEnc = aEnc; }
-inline double DXFRepresentation::getGlobalLineTypeScale() const { return mfGlobalLineTypeScale; }
-inline void DXFRepresentation::setGlobalLineTypeScale(double fGlobalLineTypeScale) { mfGlobalLineTypeScale = fGlobalLineTypeScale; }
-
-#endif
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxftblrd.cxx b/goodies/source/filter.vcl/idxf/dxftblrd.cxx
deleted file mode 100644
index 3edacc9c1d14..000000000000
--- a/goodies/source/filter.vcl/idxf/dxftblrd.cxx
+++ /dev/null
@@ -1,351 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxftblrd.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <string.h>
-#include <dxftblrd.hxx>
-
-//----------------------------------DXFLType-----------------------------------
-
-DXFLType::DXFLType()
-{
-    pSucc=NULL;
-    sName[0]=0;
-    nFlags=0;
-    sDescription[0]=0;
-    nDashCount=0;
-}
-
-void DXFLType::Read(DXFGroupReader & rDGR)
-{
-    long nDashIndex=-1;
-
-    while (rDGR.Read()!=0)
-    {
-        switch (rDGR.GetG())
-        {
-            case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-            case 70: nFlags=rDGR.GetI(); break;
-            case  3: strncpy( sDescription, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-            case 73:
-                if (nDashIndex!=-1) {
-                    rDGR.SetError();
-                    return;
-                }
-                nDashCount=rDGR.GetI();
-                if (nDashCount>DXF_MAX_DASH_COUNT)
-                    nDashCount=DXF_MAX_DASH_COUNT;
-                nDashIndex=0;
-                break;
-            case 40: fPatternLength=rDGR.GetF(); break;
-            case 49:
-                if (nDashCount==-1) {
-                    rDGR.SetError();
-                    return;
-                }
-                if (nDashIndex<nDashCount)
-                    fDash[nDashIndex++]=rDGR.GetF();
-                break;
-        }
-    }
-}
-
-//----------------------------------DXFLayer-----------------------------------
-
-DXFLayer::DXFLayer()
-{
-    pSucc=NULL;
-    sName[0]=0;
-    nFlags=0;
-    nColor=-1;
-    sLineType[0]=0;
-}
-
-void DXFLayer::Read(DXFGroupReader & rDGR)
-{
-    while (rDGR.Read()!=0) {
-        switch(rDGR.GetG()) {
-            case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-            case 70: nFlags=rDGR.GetI(); break;
-            case 62: nColor=rDGR.GetI(); break;
-            case  6: strncpy( sLineType, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        }
-    }
-}
-
-//----------------------------------DXFStyle-----------------------------------
-
-DXFStyle::DXFStyle()
-{
-    pSucc=NULL;
-    sName[0]=0;
-    nFlags=0;
-    fHeight=0.0;
-    fWidthFak=1.0;
-    fOblAngle=0.0;
-    nTextGenFlags=0;
-    fLastHeightUsed=0.0;
-    sPrimFontFile[0]=0;
-    sBigFontFile[0]=0;
-}
-
-void DXFStyle::Read(DXFGroupReader & rDGR)
-{
-    while (rDGR.Read()!=0) {
-        switch(rDGR.GetG()) {
-            case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-            case 70: nFlags=rDGR.GetI(); break;
-            case 40: fHeight=rDGR.GetF(); break;
-            case 41: fWidthFak=rDGR.GetF(); break;
-            case 50: fOblAngle=rDGR.GetF(); break;
-            case 71: nTextGenFlags=rDGR.GetI(); break;
-            case 42: fLastHeightUsed=rDGR.GetF(); break;
-            case  3: strncpy( sPrimFontFile, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-            case  4: strncpy( sBigFontFile, rDGR.GetS(), DXF_MAX_STRING_LEN + 1 ); break;
-        }
-    }
-}
-
-//----------------------------------DXFVPort-----------------------------------
-
-DXFVPort::DXFVPort()
-{
-    pSucc=NULL;
-
-    sName[0]=0;
-    nFlags=0;
-    fMinX=0;
-    fMinY=0;
-    fMaxX=0;
-    fMaxY=0;
-    fCenterX=0;
-    fCenterY=0;
-    fSnapBaseX=0;
-    fSnapBaseY=0;
-    fSnapSapcingX=0;
-    fSnapSpacingY=0;
-    fGridX=0;
-    fGridY=0;
-    aDirection=DXFVector(0,0,1);
-    aTarget=DXFVector(0,0,0);
-    fHeight=0;
-    fAspectRatio=0;
-    fLensLength=0;
-    fFrontClipPlane=0;
-    fBackClipPlane=0;
-    fTwistAngle=0;
-    nStatus=0;
-    nID=0;
-    nMode=0;
-    nCircleZoomPercent=0;
-    nFastZoom=0;
-    nUCSICON=0;
-    nSnap=0;
-    nGrid=0;
-    nSnapStyle=0;
-    nSnapIsopair=0;
-}
-
-void DXFVPort::Read(DXFGroupReader & rDGR)
-{
-    while (rDGR.Read()!=0) {
-        switch(rDGR.GetG()) {
-            case  2: strncpy( sName, rDGR.GetS(), DXF_MAX_STRING_LEN + 1); break;
-            case 70: nFlags=rDGR.GetI(); break;
-            case 10: fMinX=rDGR.GetF(); break;
-            case 20: fMinY=rDGR.GetF(); break;
-            case 11: fMaxX=rDGR.GetF(); break;
-            case 21: fMaxY=rDGR.GetF(); break;
-            case 12: fCenterX=rDGR.GetF(); break;
-            case 22: fCenterY=rDGR.GetF(); break;
-            case 13: fSnapBaseX=rDGR.GetF(); break;
-            case 23: fSnapBaseY=rDGR.GetF(); break;
-            case 14: fSnapSapcingX=rDGR.GetF(); break;
-            case 24: fSnapSpacingY=rDGR.GetF(); break;
-            case 15: fGridX=rDGR.GetF(); break;
-            case 25: fGridY=rDGR.GetF(); break;
-            case 16: aDirection.fx=rDGR.GetF(); break;
-            case 26: aDirection.fy=rDGR.GetF(); break;
-            case 36: aDirection.fz=rDGR.GetF(); break;
-            case 17: aTarget.fx=rDGR.GetF(); break;
-            case 27: aTarget.fy=rDGR.GetF(); break;
-            case 37: aTarget.fz=rDGR.GetF(); break;
-            case 40: fHeight=rDGR.GetF(); break;
-            case 41: fAspectRatio=rDGR.GetF(); break;
-            case 42: fLensLength=rDGR.GetF(); break;
-            case 43: fFrontClipPlane=rDGR.GetF(); break;
-            case 44: fBackClipPlane=rDGR.GetF(); break;
-            case 51: fTwistAngle=rDGR.GetF(); break;
-            case 68: nStatus=rDGR.GetI(); break;
-            case 69: nID=rDGR.GetI(); break;
-            case 71: nMode=rDGR.GetI(); break;
-            case 72: nCircleZoomPercent=rDGR.GetI(); break;
-            case 73: nFastZoom=rDGR.GetI(); break;
-            case 74: nUCSICON=rDGR.GetI(); break;
-            case 75: nSnap=rDGR.GetI(); break;
-            case 76: nGrid=rDGR.GetI(); break;
-            case 77: nSnapStyle=rDGR.GetI(); break;
-            case 78: nSnapIsopair=rDGR.GetI(); break;
-        }
-    }
-}
-
-//----------------------------------DXFTables----------------------------------
-
-
-DXFTables::DXFTables()
-{
-    pLTypes=NULL;
-    pLayers=NULL;
-    pStyles=NULL;
-    pVPorts=NULL;
-}
-
-
-DXFTables::~DXFTables()
-{
-    Clear();
-}
-
-
-void DXFTables::Read(DXFGroupReader & rDGR)
-{
-    DXFLType * * ppLT, * pLT;
-    DXFLayer * * ppLa, * pLa;
-    DXFStyle * * ppSt, * pSt;
-    DXFVPort * * ppVP, * pVP;
-
-    ppLT=&pLTypes;
-    while(*ppLT!=NULL) ppLT=&((*ppLT)->pSucc);
-
-    ppLa=&pLayers;
-    while(*ppLa!=NULL) ppLa=&((*ppLa)->pSucc);
-
-    ppSt=&pStyles;
-    while(*ppSt!=NULL) ppSt=&((*ppSt)->pSucc);
-
-    ppVP=&pVPorts;
-    while(*ppVP!=NULL) ppVP=&((*ppVP)->pSucc);
-
-    for (;;) {
-        while (rDGR.GetG()!=0) rDGR.Read();
-        if (strcmp(rDGR.GetS(),"EOF")==0 ||
-            strcmp(rDGR.GetS(),"ENDSEC")==0) break;
-        else if (strcmp(rDGR.GetS(),"LTYPE")==0) {
-            pLT=new DXFLType;
-            pLT->Read(rDGR);
-            *ppLT=pLT;
-            ppLT=&(pLT->pSucc);
-        }
-        else if (strcmp(rDGR.GetS(),"LAYER")==0) {
-            pLa=new DXFLayer;
-            pLa->Read(rDGR);
-            *ppLa=pLa;
-            ppLa=&(pLa->pSucc);
-        }
-        else if (strcmp(rDGR.GetS(),"STYLE")==0) {
-            pSt=new DXFStyle;
-            pSt->Read(rDGR);
-            *ppSt=pSt;
-            ppSt=&(pSt->pSucc);
-        }
-        else if (strcmp(rDGR.GetS(),"VPORT")==0) {
-            pVP=new DXFVPort;
-            pVP->Read(rDGR);
-            *ppVP=pVP;
-            ppVP=&(pVP->pSucc);
-        }
-        else rDGR.Read();
-    }
-}
-
-
-void DXFTables::Clear()
-{
-    DXFLType * pLT;
-    DXFLayer * pLa;
-    DXFStyle * pSt;
-    DXFVPort * pVP;
-
-    while (pStyles!=NULL) {
-        pSt=pStyles;
-        pStyles=pSt->pSucc;
-        delete pSt;
-    }
-    while (pLayers!=NULL) {
-        pLa=pLayers;
-        pLayers=pLa->pSucc;
-        delete pLa;
-    }
-    while (pLTypes!=NULL) {
-        pLT=pLTypes;
-        pLTypes=pLT->pSucc;
-        delete pLT;
-    }
-    while (pVPorts!=NULL) {
-        pVP=pVPorts;
-        pVPorts=pVP->pSucc;
-        delete pVP;
-    }
-}
-
-
-DXFLType * DXFTables::SearchLType(const char * pName) const
-{
-    DXFLType * p;
-    for (p=pLTypes; p!=NULL; p=p->pSucc) {
-        if (strcmp(pName,p->sName)==0) break;
-    }
-    return p;
-}
-
-
-DXFLayer * DXFTables::SearchLayer(const char * pName) const
-{
-    DXFLayer * p;
-    for (p=pLayers; p!=NULL; p=p->pSucc) {
-        if (strcmp(pName,p->sName)==0) break;
-    }
-    return p;
-}
-
-
-DXFVPort * DXFTables::SearchVPort(const char * pName) const
-{
-    DXFVPort * p;
-    for (p=pVPorts; p!=NULL; p=p->pSucc) {
-        if (strcmp(pName,p->sName)==0) break;
-    }
-    return p;
-}
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxftblrd.hxx b/goodies/source/filter.vcl/idxf/dxftblrd.hxx
deleted file mode 100644
index 9d1df2487129..000000000000
--- a/goodies/source/filter.vcl/idxf/dxftblrd.hxx
+++ /dev/null
@@ -1,186 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxftblrd.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 _DXFTBLRD_HXX
-#define _DXFTBLRD_HXX
-
-#include <dxfgrprd.hxx>
-#include <dxfvec.hxx>
-
-
-//----------------------------------------------------------------------------
-//------------------ Linien-Typ ----------------------------------------------
-//----------------------------------------------------------------------------
-
-#define DXF_MAX_DASH_COUNT 32
-
-class DXFLType {
-
-public:
-
-    DXFLType * pSucc;
-
-    char sName[DXF_MAX_STRING_LEN+1];        //  2
-    long nFlags;                             // 70
-    char sDescription[DXF_MAX_STRING_LEN+1]; //  3
-    long nDashCount;                         // 73
-    double fPatternLength;                   // 40
-    double fDash[DXF_MAX_DASH_COUNT];        // 49,49,...
-
-    DXFLType();
-    void Read(DXFGroupReader & rDGR);
-};
-
-
-//----------------------------------------------------------------------------
-//------------------ Layer ---------------------------------------------------
-//----------------------------------------------------------------------------
-
-class DXFLayer {
-
-public:
-
-    DXFLayer * pSucc;
-
-    char sName[DXF_MAX_STRING_LEN+1];     //  2
-    long nFlags;                          // 70
-    long nColor;                          // 62
-    char sLineType[DXF_MAX_STRING_LEN+1]; //  6
-
-    DXFLayer();
-    void Read(DXFGroupReader & rDGR);
-};
-
-
-//----------------------------------------------------------------------------
-//------------------ Style ---------------------------------------------------
-//----------------------------------------------------------------------------
-
-class DXFStyle {
-
-public:
-
-    DXFStyle * pSucc;
-
-    char sName[DXF_MAX_STRING_LEN+1];         //  2
-    long nFlags;                              // 70
-    double fHeight;                           // 40
-    double fWidthFak;                         // 41
-    double fOblAngle;                         // 50
-    long nTextGenFlags;                       // 71
-    double fLastHeightUsed;                   // 42
-    char sPrimFontFile[DXF_MAX_STRING_LEN+1]; //  3
-    char sBigFontFile[DXF_MAX_STRING_LEN+1];  //  4
-
-    DXFStyle();
-    void Read(DXFGroupReader & rDGR);
-};
-
-
-//----------------------------------------------------------------------------
-//------------------ VPort ---------------------------------------------------
-//----------------------------------------------------------------------------
-
-class DXFVPort {
-
-public:
-
-    DXFVPort * pSucc;
-
-    char sName[DXF_MAX_STRING_LEN+1]; //  2
-    long nFlags;                      // 70
-    double fMinX;                     // 10
-    double fMinY;                     // 20
-    double fMaxX;                     // 11
-    double fMaxY;                     // 21
-    double fCenterX;                  // 12
-    double fCenterY;                  // 22
-    double fSnapBaseX;                // 13
-    double fSnapBaseY;                // 23
-    double fSnapSapcingX;             // 14
-    double fSnapSpacingY;             // 24
-    double fGridX;                    // 15
-    double fGridY;                    // 25
-    DXFVector aDirection;             // 16,26,36
-    DXFVector aTarget;                // 17,27,37
-    double fHeight;                   // 40
-    double fAspectRatio;              // 41
-    double fLensLength;               // 42
-    double fFrontClipPlane;           // 43
-    double fBackClipPlane;            // 44
-    double fTwistAngle;               // 51
-    long nStatus;                     // 68
-    long nID;                         // 69
-    long nMode;                       // 71
-    long nCircleZoomPercent;          // 72
-    long nFastZoom;                   // 73
-    long nUCSICON;                    // 74
-    long nSnap;                       // 75
-    long nGrid;                       // 76
-    long nSnapStyle;                  // 77
-    long nSnapIsopair;                // 78
-
-    DXFVPort();
-    void Read(DXFGroupReader & rDGR);
-};
-
-
-//----------------------------------------------------------------------------
-//------------------ Tabellen ------------------------------------------------
-//----------------------------------------------------------------------------
-
-class DXFTables {
-
-public:
-
-    DXFLType * pLTypes; // Liste der Linientypen
-    DXFLayer * pLayers; // Liste der Layers
-    DXFStyle * pStyles; // Liste der Styles
-    DXFVPort * pVPorts; // Liste der Viewports
-
-    DXFTables();
-    ~DXFTables();
-
-    void Read(DXFGroupReader & rDGR);
-        // Liest die Tabellen ein bis zu einem ENDSEC oder EOF
-        // (unbekannte Dinge/Tabellen werden uebersprungen)
-
-    void Clear();
-
-    // Suche nach Tabelleneintraegen:
-    DXFLType * SearchLType(const char * pName) const;
-    DXFLayer * SearchLayer(const char * pName) const;
-    DXFVPort * SearchVPort(const char * pName) const;
-
-};
-
-#endif
-
-
diff --git a/goodies/source/filter.vcl/idxf/dxfvec.cxx b/goodies/source/filter.vcl/idxf/dxfvec.cxx
deleted file mode 100644
index 48bc93ae3eb6..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfvec.cxx
+++ /dev/null
@@ -1,257 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfvec.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <math.h>
-#include <dxfvec.hxx>
-
-
-//---------------------------- DXFVector ---------------------------------------
-
-
-double DXFVector::Abs() const
-{
-    return sqrt(SProd(*this));
-}
-
-
-DXFVector DXFVector::Unit() const
-{
-    double flen;
-
-    flen=Abs();
-    if (flen!=0) return (*this)*(1.0/flen);
-    else return DXFVector(1.0,0.0,0.0);
-}
-
-
-//---------------------------- DXFTransform ------------------------------------
-
-
-DXFTransform::DXFTransform() :
-    aMX(1.0, 0.0, 0.0),
-    aMY(0.0, 1.0, 0.0),
-    aMZ(0.0, 0.0, 1.0),
-    aMP(0.0, 0.0, 0.0)
-{
-}
-
-
-DXFTransform::DXFTransform(double fScaleX, double fScaleY, double fScaleZ,
-                           const DXFVector & rShift) :
-    aMX(fScaleX, 0.0, 0.0),
-    aMY(0.0, fScaleY, 0.0),
-    aMZ(0.0, 0.0, fScaleZ),
-    aMP(rShift)
-{
-}
-
-
-DXFTransform::DXFTransform(double fScaleX, double fScaleY, double fScaleZ,
-                           double fRotAngle,
-                           const DXFVector & rShift) :
-    aMX(0.0, 0.0, 0.0),
-    aMY(0.0, 0.0, 0.0),
-    aMZ(0.0, 0.0, fScaleZ),
-    aMP(rShift)
-{
-    aMX.fx=cos(3.14159265359/180.0*fRotAngle);
-    aMX.fy=sin(3.14159265359/180.0*fRotAngle);
-    aMY.fx=-aMX.fy;
-    aMY.fy=aMX.fx;
-    aMX*=fScaleX;
-    aMY*=fScaleY;
-}
-
-
-DXFTransform::DXFTransform(const DXFVector & rExtrusion) :
-    aMX(), aMY(), aMZ(), aMP(0.0, 0.0, 0.0)
-{
-    // 'Arbitrary Axis Algorithm' (siehe DXF-Doku von Autodesk)
-    if ( fabs(rExtrusion.fx) < 1.0/64.0 && fabs(rExtrusion.fy) < 1.0/64.0) {
-        aMX = DXFVector(0.0, 1.0, 0.0) * rExtrusion;
-    }
-    else {
-        aMX = DXFVector(0.0, 0.0, 1.0) * rExtrusion;
-    }
-    aMX=aMX.Unit();
-    aMY=(rExtrusion*aMX).Unit();
-    aMZ=rExtrusion.Unit();
-}
-
-
-DXFTransform::DXFTransform(const DXFVector & rViewDir, const DXFVector & rViewTarget) :
-    aMX(), aMY(), aMZ(), aMP()
-{
-    DXFVector aV;
-
-    aV=rViewDir.Unit();
-    aMX.fz=aV.fx;
-    aMY.fz=aV.fy;
-    aMZ.fz=aV.fz;
-
-    aMZ.fx=0;
-    if (aV.fx==0) aMY.fx=0; else aMY.fx=sqrt(1/(1+aV.fy*aV.fy/(aV.fx*aV.fx)));
-    aMX.fx=sqrt(1-aMY.fx*aMY.fx);
-    if (aV.fx*aV.fy*aMY.fx>0) aMX.fx=-aMX.fx;
-
-    aV=aV*DXFVector(aMX.fx,aMY.fx,aMZ.fx);
-    aMX.fy=aV.fx;
-    aMY.fy=aV.fy;
-    aMZ.fy=aV.fz;
-
-    if (aMZ.fy<0) {
-        aMX.fy=-aMX.fy;
-        aMY.fy=-aMY.fy;
-        aMZ.fy=-aMZ.fy;
-        aMX.fx=-aMX.fx;
-        aMY.fx=-aMY.fx;
-    }
-
-    aV=DXFVector(0,0,0)-rViewTarget;
-    aMP.fx = aV.fx * aMX.fx + aV.fy * aMY.fx + aV.fz * aMZ.fx;
-    aMP.fy = aV.fx * aMX.fy + aV.fy * aMY.fy + aV.fz * aMZ.fy;
-    aMP.fz = aV.fx * aMX.fz + aV.fy * aMY.fz + aV.fz * aMZ.fz;
-}
-
-
-DXFTransform::DXFTransform(const DXFTransform & rT1, const DXFTransform & rT2) :
-    aMX(),aMY(),aMZ(),aMP()
-{
-    rT2.TransDir(rT1.aMX,aMX);
-    rT2.TransDir(rT1.aMY,aMY);
-    rT2.TransDir(rT1.aMZ,aMZ);
-    rT2.Transform(rT1.aMP,aMP);
-}
-
-
-void DXFTransform::Transform(const DXFVector & rSrc, DXFVector & rTgt) const
-{
-    rTgt.fx = rSrc.fx * aMX.fx + rSrc.fy * aMY.fx + rSrc.fz * aMZ.fx + aMP.fx;
-    rTgt.fy = rSrc.fx * aMX.fy + rSrc.fy * aMY.fy + rSrc.fz * aMZ.fy + aMP.fy;
-    rTgt.fz = rSrc.fx * aMX.fz + rSrc.fy * aMY.fz + rSrc.fz * aMZ.fz + aMP.fz;
-}
-
-
-void DXFTransform::Transform(const DXFVector & rSrc, Point & rTgt) const
-{
-    rTgt.X()=(long)( rSrc.fx * aMX.fx + rSrc.fy * aMY.fx + rSrc.fz * aMZ.fx + aMP.fx + 0.5 );
-    rTgt.Y()=(long)( rSrc.fx * aMX.fy + rSrc.fy * aMY.fy + rSrc.fz * aMZ.fy + aMP.fy + 0.5 );
-}
-
-
-void DXFTransform::TransDir(const DXFVector & rSrc, DXFVector & rTgt) const
-{
-    rTgt.fx = rSrc.fx * aMX.fx + rSrc.fy * aMY.fx + rSrc.fz * aMZ.fx;
-    rTgt.fy = rSrc.fx * aMX.fy + rSrc.fy * aMY.fy + rSrc.fz * aMZ.fy;
-    rTgt.fz = rSrc.fx * aMX.fz + rSrc.fy * aMY.fz + rSrc.fz * aMZ.fz;
-}
-
-
-BOOL DXFTransform::TransCircleToEllipse(double fRadius, double & rEx, double & rEy) const
-{
-    double fMXAbs=aMX.Abs();
-    double fMYAbs=aMY.Abs();
-    double fNearNull=(fMXAbs+fMYAbs)*0.001;
-
-    if (fabs(aMX.fy)<=fNearNull && fabs(aMX.fz)<=fNearNull &&
-        fabs(aMY.fx)<=fNearNull && fabs(aMY.fz)<=fNearNull)
-    {
-        rEx=fabs(aMX.fx*fRadius);
-        rEy=fabs(aMY.fy*fRadius);
-        return TRUE;
-    }
-    else if (fabs(aMX.fx)<=fNearNull && fabs(aMX.fz)<=fNearNull &&
-             fabs(aMY.fy)<=fNearNull && fabs(aMY.fz)<=fNearNull)
-    {
-        rEx=fabs(aMY.fx*fRadius);
-        rEy=fabs(aMX.fy*fRadius);
-        return TRUE;
-    }
-    else if (fabs(fMXAbs-fMYAbs)<=fNearNull &&
-             fabs(aMX.fz)<=fNearNull && fabs(aMY.fz)<=fNearNull)
-    {
-        rEx=rEy=fabs(((fMXAbs+fMYAbs)/2)*fRadius);
-        return TRUE;
-    }
-    else return FALSE;
-}
-
-LineInfo DXFTransform::Transform(const DXFLineInfo& aDXFLineInfo) const
-{
-    double fex,fey,scale;
-
-    fex=sqrt(aMX.fx*aMX.fx + aMX.fy*aMX.fy);
-    fey=sqrt(aMY.fx*aMY.fx + aMY.fy*aMY.fy);
-    scale = (fex+fey)/2.0;
-
-    LineInfo aLineInfo;
-
-    aLineInfo.SetStyle( aDXFLineInfo.eStyle );
-    aLineInfo.SetWidth( (sal_Int32) (aDXFLineInfo.fWidth * scale + 0.5) );
-    aLineInfo.SetDashCount( static_cast< USHORT >( aDXFLineInfo.nDashCount ) );
-    aLineInfo.SetDashLen( (sal_Int32) (aDXFLineInfo.fDashLen * scale + 0.5) );
-    aLineInfo.SetDotCount( static_cast< USHORT >( aDXFLineInfo.nDotCount ) );
-    aLineInfo.SetDotLen( (sal_Int32) (aDXFLineInfo.fDotLen * scale + 0.5) );
-    aLineInfo.SetDistance( (sal_Int32) (aDXFLineInfo.fDistance * scale + 0.5) );
-
-    if ( aLineInfo.GetDashCount() > 0 && aLineInfo.GetDashLen() == 0 )
-        aLineInfo.SetDashLen(1);
-
-    if ( aLineInfo.GetDotCount() > 0 && aLineInfo.GetDotLen() == 0 )
-        aLineInfo.SetDotLen(1);
-
-    return aLineInfo;
-}
-
-ULONG DXFTransform::TransLineWidth(double fW) const
-{
-    double fex,fey;
-
-    fex=sqrt(aMX.fx*aMX.fx + aMX.fy*aMX.fy);
-    fey=sqrt(aMY.fx*aMY.fx + aMY.fy*aMY.fy);
-    // ###
-    // printf("fex=%f fey=%f\n", fex, fey);
-    return (ULONG)(fabs(fW)*(fex+fey)/2.0+0.5);
-}
-
-
-double DXFTransform::CalcRotAngle() const
-{
-    return atan2(aMX.fy,aMX.fx)/3.14159265359*180.0;
-}
-
-BOOL DXFTransform::Mirror() const
-{
-    if (aMZ.SProd(aMX*aMY)<0) return TRUE; else return FALSE;
-}
-
diff --git a/goodies/source/filter.vcl/idxf/dxfvec.hxx b/goodies/source/filter.vcl/idxf/dxfvec.hxx
deleted file mode 100644
index aca26df46676..000000000000
--- a/goodies/source/filter.vcl/idxf/dxfvec.hxx
+++ /dev/null
@@ -1,264 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dxfvec.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _DXFVEC_HXX
-#define _DXFVEC_HXX
-
-#include <tools/gen.hxx>
-#include <vcl/lineinfo.hxx>
-
-class DXFLineInfo {
-public:
-    LineStyle       eStyle;
-    double          fWidth;
-    sal_Int32       nDashCount;
-    double          fDashLen;
-    sal_Int32       nDotCount;
-    double          fDotLen;
-    double          fDistance;
-
-    DXFLineInfo() :
-        eStyle(LINE_SOLID),
-        fWidth(0),
-        nDashCount(0),
-        fDashLen(0),
-        nDotCount(0),
-        fDotLen(0),
-        fDistance(0) {}
-
-    DXFLineInfo(const DXFLineInfo& x) :
-        eStyle(x.eStyle),
-        fWidth(x.fWidth),
-        nDashCount(x.nDashCount),
-        fDashLen(x.fDashLen),
-        nDotCount(x.nDotCount),
-        fDotLen(x.fDotLen),
-        fDistance(x.fDistance) {}
-
-};
-
-
-//------------------------------------------------------------------------------
-//---------------------------- DXFVector ---------------------------------------
-//------------------------------------------------------------------------------
-// Allgemeiner 3D-Vektor mit double
-
-class DXFVector {
-
-public:
-
-    double fx,fy,fz; // public ! - Warum nicht ?
-
-    inline DXFVector(double fX=0.0, double fY=0.0, double fZ=0.0);
-    inline DXFVector(const DXFVector & rV);
-
-    // Addition/Subtraktion:
-    DXFVector & operator += (const DXFVector & rV);
-    DXFVector   operator +  (const DXFVector & rV) const;
-    DXFVector & operator -= (const DXFVector & rV);
-    DXFVector   operator -  (const DXFVector & rV) const;
-
-    // Vektorprodukt
-    DXFVector   operator *  (const DXFVector & rV) const;
-
-    // Skalarprodukt:
-    double SProd(const DXFVector & rV) const;
-
-    // Multiplikation mit Skalar:
-    DXFVector & operator *= (double fs);
-    DXFVector   operator *  (double fs) const;
-
-    // Laenge:
-    double Abs() const;
-
-    // Vektor gleicher Richtung und der Laenge 1:
-    DXFVector Unit() const;
-
-    // Aequivalenz oder nicht:
-    BOOL operator == (const DXFVector & rV) const;
-    BOOL operator != (const DXFVector & rV) const;
-};
-
-//------------------------------------------------------------------------------
-//---------------------------- DXFTransform ------------------------------------
-//------------------------------------------------------------------------------
-// Eine Transformationsmatrix, spezialisiert auf unser Problem
-
-class DXFTransform {
-
-public:
-
-    DXFTransform();
-        // Zielkoordinate = Quellkoordinate
-
-    DXFTransform(double fScaleX, double fScaleY, double fScaleZ,
-                 const DXFVector & rShift);
-        // Zielkoordinate = Verschoben(Skaliert(Quellkoorinate))
-
-    DXFTransform(double fScaleX, double fScaleY, double fScaleZ,
-                 double fRotAngle,
-                 const DXFVector & rShift);
-        // Zielkoordinate = Verschoben(Gedreht(Skaliert(Quellkoorinate)))
-        // Drehung geshieht um die Z-Achse, fRotAngle in Grad.
-
-    DXFTransform(const DXFVector & rExtrusion);
-        // Transformation "ECS->WCS" per "Entity Extrusion Direction"
-        // und dem "Arbitrary Axis Algorithm"
-        // (Siehe DXF-Docu von AutoDesk)
-
-    DXFTransform(const DXFVector & rViewDir, const DXFVector & rViewTarget);
-        // Transformation Objektraum->Bildraum anhand von Richtung und
-        // Zielpunkt eines ViewPort.
-        // (siehe DXF-Docu von AutoDesk: VPORT)
-
-    DXFTransform(const DXFTransform & rT1, const DXFTransform & rT2);
-        // Zielkoordinate = rT2(rT1(Quellkoorinate))
-
-
-    void Transform(const DXFVector & rSrc, DXFVector & rTgt) const;
-        // Transformation DXFVector nach DXFVector
-
-    void Transform(const DXFVector & rSrc, Point & rTgt) const;
-        // Transformation DXFVector nach SvPoint
-
-    void TransDir(const DXFVector & rSrc, DXFVector & rTgt) const;
-        // Transformation eines relativen Vektors (also kein Verschiebung)
-
-    BOOL TransCircleToEllipse(double fRadius, double & rEx, double & rEy) const;
-        // Versucht, einen Kreis (in der XY-Ebene) zu transformieren, so dass eine
-        // ausgerichtete Ellipse entsteht. Wenn das nicht geht, weil Ellipse
-        // in belibieger Lage entstehen wuerde, wird FALSE geliefert.
-        // (Der Mittelpunkt wird hiermit nicht transformiert, nehme Transform(..))
-
-    ULONG TransLineWidth(double fW) const;
-        // Transformiert die Liniendicke (so gut es geht)
-
-    double CalcRotAngle() const;
-        // Ermittelt den Rotationswinkel um die Z-Achse (in Grad)
-
-    BOOL Mirror() const;
-        // Liefert TRUE, wenn die Matrix ein Linkssystem bildet
-
-    LineInfo Transform(const DXFLineInfo& aDXFLineInfo) const;
-        // Transform to LineInfo
-
-private:
-    DXFVector aMX;
-    DXFVector aMY;
-    DXFVector aMZ;
-    DXFVector aMP;
-};
-
-//------------------------------------------------------------------------------
-//------------------------------- inlines --------------------------------------
-//------------------------------------------------------------------------------
-
-
-inline DXFVector::DXFVector(double fX, double fY, double fZ)
-{
-    fx=fX; fy=fY; fz=fZ;
-}
-
-
-inline DXFVector::DXFVector(const DXFVector & rV)
-{
-    fx=rV.fx; fy=rV.fy; fz=rV.fz;
-}
-
-
-inline DXFVector & DXFVector::operator += (const DXFVector & rV)
-{
-    fx+=rV.fx; fy+=rV.fy; fz+=rV.fz;
-    return *this;
-}
-
-
-inline DXFVector DXFVector::operator + (const DXFVector & rV) const
-{
-    return DXFVector(fx+rV.fx, fy+rV.fy, fz+rV.fz);
-}
-
-
-inline DXFVector & DXFVector::operator -= (const DXFVector & rV)
-{
-    fx-=rV.fx; fy-=rV.fy; fz-=rV.fz;
-    return *this;
-}
-
-
-inline DXFVector DXFVector::operator - (const DXFVector & rV) const
-{
-    return DXFVector(fx-rV.fx, fy-rV.fy, fz-rV.fz);
-}
-
-
-inline DXFVector DXFVector::operator *  (const DXFVector & rV) const
-{
-    return DXFVector(
-        fy * rV.fz - fz * rV.fy,
-        fz * rV.fx - fx * rV.fz,
-        fx * rV.fy - fy * rV.fx
-    );
-}
-
-
-inline double DXFVector::SProd(const DXFVector & rV) const
-{
-    return fx*rV.fx + fy*rV.fy + fz*rV.fz;
-}
-
-
-inline DXFVector & DXFVector::operator *= (double fs)
-{
-    fx*=fs; fy*=fs; fz*=fs;
-    return *this;
-}
-
-
-inline DXFVector DXFVector::operator * (double fs) const
-{
-    return DXFVector(fx*fs,fy*fs,fz*fs);
-}
-
-
-inline BOOL DXFVector::operator == (const DXFVector & rV) const
-{
-    if (fx==rV.fx && fy==rV.fy && fz==rV.fz) return TRUE;
-    else return FALSE;
-}
-
-
-inline BOOL DXFVector::operator != (const DXFVector & rV) const
-{
-    if (fx!=rV.fx || fy!=rV.fy || fz!=rV.fz) return TRUE;
-    else return FALSE;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/idxf/exports.map b/goodies/source/filter.vcl/idxf/exports.map
deleted file mode 100644
index d107435568e5..000000000000
--- a/goodies/source/filter.vcl/idxf/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-DXFIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/idxf/makefile.mk b/goodies/source/filter.vcl/idxf/makefile.mk
deleted file mode 100644
index 081022cd4e5b..000000000000
--- a/goodies/source/filter.vcl/idxf/makefile.mk
+++ /dev/null
@@ -1,83 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=idxf
-DEPTARGET=vidxf
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-EXCEPTIONSFILES=\
-            $(SLO)$/dxfentrd.obj \
-            $(SLO)$/dxf2mtf.obj
-
-SLOFILES =  $(SLO)$/dxfgrprd.obj \
-            $(SLO)$/dxfvec.obj   \
-            $(SLO)$/dxfentrd.obj \
-            $(SLO)$/dxfblkrd.obj \
-            $(SLO)$/dxftblrd.obj \
-            $(SLO)$/dxfreprd.obj \
-            $(SLO)$/dxf2mtf.obj  \
-            $(SLO)$/idxf.obj
-
-# ==========================================================================
-
-SHL1TARGET=     idx$(DLLPOSTFIX)
-SHL1IMPLIB=     idxf
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-
-SHL1LIBS=       $(SLB)$/idxf.lib # $(LB)$/rtftoken.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/idxf.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/goodies/source/filter.vcl/ieps/exports.map b/goodies/source/filter.vcl/ieps/exports.map
deleted file mode 100644
index 59406d7255ef..000000000000
--- a/goodies/source/filter.vcl/ieps/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-EPSIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/ieps/ieps.cxx b/goodies/source/filter.vcl/ieps/ieps.cxx
deleted file mode 100644
index f315ee864310..000000000000
--- a/goodies/source/filter.vcl/ieps/ieps.cxx
+++ /dev/null
@@ -1,732 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ieps.cxx,v $
- * $Revision: 1.20 $
- *
- * 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_goodies.hxx"
-
-#include <stdio.h>
-
-//
-#include <vcl/sv.h>
-#include <vcl/svapp.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/bitmapex.hxx>
-#include <vcl/animate.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/graph.h>
-#include <vcl/window.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/metaact.hxx>
-#include <vcl/gdimtf.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/cvtgrf.hxx>
-#include <vcl/bmpacc.hxx>
-#include <svtools/fltcall.hxx>
-#include <tools/urlobj.hxx>
-#include <tools/tempfile.hxx>
-#include <osl/process.h>
-#include <osl/file.hxx>
-
-/*************************************************************************
-|*
-|*    ImpSearchEntry()
-|*
-|*    Beschreibung      Prueft ob im Speicherbereich pSource der nComp Bytes
-|*                      gross ist eine Zeichenkette(pDest) mit der l�nge nSize
-|*                      liegt. Geprueft wird NON-CASE-SENSITIVE und der Rueck-
-|*                      gabewert ist die Adresse an der die Zeichekette gefunden
-|*                      wurde oder NULL
-|*
-|*    Ersterstellung    SJ 04.03.98 ( und das an meinem Geburtstag )
-|*    Letzte Aenderung  SJ 04.03.98
-|*
-*************************************************************************/
-
-static BYTE* ImplSearchEntry( BYTE* pSource, BYTE* pDest, ULONG nComp, ULONG nSize )
-{
-    while ( nComp-- >= nSize )
-    {
-        ULONG i;
-        for ( i = 0; i < nSize; i++ )
-        {
-            if ( ( pSource[i]&~0x20 ) != ( pDest[i]&~0x20 ) )
-                break;
-        }
-        if ( i == nSize )
-            return pSource;
-        pSource++;
-    }
-    return NULL;
-}
-
-//--------------------------------------------------------------------------
-// SecurityCount is the buffersize of the buffer in which we will parse for a number
-static long ImplGetNumber( BYTE **pBuf, int& nSecurityCount )
-{
-    BOOL    bValid = TRUE;
-    BOOL    bNegative = FALSE;
-    long    nRetValue = 0;
-    while ( ( --nSecurityCount ) && ( ( **pBuf == ' ' ) || ( **pBuf == 0x9 ) ) )
-        (*pBuf)++;
-    BYTE nByte = **pBuf;
-    while ( nSecurityCount && ( nByte != ' ' ) && ( nByte != 0x9 ) && ( nByte != 0xd ) && ( nByte != 0xa ) )
-    {
-        switch ( nByte )
-        {
-            case '.' :
-                // we'll only use the integer format
-                bValid = FALSE;
-                break;
-            case '-' :
-                bNegative = TRUE;
-                break;
-            default :
-                if ( ( nByte < '0' ) || ( nByte > '9' ) )
-                    nSecurityCount = 1;         // error parsing the bounding box values
-                else if ( bValid )
-                {
-                    nRetValue *= 10;
-                    nRetValue += nByte - '0';
-                }
-                break;
-        }
-        nSecurityCount--;
-        nByte = *(++(*pBuf));
-    }
-    if ( bNegative )
-        nRetValue = -nRetValue;
-    return nRetValue;
-}
-
-//--------------------------------------------------------------------------
-
-static int ImplGetLen( BYTE* pBuf, int nMax )
-{
-    int nLen = 0;
-    while( nLen != nMax )
-    {
-        BYTE nDat = *pBuf++;
-        if ( nDat == 0x0a || nDat == 0x25 )
-            break;
-        nLen++;
-    }
-    return nLen;
-}
-
-static void MakeAsMeta(Graphic &rGraphic)
-{
-    VirtualDevice   aVDev;
-    GDIMetaFile     aMtf;
-    Bitmap          aBmp( rGraphic.GetBitmap() );
-    Size            aSize = aBmp.GetPrefSize();
-
-    if( !aSize.Width() || !aSize.Height() )
-        aSize = Application::GetDefaultDevice()->PixelToLogic(
-            aBmp.GetSizePixel(), MAP_100TH_MM );
-    else
-        aSize = Application::GetDefaultDevice()->LogicToLogic( aSize,
-            aBmp.GetPrefMapMode(), MAP_100TH_MM );
-
-    aVDev.EnableOutput( FALSE );
-    aMtf.Record( &aVDev );
-    aVDev.DrawBitmap( Point(), aSize, rGraphic.GetBitmap() );
-    aMtf.Stop();
-    aMtf.WindStart();
-    aMtf.SetPrefMapMode( MAP_100TH_MM );
-    aMtf.SetPrefSize( aSize );
-    rGraphic = aMtf;
-}
-
-static bool RenderAsEMF(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &rGraphic)
-{
-    TempFile aTemp;
-    aTemp.EnableKillingFile();
-    rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("pstoedit"));
-    rtl::OUString arg1 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-f"));
-    rtl::OUString arg2 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("emf:-OO"));
-    rtl::OUString arg3 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
-    rtl::OUString output;
-    osl::FileBase::getSystemPathFromFileURL(aTemp.GetName(), output);
-    rtl_uString *args[] =
-    {
-        arg1.pData, arg2.pData, arg3.pData, output.pData
-    };
-    oslProcess aProcess;
-    oslFileHandle pIn = NULL;
-    oslFileHandle pOut = NULL;
-    oslFileHandle pErr = NULL;
-    oslProcessError eErr = osl_executeProcess_WithRedirectedIO(fileName.pData,
-        args, sizeof(args)/sizeof(rtl_uString *),
-        osl_Process_SEARCHPATH | osl_Process_HIDDEN,
-        osl_getCurrentSecurity(), 0, 0, 0, &aProcess, &pIn, &pOut, &pErr);
-    if (eErr!=osl_Process_E_None)
-        return false;
-
-    bool bRet = false;
-    sal_uInt64 nCount;
-    osl_writeFile(pIn, pBuf, nBytesRead, &nCount);
-    if (pIn) osl_closeFile(pIn);
-    bool bEMFSupported=true;
-    if (pOut)
-    {
-        rtl::ByteSequence seq;
-                if (osl_File_E_None == osl_readLine(pOut, (sal_Sequence **)&seq))
-        {
-                        rtl::OString line( (const sal_Char *) seq.getConstArray(), seq.getLength() );
-            if (line.indexOf(rtl::OString("Unsupported output format")) == 0)
-                bEMFSupported=false;
-        }
-        osl_closeFile(pOut);
-    }
-    if (pErr) osl_closeFile(pErr);
-    if (nCount == nBytesRead && bEMFSupported)
-    {
-        SvFileStream aFile(output, STREAM_READ);
-        if (GraphicConverter::Import(aFile, rGraphic, CVT_EMF) == ERRCODE_NONE)
-            bRet = true;
-    }
-    osl_joinProcess(aProcess);
-    osl_freeProcessHandle(aProcess);
-    return bRet;
-}
-
-static bool RenderAsPNGThroughHelper(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
-    Graphic &rGraphic, rtl::OUString &rProgName, rtl_uString **pArgs, size_t nArgs)
-{
-    oslProcess aProcess;
-    oslFileHandle pIn = NULL;
-    oslFileHandle pOut = NULL;
-    oslFileHandle pErr = NULL;
-    oslProcessError eErr = osl_executeProcess_WithRedirectedIO(rProgName.pData,
-        pArgs, nArgs, osl_Process_SEARCHPATH | osl_Process_HIDDEN,
-        osl_getCurrentSecurity(), 0, 0, 0, &aProcess, &pIn, &pOut, &pErr);
-    if (eErr!=osl_Process_E_None)
-        return false;
-
-    bool bRet = false;
-    sal_uInt64 nCount;
-    osl_writeFile(pIn, pBuf, nBytesRead, &nCount);
-    if (pIn) osl_closeFile(pIn);
-    if (nCount == nBytesRead)
-    {
-        SvMemoryStream aMemStm;
-        sal_uInt8 aBuf[32000];
-        oslFileError eFileErr = osl_readFile(pOut, aBuf, 32000, &nCount);
-        while (eFileErr == osl_File_E_None && nCount)
-        {
-            aMemStm.Write(aBuf, sal::static_int_cast< sal_Size >(nCount));
-            eFileErr = osl_readFile(pOut, aBuf, 32000, &nCount);
-        }
-
-        aMemStm.Seek(0);
-        if (
-            eFileErr == osl_File_E_None &&
-            GraphicConverter::Import(aMemStm, rGraphic, CVT_PNG) == ERRCODE_NONE
-           )
-        {
-            MakeAsMeta(rGraphic);
-            bRet = true;
-        }
-    }
-    if (pOut) osl_closeFile(pOut);
-    if (pErr) osl_closeFile(pErr);
-    osl_joinProcess(aProcess);
-    osl_freeProcessHandle(aProcess);
-    return bRet;
-}
-
-static bool RenderAsPNGThroughConvert(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
-    Graphic &rGraphic)
-{
-    rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("convert"));
-    // density in pixel/inch
-    rtl::OUString arg1 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-density"));
-    // since the preview is also used for PDF-Export & printing on non-PS-printers,
-    // use some better quality - 300x300 should allow some resizing as well
-    rtl::OUString arg2 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("300x300"));
-    // read eps from STDIN
-    rtl::OUString arg3 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("eps:-"));
-    // write png to STDOUT
-    rtl::OUString arg4 = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("png:-"));
-    rtl_uString *args[] =
-    {
-        arg1.pData, arg2.pData, arg3.pData, arg4.pData
-    };
-    return RenderAsPNGThroughHelper(pBuf, nBytesRead, rGraphic, fileName, args,
-        sizeof(args)/sizeof(rtl_uString *));
-}
-
-static bool RenderAsPNGThroughGS(const sal_uInt8* pBuf, sal_uInt32 nBytesRead,
-    Graphic &rGraphic)
-{
-#ifdef WNT
-    rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gswin32c"));
-#else
-    rtl::OUString fileName =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("gs"));
-#endif
-    rtl::OUString arg1 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-q"));
-    rtl::OUString arg2 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dBATCH"));
-    rtl::OUString arg3 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dNOPAUSE"));
-    rtl::OUString arg4 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dPARANOIDSAFER"));
-    rtl::OUString arg5 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dEPSCrop"));
-    rtl::OUString arg6 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dTextAlphaBits=4"));
-    rtl::OUString arg7 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-dGraphicsAlphaBits=4"));
-    rtl::OUString arg8 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-r300x300"));
-    rtl::OUString arg9 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-sDEVICE=png256"));
-    rtl::OUString arg10 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-sOutputFile=-"));
-    rtl::OUString arg11 =
-            rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("-"));
-    rtl_uString *args[] =
-    {
-        arg1.pData, arg2.pData, arg3.pData, arg4.pData, arg5.pData,
-        arg6.pData, arg7.pData, arg8.pData, arg9.pData, arg10.pData,
-        arg11.pData
-    };
-    return RenderAsPNGThroughHelper(pBuf, nBytesRead, rGraphic, fileName, args,
-        sizeof(args)/sizeof(rtl_uString *));
-}
-
-static bool RenderAsPNG(const sal_uInt8* pBuf, sal_uInt32 nBytesRead, Graphic &rGraphic)
-{
-    if (RenderAsPNGThroughConvert(pBuf, nBytesRead, rGraphic))
-        return true;
-    else
-        return RenderAsPNGThroughGS(pBuf, nBytesRead, rGraphic);
-}
-
-// this method adds a replacement action containing the original wmf or tiff replacement,
-// so the original eps can be written when storing to ODF.
-void CreateMtfReplacementAction( GDIMetaFile& rMtf, SvStream& rStrm, sal_uInt32 nOrigPos, sal_uInt32 nPSSize,
-                                sal_uInt32 nPosWMF, sal_uInt32 nSizeWMF, sal_uInt32 nPosTIFF, sal_uInt32 nSizeTIFF )
-{
-    ByteString aComment( (const sal_Char*)"EPSReplacementGraphic" );
-    if ( nSizeWMF || nSizeTIFF )
-    {
-        SvMemoryStream aReplacement( nSizeWMF + nSizeTIFF + 28 );
-        sal_uInt32 nMagic = 0xc6d3d0c5;
-        sal_uInt32 nPPos = 28 + nSizeWMF + nSizeTIFF;
-        sal_uInt32 nWPos = nSizeWMF ? 28 : 0;
-        sal_uInt32 nTPos = nSizeTIFF ? 28 + nSizeWMF : 0;
-
-        aReplacement << nMagic << nPPos << nPSSize
-                     << nWPos << nSizeWMF
-                     << nTPos << nSizeTIFF;
-        if ( nSizeWMF )
-        {
-            sal_uInt8* pBuf = new sal_uInt8[ nSizeWMF ];
-            rStrm.Seek( nOrigPos + nPosWMF );
-            rStrm.Read( pBuf, nSizeWMF );
-            aReplacement.Write( pBuf, nSizeWMF );
-            delete[] pBuf;
-        }
-        if ( nSizeTIFF )
-        {
-            sal_uInt8* pBuf = new sal_uInt8[ nSizeTIFF ];
-            rStrm.Seek( nOrigPos + nPosTIFF );
-            rStrm.Read( pBuf, nSizeTIFF );
-            aReplacement.Write( pBuf, nSizeTIFF );
-            delete[] pBuf;
-        }
-        rMtf.AddAction( (MetaAction*)( new MetaCommentAction( aComment, 0, (const BYTE*)aReplacement.GetData(), aReplacement.Tell() ) ) );
-    }
-    else
-        rMtf.AddAction( (MetaAction*)( new MetaCommentAction( aComment, 0, NULL, 0 ) ) );
-}
-
-//there is no preview -> make a red box
-void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead,
-    long nWidth, long nHeight, Graphic &rGraphic)
-{
-    GDIMetaFile aMtf;
-    VirtualDevice   aVDev;
-    Font            aFont;
-
-    aVDev.EnableOutput( FALSE );
-    aMtf.Record( &aVDev );
-    aVDev.SetLineColor( Color( COL_RED ) );
-    aVDev.SetFillColor();
-
-    aFont.SetColor( COL_LIGHTRED );
-//  aFont.SetSize( Size( 0, 32 ) );
-
-    aVDev.Push( PUSH_FONT );
-    aVDev.SetFont( aFont );
-
-    Rectangle aRect( Point( 1, 1 ), Size( nWidth - 2, nHeight - 2 ) );
-    aVDev.DrawRect( aRect );
-
-    String aString;
-    int nLen;
-    BYTE* pDest = ImplSearchEntry( pBuf, (BYTE*)"%%Title:", nBytesRead - 32, 8 );
-    if ( pDest )
-    {
-        pDest += 8;
-        if ( *pDest == ' ' )
-            pDest++;
-        nLen = ImplGetLen( pDest, 32 );
-        BYTE aOldValue(pDest[ nLen ]); pDest[ nLen ] = 0;
-        if ( strcmp( (const char*)pDest, "none" ) != 0 )
-        {
-            aString.AppendAscii( " Title:" );
-            aString.AppendAscii( (char*)pDest );
-            aString.AppendAscii( "\n" );
-        }
-        pDest[ nLen ] = aOldValue;
-    }
-    pDest = ImplSearchEntry( pBuf, (BYTE*)"%%Creator:", nBytesRead - 32, 10 );
-    if ( pDest )
-    {
-        pDest += 10;
-        if ( *pDest == ' ' )
-            pDest++;
-        nLen = ImplGetLen( pDest, 32 );
-        BYTE aOldValue(pDest[ nLen ]); pDest[ nLen ] = 0;
-        aString.AppendAscii( " Creator:" );
-        aString.AppendAscii( (char*)pDest );
-        aString.AppendAscii( "\n" );
-        pDest[ nLen ] = aOldValue;
-    }
-    pDest = ImplSearchEntry( pBuf, (BYTE*)"%%CreationDate:", nBytesRead - 32, 15 );
-    if ( pDest )
-    {
-        pDest += 15;
-        if ( *pDest == ' ' )
-            pDest++;
-        nLen = ImplGetLen( pDest, 32 );
-        BYTE aOldValue(pDest[ nLen ]); pDest[ nLen ] = 0;
-        if ( strcmp( (const char*)pDest, "none" ) != 0 )
-        {
-            aString.AppendAscii( " CreationDate:" );
-            aString.AppendAscii( (char*)pDest );
-            aString.AppendAscii( "\n" );
-        }
-        pDest[ nLen ] = aOldValue;
-    }
-    pDest = ImplSearchEntry( pBuf, (BYTE*)"%%LanguageLevel:", nBytesRead - 4, 16 );
-    if ( pDest )
-    {
-        pDest += 16;
-        int nCount = 4;
-        long nNumber = ImplGetNumber( &pDest, nCount );
-        if ( nCount && ( (UINT32)nNumber < 10 ) )
-        {
-            aString.AppendAscii( " LanguageLevel:" );
-            aString.Append( UniString::CreateFromInt32( nNumber ) );
-        }
-    }
-    aVDev.DrawText( aRect, aString, TEXT_DRAW_CLIP | TEXT_DRAW_MULTILINE );
-    aVDev.Pop();
-    aMtf.Stop();
-    aMtf.WindStart();
-    aMtf.SetPrefMapMode( MAP_POINT );
-    aMtf.SetPrefSize( Size( nWidth, nHeight ) );
-    rGraphic = aMtf;
-}
-
-
-//================== GraphicImport - die exportierte Funktion ================
-
-#ifdef WNT
-extern "C" BOOL _cdecl GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL)
-#else
-extern "C" BOOL GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL)
-#endif
-{
-    if ( rStream.GetError() )
-        return FALSE;
-
-    Graphic     aGraphic;
-    sal_Bool    bRetValue = sal_False;
-    sal_Bool    bHasPreview = sal_False;
-    sal_Bool    bGraphicLinkCreated = sal_False;
-    sal_uInt32  nSignature, nPSStreamPos, nPSSize;
-    sal_uInt32  nSizeWMF = 0;
-    sal_uInt32  nPosWMF = 0;
-    sal_uInt32  nSizeTIFF = 0;
-    sal_uInt32  nPosTIFF = 0;
-    sal_uInt32  nOrigPos = nPSStreamPos = rStream.Tell();
-    sal_uInt16  nOldFormat = rStream.GetNumberFormatInt();
-    rStream.SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    rStream >> nSignature;
-    if ( nSignature == 0xc6d3d0c5 )
-    {
-        rStream >> nPSStreamPos >> nPSSize >> nPosWMF >> nSizeWMF;
-
-        // first we try to get the metafile grafix
-
-        if ( nSizeWMF )
-        {
-            if ( nPosWMF != 0 )
-            {
-                rStream.Seek( nOrigPos + nPosWMF );
-                if ( GraphicConverter::Import( rStream, aGraphic, CVT_WMF ) == ERRCODE_NONE )
-                    bHasPreview = bRetValue = TRUE;
-            }
-        }
-        else
-        {
-            rStream >> nPosTIFF >> nSizeTIFF;
-
-            // else we have to get the tiff grafix
-
-            if ( nPosTIFF && nSizeTIFF )
-            {
-                rStream.Seek( nOrigPos + nPosTIFF );
-                if ( GraphicConverter::Import( rStream, aGraphic, CVT_TIF ) == ERRCODE_NONE )
-                {
-                    MakeAsMeta(aGraphic);
-                    rStream.Seek( nOrigPos + nPosTIFF );
-                    bHasPreview = bRetValue = TRUE;
-                }
-            }
-        }
-    }
-    else
-    {
-        nPSStreamPos = nOrigPos;            // no preview available _>so we must get the size manually
-        nPSSize = rStream.Seek( STREAM_SEEK_TO_END ) - nOrigPos;
-    }
-    sal_uInt8* pHeader = new sal_uInt8[ 22 ];
-    rStream.Seek( nPSStreamPos );
-    rStream.Read( pHeader, 22 );    // check PostScript header
-    if ( ImplSearchEntry( pHeader, (BYTE*)"%!PS-Adobe", 10, 10 ) &&
-        ImplSearchEntry( &pHeader[ 15 ], (BYTE*)"EPS", 3, 3 ) )
-    {
-        rStream.Seek( nPSStreamPos );
-        sal_uInt8* pBuf = new sal_uInt8[ nPSSize ];
-        if ( pBuf )
-        {
-            sal_uInt32  nBufStartPos = rStream.Tell();
-            sal_uInt32  nBytesRead = rStream.Read( pBuf, nPSSize );
-            if ( nBytesRead == nPSSize )
-            {
-                int nSecurityCount = 32;
-                if ( !bHasPreview )     // if there is no tiff/wmf preview, we will parse for an preview in the eps prolog
-                {
-                    BYTE* pDest = ImplSearchEntry( pBuf, (BYTE*)"%%BeginPreview:", nBytesRead - 32, 15 );
-                    if ( pDest  )
-                    {
-                        pDest += 15;
-                        long nWidth = ImplGetNumber( &pDest, nSecurityCount );
-                        long nHeight = ImplGetNumber( &pDest, nSecurityCount );
-                        long nBitDepth = ImplGetNumber( &pDest, nSecurityCount );
-                        long nScanLines = ImplGetNumber( &pDest, nSecurityCount );
-                        pDest = ImplSearchEntry( pDest, (BYTE*)"%", 16, 1 );        // go to the first Scanline
-                        if ( nSecurityCount && pDest && nWidth && nHeight && ( ( nBitDepth == 1 ) || ( nBitDepth == 8 ) ) && nScanLines )
-                        {
-                            rStream.Seek( nBufStartPos + ( pDest - pBuf ) );
-
-                            Bitmap aBitmap( Size( nWidth, nHeight ), 1 );
-                            BitmapWriteAccess* pAcc = aBitmap.AcquireWriteAccess();
-                            if ( pAcc )
-                            {
-                                int  nBitsLeft;
-                                BOOL bIsValid = TRUE;
-                                BYTE nDat = 0;
-                                char nByte;
-                                for ( long y = 0; bIsValid && ( y < nHeight ); y++ )
-                                {
-                                    nBitsLeft = 0;
-                                    for ( long x = 0; x < nWidth; x++ )
-                                    {
-                                        if ( --nBitsLeft < 0 )
-                                        {
-                                            while ( bIsValid && ( nBitsLeft != 7 ) )
-                                            {
-                                                rStream >> nByte;
-                                                switch ( nByte )
-                                                {
-                                                    case 0x0a :
-                                                        if ( --nScanLines < 0 )
-                                                            bIsValid = FALSE;
-                                                    case 0x09 :
-                                                    case 0x0d :
-                                                    case 0x20 :
-                                                    case 0x25 :
-                                                    break;
-                                                    default:
-                                                    {
-                                                        if ( nByte >= '0' )
-                                                        {
-                                                            if ( nByte > '9' )
-                                                            {
-                                                                nByte &=~0x20;  // case none sensitive for hexadezimal values
-                                                                nByte -= ( 'A' - 10 );
-                                                                if ( nByte > 15 )
-                                                                    bIsValid = FALSE;
-                                                            }
-                                                            else
-                                                                nByte -= '0';
-                                                            nBitsLeft += 4;
-                                                            nDat <<= 4;
-                                                            nDat |= ( nByte ^ 0xf ); // in epsi a zero bit represents white color
-                                                        }
-                                                        else
-                                                            bIsValid = FALSE;
-                                                    }
-                                                    break;
-                                                }
-                                            }
-                                        }
-                                        if ( nBitDepth == 1 )
-                                            pAcc->SetPixel( y, x, sal::static_int_cast< BYTE >(( nDat >> nBitsLeft ) & 1) );
-                                        else
-                                        {
-                                            pAcc->SetPixel( y, x, ( nDat ) ? 1 : 0 );   // nBitDepth == 8
-                                            nBitsLeft = 0;
-                                        }
-                                    }
-                                }
-                                if ( bIsValid )
-                                {
-                                    VirtualDevice   aVDev;
-                                    GDIMetaFile     aMtf;
-                                    Size            aSize;
-                                    aVDev.EnableOutput( FALSE );
-                                    aMtf.Record( &aVDev );
-                                    aSize = aBitmap.GetPrefSize();
-                                    if( !aSize.Width() || !aSize.Height() )
-                                        aSize = Application::GetDefaultDevice()->PixelToLogic( aBitmap.GetSizePixel(), MAP_100TH_MM );
-                                    else
-                                        aSize = Application::GetDefaultDevice()->LogicToLogic( aSize, aBitmap.GetPrefMapMode(), MAP_100TH_MM );
-                                    aVDev.DrawBitmap( Point(), aSize, aBitmap );
-                                    aMtf.Stop();
-                                    aMtf.WindStart();
-                                    aMtf.SetPrefMapMode( MAP_100TH_MM );
-                                    aMtf.SetPrefSize( aSize );
-                                    aGraphic = aMtf;
-                                    bHasPreview = bRetValue = TRUE;
-                                }
-                                aBitmap.ReleaseAccess( pAcc );
-                            }
-                        }
-                    }
-                }
-
-                BYTE* pDest = ImplSearchEntry( pBuf, (BYTE*)"%%BoundingBox:", nBytesRead, 14 );
-                if ( pDest )
-                {
-                    nSecurityCount = 100;
-                    long nNumb[4];
-                    nNumb[0] = nNumb[1] = nNumb[2] = nNumb[3] = 0;
-                    pDest += 14;
-                    for ( int i = 0; ( i < 4 ) && nSecurityCount; i++ )
-                    {
-                        nNumb[ i ] = ImplGetNumber( &pDest, nSecurityCount );
-                    }
-                    if ( nSecurityCount)
-                    {
-                        bGraphicLinkCreated = sal_True;
-                        GfxLink     aGfxLink( pBuf, nPSSize, GFX_LINK_TYPE_EPS_BUFFER, TRUE ) ;
-                        GDIMetaFile aMtf;
-
-                        long nWidth =  nNumb[2] - nNumb[0] + 1;
-                        long nHeight = nNumb[3] - nNumb[1] + 1;
-
-                        // if there is no preview -> try with gs to make one
-                        if( !bHasPreview )
-                        {
-                            bHasPreview = RenderAsEMF(pBuf, nBytesRead, aGraphic);
-                            if (!bHasPreview)
-                                bHasPreview = RenderAsPNG(pBuf, nBytesRead, aGraphic);
-                        }
-
-                        // if there is no preview -> make a red box
-                        if( !bHasPreview )
-                        {
-                            MakePreview(pBuf, nBytesRead, nWidth, nHeight,
-                                aGraphic);
-                        }
-
-                        aMtf.AddAction( (MetaAction*)( new MetaEPSAction( Point(), Size( nWidth, nHeight ),
-                                                                          aGfxLink, aGraphic.GetGDIMetaFile() ) ) );
-                        CreateMtfReplacementAction( aMtf, rStream, nOrigPos, nPSSize, nPosWMF, nSizeWMF, nPosTIFF, nSizeTIFF );
-                        aMtf.WindStart();
-                        aMtf.SetPrefMapMode( MAP_POINT );
-                        aMtf.SetPrefSize( Size( nWidth, nHeight ) );
-                        rGraphic = aMtf;
-                        bRetValue = sal_True;
-                    }
-                }
-            }
-        }
-        if ( !bGraphicLinkCreated )
-            delete[] pBuf;
-    }
-    delete[] pHeader;
-    rStream.SetNumberFormatInt(nOldFormat);
-    rStream.Seek( nOrigPos );
-    return ( bRetValue );
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/goodies/source/filter.vcl/ieps/makefile.mk b/goodies/source/filter.vcl/ieps/makefile.mk
deleted file mode 100644
index 673cce72744c..000000000000
--- a/goodies/source/filter.vcl/ieps/makefile.mk
+++ /dev/null
@@ -1,70 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=ieps
-DEPTARGET=vieps
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ieps.obj
-
-# ==========================================================================
-
-SHL1TARGET=     ips$(DLLPOSTFIX)
-SHL1IMPLIB=     ieps
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=       $(SLB)$/ieps.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/ieps.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/goodies/source/filter.vcl/ios2met/exports.map b/goodies/source/filter.vcl/ios2met/exports.map
deleted file mode 100644
index 440afa9245d8..000000000000
--- a/goodies/source/filter.vcl/ios2met/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-METIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/ios2met/ios2met.cxx b/goodies/source/filter.vcl/ios2met/ios2met.cxx
deleted file mode 100644
index 8c3c19e22379..000000000000
--- a/goodies/source/filter.vcl/ios2met/ios2met.cxx
+++ /dev/null
@@ -1,2787 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ios2met.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <tools/poly.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/lineinfo.hxx>
-#include <svtools/fltcall.hxx>
-
-#include <math.h>
-
-// MT: NOOLDSV, someone should change the code...
-enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
-
-
-//============================== defines ===================================
-
-#define OOODEBUG(str,Num) //InfoBox(NULL,String(str)+String(" ")+String(Num)).Execute();
-
-// -----------------------------Feld-Typen-------------------------------
-
-#define BegDocumnMagic 0xA8A8 /* Begin Document */
-#define EndDocumnMagic 0xA8A9 /* End Document   */
-
-#define BegResGrpMagic 0xC6A8 /* Begin Resource Group */
-#define EndResGrpMagic 0xC6A9 /* End Resource Group   */
-
-#define BegColAtrMagic 0x77A8 /* Begin Color Attribute Table */
-#define EndColAtrMagic 0x77A9 /* End Color Attribute Table   */
-#define BlkColAtrMagic 0x77B0 /* Color Attribute Table       */
-#define MapColAtrMagic 0x77AB /* Map Color Attribute Table   */
-
-#define BegImgObjMagic 0xFBA8 /* Begin Image Object    */
-#define EndImgObjMagic 0xFBA9 /* End Image Object      */
-#define DscImgObjMagic 0xFBA6 /* Image Data Descriptor */
-#define DatImgObjMagic 0xFBEE /* Image Picture Data    */
-
-#define BegObEnv1Magic 0xC7A8 /* Begin Object Environment Group */
-#define EndObEnv1Magic 0xC7A9 /* End Object Environment Group   */
-
-#define BegGrfObjMagic 0xBBA8 /* Begin Graphics Object   */
-#define EndGrfObjMagic 0xBBA9 /* End Graphics Object     */
-#define DscGrfObjMagic 0xBBA6 /* Graphics Data Descritor */
-#define DatGrfObjMagic 0xBBEE /* Graphics Data           */
-
-#define MapCodFntMagic 0x8AAB /* Map Coded Font    */
-#define MapDatResMagic 0xC3AB /* Map Data Resource */
-
-// -----------------------------Order-Typen-------------------------------
-
-#define GOrdGivArc 0xC6   /* 1 Arc at given position   */
-#define GOrdCurArc 0x86   /* 1 Arc at current position */
-#define GOrdGivBzr 0xE5   /* 1 Beziercurve at given position   */
-#define GOrdCurBzr 0xA5   /* 1 Beziercurve at current position */
-#define GOrdGivBox 0xC0   /* 1 Box at given position   */
-#define GOrdCurBox 0x80   /* 1 Box at current position */
-#define GOrdGivFil 0xC5   /* 1 Fillet at given position   */
-#define GOrdCurFil 0x85   /* 1 Fillet at current position */
-#define GOrdGivCrc 0xC7   /* 1 Full arc (circle) at given position   */
-#define GOrdCurCrc 0x87   /* 1 Full arc (circle) at current position */
-#define GOrdGivLin 0xC1   /* 1 Line at given position   */
-#define GOrdCurLin 0x81   /* 1 Line at current position */
-#define GOrdGivMrk 0xC2   /* 1 Marker at given position   */
-#define GOrdCurMrk 0x82   /* 1 Marker at current position */
-#define GOrdGivArP 0xE3   /* 1 Partial arc at given position   */
-#define GOrdCurArP 0xA3   /* 1 Partial arc at current position */
-#define GOrdGivRLn 0xE1   /* 1 Relative line at given position   */
-#define GOrdCurRLn 0xA1   /* 1 Relative line at current position */
-#define GOrdGivSFl 0xE4   /* 1 Sharp fillet at given position   */
-#define GOrdCurSFl 0xA4   /* 1 Sharp fillet at current position */
-
-#define GOrdGivStM 0xF1   /* 1 Character string move at given position   */
-#define GOrdCurStM 0xB1   /* 1 Character string move at current position */
-#define GOrdGivStr 0xC3   /* 1 Character string at given position   */
-#define GOrdCurStr 0x83   /* 1 Character string at current position */
-#define GOrdGivStx 0xFEF0 /* 2 Character string extended at given position   */
-#define GOrdCurStx 0xFEB0 /* 2 Character string extended at current position */
-
-#define GOrdGivImg 0xD1   /* 1 Begin Image at given position   */
-#define GOrdCurImg 0x91   /* 1 Begin Image at current position */
-#define GOrdImgDat 0x92   /* 1 Image data                      */
-#define GOrdEndImg 0x93   /* 1 End Image                       */
-#define GOrdBegAra 0x68   /* 0 1 Begin area */
-#define GOrdEndAra 0x60   /* 1 End area     */
-#define GOrdBegElm 0xD2   /* 1 Begin element */
-#define GOrdEndElm 0x49   /* 0 1 End element */
-
-#define GOrdBegPth 0xD0   /* 1 Begin path    */
-#define GOrdEndPth 0x7F   /* 0 1 End path    */
-#define GOrdFilPth 0xD7   /* 1 Fill path     */
-#define GOrdModPth 0xD8   /* 1 Modify path   */
-#define GOrdOutPth 0xD4   /* 1 Outline path  */
-#define GOrdSClPth 0xB4   /* 1 Set clip path */
-
-#define GOrdNopNop 0x00   /* 0 0 No operation */
-#define GOrdRemark 0x01   /* 1 Comment */
-#define GOrdSegLab 0xD3   /* 1 Label */
-#define GOrdBitBlt 0xD6   /* 1 Bitblt */
-#define GOrdCalSeg 0x07   /* 1 Call Segment */
-#define GOrdSSgBnd 0x32   /* 1 Set segment boundary */
-#define GOrdSegChr 0x04   /* 1 Segment characteristics */
-#define GOrdCloFig 0x7D   /* 0 1 Close Figure */
-#define GOrdEndSym 0xFF   /* 0 0 End of symbol definition */
-#define GOrdEndPlg 0x3E   /* 0 1 End prolog */
-#define GOrdEscape 0xD5   /* 1 Escape */
-#define GOrdExtEsc 0xFED5 /* 2 Extended Escape */
-#define GOrdPolygn 0xF3   /* 2 Polygons */
-
-#define GOrdStkPop 0x3F   /* 0 1 Pop */
-
-#define GOrdSIvAtr 0x14   /* 1 Set individual attribute          */
-#define GOrdPIvAtr 0x54   /* 1 Push and set individual attribute */
-#define GOrdSColor 0x0A   /* 0 1 Set color          */
-#define GOrdPColor 0x4A   /* 0 1 Push and set color */
-#define GOrdSIxCol 0xA6   /* 1 Set indexed color          */
-#define GOrdPIxCol 0xE6   /* 1 Push and set indexed color */
-#define GOrdSXtCol 0x26   /* 1 Set extended color          */
-#define GOrdPXtCol 0x66   /* 1 Push and set extended color */
-#define GOrdSBgCol 0x25   /* 1 Set background color          */
-#define GOrdPBgCol 0x65   /* 1 Push and set background color */
-#define GOrdSBxCol 0xA7   /* 1 Set background indexed color          */
-#define GOrdPBxCol 0xE7   /* 1 Push and set background indexed color */
-#define GOrdSMixMd 0x0C   /* 0 1 Set mix          */
-#define GOrdPMixMd 0x4C   /* 0 1 Push and set mix */
-#define GOrdSBgMix 0x0D   /* 0 1 Set background mix          */
-#define GOrdPBgMix 0x4D   /* 0 1 Push and set background mix */
-
-#define GOrdSPtSet 0x08   /* 0 1 Set pattern set          */
-#define GOrdPPtSet 0x48   /* 0 1 Push and set pattern set */
-#define GOrdSPtSym 0x28   /* 0 1 Set pattern symbol          */
-#define GOrdPPtSym 0x09   /* 0 1 Push and set pattern symbol */
-#define GOrdSPtRef 0xA0   /* 1 Set model pattern reference          */
-#define GOrdPPtRef 0xE0   /* 1 Push and set pattern reference point */
-
-#define GOrdSLnEnd 0x1A   /* 0 1 Set line end          */
-#define GOrdPLnEnd 0x5A   /* 0 1 Push and set line end */
-#define GOrdSLnJoi 0x1B   /* 0 1 Set line join          */
-#define GOrdPLnJoi 0x5B   /* 0 1 Push and set line join */
-#define GOrdSLnTyp 0x18   /* 0 1 Set line type          */
-#define GOrdPLnTyp 0x58   /* 0 1 Push and set line type */
-#define GOrdSLnWdt 0x19   /* 0 1 Set line width          */
-#define GOrdPLnWdt 0x59   /* 0 1 Push and set line width */
-#define GOrdSFrLWd 0x11   /* 1 Set fractional line width          */
-#define GOrdPFrLWd 0x51   /* 1 Push and set fractional line width */
-#define GOrdSStLWd 0x15   /* 1 Set stroke line width          */
-#define GOrdPStLWd 0x55   /* 1 Push and set stroke line width */
-
-#define GOrdSChDir 0x3A   /* 0 1 Set character direction          */
-#define GOrdPChDir 0x7A   /* 0 1 Push and set character direction */
-#define GOrdSChPrc 0x39   /* 0 1 Set character precision          */
-#define GOrdPChPrc 0x79   /* 0 1 Push and set character precision */
-#define GOrdSChSet 0x38   /* 0 1 Set character set          */
-#define GOrdPChSet 0x78   /* 0 1 Push and set character set */
-#define GOrdSChAng 0x34   /* 1 Set character angle          */
-#define GOrdPChAng 0x74   /* 1 Push and set character angle */
-#define GOrdSChBrx 0x05   /* 1 Set character break extra          */
-#define GOrdPChBrx 0x45   /* 1 Push and set character break extra */
-#define GOrdSChCel 0x33   /* 1 Set character cell          */
-#define GOrdPChCel 0x03   /* 1 Push and set character cell */
-#define GOrdSChXtr 0x17   /* 1 Set character extra          */
-#define GOrdPChXtr 0x57   /* 1 Push and set character extra */
-#define GOrdSChShr 0x35   /* 1 Set character shear          */
-#define GOrdPChShr 0x75   /* 1 Push and set character shear */
-#define GOrdSTxAlg 0x36   /* 0 2 Set text allingment          */
-#define GOrdPTxAlg 0x76   /* 0 2 Push and set text allingment */
-
-#define GOrdSMkPrc 0x3B   /* 0 1 Set marker precision          */
-#define GOrdPMkPrc 0x7B   /* 0 1 Push and set marker precision */
-#define GOrdSMkSet 0x3C   /* 0 1 Set marker set          */
-#define GOrdPMkSet 0x7C   /* 0 1 Push and set marker set */
-#define GOrdSMkSym 0x29   /* 0 1 Set marker symbol          */
-#define GOrdPMkSym 0x69   /* 0 1 Push and set marker symbol */
-#define GOrdSMkCel 0x37   /* 1 Set marker cell          */
-#define GOrdPMkCel 0x77   /* 1 Push and set marker cell */
-
-#define GOrdSArcPa 0x22   /* 1 Set arc parameters          */
-#define GOrdPArcPa 0x62   /* 1 Push and set arc parameters */
-
-#define GOrdSCrPos 0x21   /* 1 Set current position          */
-#define GOrdPCrPos 0x61   /* 1 Push and set current position */
-
-#define GOrdSMdTrn 0x24   /* 1 Set model transform          */
-#define GOrdPMdTrn 0x64   /* 1 Push and set model transform */
-#define GOrdSPkIdn 0x43   /* 1 Set pick identifier          */
-#define GOrdPPkIdn 0x23   /* 1 Push and set pick identifier */
-#define GOrdSVwTrn 0x31   /* 1 Set viewing transform */
-#define GOrdSVwWin 0x27   /* 1 Set viewing window          */
-#define GOrdPVwWin 0x67   /* 1 Push and set viewing window */
-
-//============================ OS2METReader ==================================
-
-struct OSPalette {
-    OSPalette * pSucc;
-    sal_uInt32 * p0RGB; // Darf auch NULL sein!
-    USHORT nSize;
-};
-
-struct OSArea {
-    OSArea * pSucc;
-    BYTE nFlags;
-    PolyPolygon aPPoly;
-    BOOL bClosed;
-    Color      aCol;
-    Color      aBgCol;
-    RasterOp   eMix;
-    RasterOp   eBgMix;
-    BOOL       bFill;
-    OSArea(){} ~OSArea(){}
-};
-
-struct OSPath
-{
-    OSPath*     pSucc;
-    sal_uInt32  nID;
-    PolyPolygon aPPoly;
-    BOOL        bClosed;
-    BOOL        bStroke;
-
-                OSPath(){}
-                ~OSPath(){}
-};
-
-struct OSFont {
-    OSFont * pSucc;
-    ULONG nID;
-    Font aFont;
-    OSFont(){} ~OSFont(){}
-};
-
-struct OSBitmap {
-    OSBitmap * pSucc;
-    ULONG nID;
-    Bitmap aBitmap;
-
-    // Waehrend des Lesens der Bitmap benoetigt:
-    SvStream * pBMP; // Zeiger auf temporaere Windows-BMP-Datei oder NULL
-    sal_uInt32 nWidth, nHeight;
-    USHORT nBitsPerPixel;
-    ULONG nMapPos;
-    OSBitmap(){} ~OSBitmap(){}
-};
-
-struct OSAttr {
-    OSAttr * pSucc;
-    USHORT nPushOrder;
-    BYTE nIvAttrA, nIvAttrP; // Spezialvariablen fuer den Order "GOrdPIvAtr"
-
-    Color    aLinCol;
-    Color    aLinBgCol;
-    RasterOp eLinMix;
-    RasterOp eLinBgMix;
-    Color    aChrCol;
-    Color    aChrBgCol;
-    RasterOp eChrMix;
-    RasterOp eChrBgMix;
-    Color    aMrkCol;
-    Color    aMrkBgCol;
-    RasterOp eMrkMix;
-    RasterOp eMrkBgMix;
-    Color    aPatCol;
-    Color    aPatBgCol;
-    RasterOp ePatMix;
-    RasterOp ePatBgMix;
-    Color    aImgCol;
-    Color    aImgBgCol;
-    RasterOp eImgMix;
-    RasterOp eImgBgMix;
-    long     nArcP, nArcQ, nArcR, nArcS;
-    short    nChrAng;
-//  long     nChrBreakExtra;
-    Size     aChrCellSize;
-//  BYTE     nChrDir;
-//  long     nChrExtra;
-//  BYTE     nChrPrec;
-    ULONG    nChrSet;
-//  Size     aChrShear;
-    Point    aCurPos;
-//  long     nFracLinWidth;
-//  BYTE     nLinEnd;
-//  BYTE     nLinJoin;
-    PenStyle eLinStyle;
-    USHORT   nLinWidth;
-    Size     aMrkCellSize;
-    BYTE     nMrkPrec;
-    BYTE     nMrkSet;
-    BYTE     nMrkSymbol;
-//  //...    aModTransform;
-//  Point    aPatRef;
-//  BYTE     nPatSet;
-    BOOL     bFill;
-//  ULONG    nPickId;
-//  //...    aSegBound;
-    USHORT   nStrLinWidth;
-//  BYTE     nTxtAlignHor,nTxtAlignVer;
-//  //...    aViewTransform;
-//  //...    aViewWindow;
-    OSAttr(){} ~OSAttr(){}
-};
-
-class OS2METReader {
-
-private:
-
-    long ErrorCode;
-
-    SvStream    * pOS2MET;             // Die einzulesende OS2MET-Datei
-    VirtualDevice * pVirDev;         // Hier werden die Drawing-Methoden aufgerufen.
-                                     // Dabei findet ein Recording in das GDIMetaFile
-                                     // statt.
-    ULONG         nOrigPos;          // Anfaengliche Position in pOS2MET
-    UINT16        nOrigNumberFormat; // Anfaengliches Nummern-Format von pOS2MET
-    Rectangle aBoundingRect; // Boundingrectangle wie in Datei angegeben
-    Rectangle aCalcBndRect;  // selbst ermitteltes Boundingrectangle
-    MapMode aGlobMapMode;    // Aufloesung des Bildes
-    BOOL bCoord32;
-
-    OSPalette  * pPaletteStack;
-
-    LineInfo aLineInfo;
-
-    OSArea   * pAreaStack; // Areas, die in Arbeit sind
-
-    OSPath   * pPathStack; // Paths, die in Arbeit sind
-    OSPath   * pPathList;  // Vollendete Paths
-
-    OSFont   * pFontList;
-
-    OSBitmap * pBitmapList;
-
-    OSAttr   aDefAttr;
-    OSAttr   aAttr;
-    OSAttr   * pAttrStack;
-
-    SvStream * pOrdFile;
-
-    BOOL Callback(USHORT nPercent);
-
-    void AddPointsToPath(const Polygon & rPoly);
-    void AddPointsToArea(const Polygon & rPoly);
-    void CloseFigure();
-    void PushAttr(USHORT nPushOrder);
-    void PopAttr();
-
-    void ChangeBrush( const Color& rPatColor, const Color& rBGColor, BOOL bFill );
-    void SetPen( const Color& rColor, USHORT nStrLinWidth = 0, PenStyle ePenStyle = PEN_SOLID );
-    void SetRasterOp(RasterOp eROP);
-
-    void SetPalette0RGB(USHORT nIndex, ULONG nCol);
-    sal_uInt32 GetPalette0RGB(sal_uInt32 nIndex);
-        // Holt Farbe aus der Palette, oder, wenn nicht vorhanden,
-        // interpretiert nIndex als direkten RGB-Wert.
-    Color GetPaletteColor(sal_uInt32 nIndex);
-
-
-    BOOL        IsLineInfo();
-    void        DrawPolyLine( const Polygon& rPolygon );
-    void        DrawPolygon( const Polygon& rPolygon );
-    void        DrawPolyPolygon( const PolyPolygon& rPolygon );
-    USHORT      ReadBigEndianWord();
-    ULONG       ReadBigEndian3BytesLong();
-    ULONG       ReadLittleEndian3BytesLong();
-    long        ReadCoord(BOOL b32);
-    Point       ReadPoint( const BOOL bAdjustBoundRect = TRUE );
-    RasterOp    OS2MixToRasterOp(BYTE nMix);
-    void        ReadLine(BOOL bGivenPos, USHORT nOrderLen);
-    void        ReadRelLine(BOOL bGivenPos, USHORT nOrderLen);
-    void        ReadBox(BOOL bGivenPos);
-    void        ReadBitBlt();
-    void        ReadChrStr(BOOL bGivenPos, BOOL bMove, BOOL bExtra, USHORT nOrderLen);
-    void        ReadArc(BOOL bGivenPos);
-    void        ReadFullArc(BOOL bGivenPos, USHORT nOrderSize);
-    void        ReadPartialArc(BOOL bGivenPos, USHORT nOrderSize);
-    void        ReadPolygons();
-    void        ReadBezier(BOOL bGivenPos, USHORT nOrderLen);
-    void        ReadFillet(BOOL bGivenPos, USHORT nOrderLen);
-    void        ReadFilletSharp(BOOL bGivenPos, USHORT nOrderLen);
-    void        ReadMarker(BOOL bGivenPos, USHORT nOrderLen);
-    void        ReadOrder(USHORT nOrderID, USHORT nOrderLen);
-    void        ReadDsc(USHORT nDscID, USHORT nDscLen);
-    void        ReadImageData(USHORT nDataID, USHORT nDataLen);
-    void        ReadFont(USHORT nFieldSize);
-    void        ReadField(USHORT nFieldType, USHORT nFieldSize);
-
-public:
-
-    OS2METReader();
-    ~OS2METReader();
-
-    void ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaFile );
-        // Liesst aus dem Stream eine OS2MET-Datei und fuellt das GDIMetaFile
-
-};
-
-//=================== Methoden von OS2METReader ==============================
-
-BOOL OS2METReader::Callback(USHORT /*nPercent*/)
-{
-/*
-    if (pCallback!=NULL) {
-        if (((*pCallback)(pCallerData,nPercent))==TRUE) {
-            pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-            return TRUE;
-        }
-    }
-*/
-    return FALSE;
-}
-
-OS2METReader::OS2METReader()
-{
-}
-
-OS2METReader::~OS2METReader()
-{
-}
-
-BOOL OS2METReader::IsLineInfo()
-{
-    return ( ! ( aLineInfo.IsDefault() || ( aLineInfo.GetStyle() == LINE_NONE ) || ( pVirDev->GetLineColor() == COL_TRANSPARENT ) ) );
-}
-
-void OS2METReader::DrawPolyLine( const Polygon& rPolygon )
-{
-    if ( aLineInfo.GetStyle() == LINE_DASH || ( aLineInfo.GetWidth() > 1 ) )
-        pVirDev->DrawPolyLine( rPolygon, aLineInfo );
-    else
-        pVirDev->DrawPolyLine( rPolygon );
-}
-
-void OS2METReader::DrawPolygon( const Polygon& rPolygon )
-{
-    if ( IsLineInfo() )
-    {
-        pVirDev->Push( PUSH_LINECOLOR );
-        pVirDev->SetLineColor( COL_TRANSPARENT );
-        pVirDev->DrawPolygon( rPolygon );
-        pVirDev->Pop();
-        pVirDev->DrawPolyLine( rPolygon, aLineInfo );
-    }
-    else
-        pVirDev->DrawPolygon( rPolygon );
-}
-
-void OS2METReader::DrawPolyPolygon( const PolyPolygon& rPolyPolygon )
-{
-    if ( IsLineInfo() )
-    {
-        pVirDev->Push( PUSH_LINECOLOR );
-        pVirDev->SetLineColor( COL_TRANSPARENT );
-        pVirDev->DrawPolyPolygon( rPolyPolygon );
-        pVirDev->Pop();
-        for ( USHORT i = 0; i < rPolyPolygon.Count(); i++ )
-            pVirDev->DrawPolyLine( rPolyPolygon.GetObject( i ), aLineInfo );
-    }
-    else
-        pVirDev->DrawPolyPolygon( rPolyPolygon );
-}
-
-void OS2METReader::AddPointsToArea(const Polygon & rPoly)
-{
-    USHORT nOldSize, nNewSize,i;
-
-    if (pAreaStack==NULL || rPoly.GetSize()==0) return;
-    PolyPolygon * pPP=&(pAreaStack->aPPoly);
-    if (pPP->Count()==0 || pAreaStack->bClosed==TRUE) pPP->Insert(rPoly);
-    else {
-        Polygon aLastPoly(pPP->GetObject(pPP->Count()-1));
-        nOldSize=aLastPoly.GetSize();
-        if (aLastPoly.GetPoint(nOldSize-1)==rPoly.GetPoint(0)) nOldSize--;
-        nNewSize=nOldSize+rPoly.GetSize();
-        aLastPoly.SetSize(nNewSize);
-        for (i=nOldSize; i<nNewSize; i++) {
-            aLastPoly.SetPoint(rPoly.GetPoint(i-nOldSize),i);
-        }
-        pPP->Replace(aLastPoly,pPP->Count()-1);
-    }
-    pAreaStack->bClosed=FALSE;
-}
-
-void OS2METReader::AddPointsToPath(const Polygon & rPoly)
-{
-    USHORT nOldSize, nNewSize,i;
-
-    if (pPathStack==NULL || rPoly.GetSize()==0) return;
-    PolyPolygon * pPP=&(pPathStack->aPPoly);
-    if (pPP->Count()==0 /*|| pPathStack->bClosed==TRUE*/) pPP->Insert(rPoly);
-    else {
-        Polygon aLastPoly(pPP->GetObject(pPP->Count()-1));
-        nOldSize=aLastPoly.GetSize();
-        if (aLastPoly.GetPoint(nOldSize-1)!=rPoly.GetPoint(0)) pPP->Insert(rPoly);
-        else {
-            nOldSize--;
-            nNewSize=nOldSize+rPoly.GetSize();
-            aLastPoly.SetSize(nNewSize);
-            for (i=nOldSize; i<nNewSize; i++) {
-                aLastPoly.SetPoint(rPoly.GetPoint(i-nOldSize),i);
-            }
-            pPP->Replace(aLastPoly,pPP->Count()-1);
-        }
-    }
-    pPathStack->bClosed=FALSE;
-}
-
-void OS2METReader::CloseFigure()
-{
-    if (pAreaStack!=NULL) pAreaStack->bClosed=TRUE;
-    else if (pPathStack!=NULL) pPathStack->bClosed=TRUE;
-}
-
-void OS2METReader::PushAttr(USHORT nPushOrder)
-{
-    OSAttr * p;
-    p=new OSAttr;
-    *p=aAttr;
-    p->pSucc=pAttrStack; pAttrStack=p;
-    p->nPushOrder=nPushOrder;
-}
-
-void OS2METReader::PopAttr()
-{
-    OSAttr * p=pAttrStack;
-
-    if (p==NULL) return;
-    switch (p->nPushOrder) {
-
-        case GOrdPIvAtr:
-            switch (p->nIvAttrA) {
-                case 1: switch (p->nIvAttrP) {
-                    case 1: aAttr.aLinCol=p->aLinCol; break;
-                    case 2: aAttr.aChrCol=p->aChrCol; break;
-                    case 3: aAttr.aMrkCol=p->aMrkCol; break;
-                    case 4: aAttr.aPatCol=p->aPatCol; break;
-                    case 5: aAttr.aImgCol=p->aImgCol; break;
-                } break;
-                case 2: switch (p->nIvAttrP) {
-                    case 1: aAttr.aLinBgCol=p->aLinBgCol; break;
-                    case 2: aAttr.aChrBgCol=p->aChrBgCol; break;
-                    case 3: aAttr.aMrkBgCol=p->aMrkBgCol; break;
-                    case 4: aAttr.aPatBgCol=p->aPatBgCol; break;
-                    case 5: aAttr.aImgBgCol=p->aImgBgCol; break;
-                } break;
-                case 3: switch (p->nIvAttrP) {
-                    case 1: aAttr.eLinMix=p->eLinMix; break;
-                    case 2: aAttr.eChrMix=p->eChrMix; break;
-                    case 3: aAttr.eMrkMix=p->eMrkMix; break;
-                    case 4: aAttr.ePatMix=p->ePatMix; break;
-                    case 5: aAttr.eImgMix=p->eImgMix; break;
-                } break;
-                case 4: switch (p->nIvAttrP) {
-                    case 1: aAttr.eLinBgMix=p->eLinBgMix; break;
-                    case 2: aAttr.eChrBgMix=p->eChrBgMix; break;
-                    case 3: aAttr.eMrkBgMix=p->eMrkBgMix; break;
-                    case 4: aAttr.ePatBgMix=p->ePatBgMix; break;
-                    case 5: aAttr.eImgBgMix=p->eImgBgMix; break;
-                } break;
-            }
-            break;
-
-        case GOrdPLnTyp: aAttr.eLinStyle=p->eLinStyle; break;
-
-        case GOrdPLnWdt: aAttr.nLinWidth=p->nLinWidth; break;
-
-        case GOrdPStLWd: aAttr.nStrLinWidth=p->nStrLinWidth; break;
-
-        case GOrdPChSet: aAttr.nChrSet=p->nChrSet; break;
-
-        case GOrdPChAng: aAttr.nChrAng=p->nChrAng; break;
-
-        case GOrdPMixMd:
-            aAttr.eLinMix=p->eLinMix;
-            aAttr.eChrMix=p->eChrMix;
-            aAttr.eMrkMix=p->eMrkMix;
-            aAttr.ePatMix=p->ePatMix;
-            aAttr.eImgMix=p->eImgMix;
-            break;
-
-        case GOrdPBgMix:
-            aAttr.eLinBgMix=p->eLinBgMix;
-            aAttr.eChrBgMix=p->eChrBgMix;
-            aAttr.eMrkBgMix=p->eMrkBgMix;
-            aAttr.ePatBgMix=p->ePatBgMix;
-            aAttr.eImgBgMix=p->eImgBgMix;
-            break;
-
-        case GOrdPPtSym: aAttr.bFill = p->bFill; break;
-
-        case GOrdPColor:
-        case GOrdPIxCol:
-        case GOrdPXtCol:
-            aAttr.aLinCol=p->aLinCol;
-            aAttr.aChrCol=p->aChrCol;
-            aAttr.aMrkCol=p->aMrkCol;
-            aAttr.aPatCol=p->aPatCol;
-            aAttr.aImgCol=p->aImgCol;
-            break;
-
-        case GOrdPBgCol:
-        case GOrdPBxCol:
-            aAttr.aLinBgCol=p->aLinBgCol;
-            aAttr.aChrBgCol=p->aChrBgCol;
-            aAttr.aMrkBgCol=p->aMrkBgCol;
-            aAttr.aPatBgCol=p->aPatBgCol;
-            aAttr.aImgBgCol=p->aImgBgCol;
-            break;
-
-        case GOrdPMkPrc: aAttr.nMrkPrec=aDefAttr.nMrkPrec; break;
-
-        case GOrdPMkSet: aAttr.nMrkSet=aDefAttr.nMrkSet; break;
-
-        case GOrdPMkSym: aAttr.nMrkSymbol=aDefAttr.nMrkSymbol; break;
-
-        case GOrdPMkCel: aAttr.aMrkCellSize=aDefAttr.aMrkCellSize; break;
-
-        case GOrdPArcPa:
-            aAttr.nArcP=p->nArcP; aAttr.nArcQ=p->nArcQ;
-            aAttr.nArcR=p->nArcR; aAttr.nArcS=p->nArcS;
-            break;
-
-        case GOrdPCrPos:
-            aAttr.aCurPos=p->aCurPos;
-            break;
-    }
-    pAttrStack=p->pSucc;
-    delete p;
-}
-
-void OS2METReader::ChangeBrush(const Color& rPatColor, const Color& /*rBGColor*/, BOOL bFill )
-{
-    Color aColor;
-
-    if( bFill )
-        aColor = rPatColor;
-    else
-        aColor = Color( COL_TRANSPARENT );
-
-    if( pVirDev->GetFillColor() != aColor )
-        pVirDev->SetFillColor( aColor );
-}
-
-void OS2METReader::SetPen( const Color& rColor, USHORT nLineWidth, PenStyle ePenStyle )
-{
-    LineStyle eLineStyle( LINE_SOLID );
-
-    if ( pVirDev->GetLineColor() != rColor )
-        pVirDev->SetLineColor( rColor );
-    aLineInfo.SetWidth( nLineWidth );
-
-    USHORT nDotCount = 0;
-    USHORT nDashCount = 0;
-    switch ( ePenStyle )
-    {
-        case PEN_NULL :
-            eLineStyle = LINE_NONE;
-        break;
-        case PEN_DASHDOT :
-            nDashCount++;
-        case PEN_DOT :
-            nDotCount++;
-            nDashCount--;
-        case PEN_DASH :
-            nDashCount++;
-            aLineInfo.SetDotCount( nDotCount );
-            aLineInfo.SetDashCount( nDashCount );
-            aLineInfo.SetDistance( nLineWidth );
-            aLineInfo.SetDotLen( nLineWidth );
-            aLineInfo.SetDashLen( nLineWidth << 2 );
-            eLineStyle = LINE_DASH;
-        break;
-        case PEN_SOLID:
-        break;  // -Wall not handled...
-    }
-    aLineInfo.SetStyle( eLineStyle );
-}
-
-void OS2METReader::SetRasterOp(RasterOp eROP)
-{
-    if (pVirDev->GetRasterOp()!=eROP) pVirDev->SetRasterOp(eROP);
-}
-
-
-void OS2METReader::SetPalette0RGB(USHORT nIndex, ULONG nCol)
-{
-    if (pPaletteStack==NULL) {
-        pPaletteStack=new OSPalette;
-        pPaletteStack->pSucc=NULL;
-        pPaletteStack->p0RGB=NULL;
-        pPaletteStack->nSize=0;
-    }
-    if (pPaletteStack->p0RGB==NULL || nIndex>=pPaletteStack->nSize) {
-        sal_uInt32 * pOld0RGB=pPaletteStack->p0RGB;
-        USHORT i,nOldSize=pPaletteStack->nSize;
-        if (pOld0RGB==NULL) nOldSize=0;
-        pPaletteStack->nSize=2*(nIndex+1);
-        if (pPaletteStack->nSize<256) pPaletteStack->nSize=256;
-        pPaletteStack->p0RGB = new sal_uInt32[pPaletteStack->nSize];
-        for (i=0; i<pPaletteStack->nSize; i++) {
-            if (i<nOldSize) pPaletteStack->p0RGB[i]=pOld0RGB[i];
-            else if (i==0) pPaletteStack->p0RGB[i]=0x00ffffff;
-            else pPaletteStack->p0RGB[i]=0;
-        }
-        if (pOld0RGB!=NULL) delete[] pOld0RGB;
-    }
-    pPaletteStack->p0RGB[nIndex]=nCol;
-}
-
-sal_uInt32 OS2METReader::GetPalette0RGB(sal_uInt32 nIndex)
-{
-    if (pPaletteStack!=NULL && pPaletteStack->p0RGB!=NULL &&
-        pPaletteStack->nSize>nIndex) nIndex=pPaletteStack->p0RGB[nIndex];
-    return nIndex;
-}
-
-Color OS2METReader::GetPaletteColor(sal_uInt32 nIndex)
-{
-    nIndex=GetPalette0RGB(nIndex);
-    return Color(sal::static_int_cast< UINT8 >((nIndex>>16)&0xff),
-                 sal::static_int_cast< UINT8 >((nIndex>>8)&0xff),
-                 sal::static_int_cast< UINT8 >(nIndex&0xff));
-}
-
-
-USHORT OS2METReader::ReadBigEndianWord()
-{
-    BYTE nLo,nHi;
-    *pOS2MET >> nHi >> nLo;
-    return (((USHORT)nHi)<<8)|(((USHORT)nLo)&0x00ff);
-}
-
-ULONG OS2METReader::ReadBigEndian3BytesLong()
-{
-    USHORT nLo;
-    BYTE nHi;
-    *pOS2MET >> nHi;
-    nLo=ReadBigEndianWord();
-    return ((((ULONG)nHi)<<16)&0x00ff0000)|((ULONG)nLo);
-}
-
-ULONG OS2METReader::ReadLittleEndian3BytesLong()
-{
-    BYTE nHi,nMed,nLo;
-
-    *pOS2MET >> nLo >> nMed >> nHi;
-    return ((((ULONG)nHi)&0xff)<<16)|((((ULONG)nMed)&0xff)<<8)|(((ULONG)nLo)&0xff);
-}
-
-long OS2METReader::ReadCoord(BOOL b32)
-{
-    long l;
-    short s;
-
-    if (b32) *pOS2MET >> l;
-    else  { *pOS2MET >> s; l=(long)s; }
-    return l;
-}
-
-Point OS2METReader::ReadPoint( const BOOL bAdjustBoundRect )
-{
-    long x,y;
-
-    x=ReadCoord(bCoord32);
-    y=ReadCoord(bCoord32);
-    x=x-aBoundingRect.Left();
-    y=aBoundingRect.Bottom()-y;
-
-    if ( bAdjustBoundRect )
-        aCalcBndRect.Union(Rectangle(x,y,x+1,y+1));
-
-    return Point(x,y);
-}
-
-RasterOp OS2METReader::OS2MixToRasterOp(BYTE nMix)
-{
-    switch (nMix) {
-        case 0x0c: return ROP_INVERT;
-        case 0x04: return ROP_XOR;
-        case 0x0b: return ROP_XOR;
-        default:   return ROP_OVERPAINT;
-    }
-}
-
-void OS2METReader::ReadLine(BOOL bGivenPos, USHORT nOrderLen)
-{
-    USHORT i,nPolySize;
-
-    if (bCoord32) nPolySize=nOrderLen/8; else nPolySize=nOrderLen/4;
-    if (!bGivenPos) nPolySize++;
-    if (nPolySize==0) return;
-    Polygon aPolygon(nPolySize);
-    for (i=0; i<nPolySize; i++) {
-        if (i==0 && !bGivenPos) aPolygon.SetPoint(aAttr.aCurPos,i);
-        else aPolygon.SetPoint(ReadPoint(),i);
-    }
-    aAttr.aCurPos=aPolygon.GetPoint(nPolySize-1);
-    if (pAreaStack!=NULL) AddPointsToArea(aPolygon);
-    else if (pPathStack!=NULL) AddPointsToPath(aPolygon);
-    else
-    {
-        SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-        SetRasterOp(aAttr.eLinMix);
-        DrawPolyLine( aPolygon );
-    }
-}
-
-void OS2METReader::ReadRelLine(BOOL bGivenPos, USHORT nOrderLen)
-{
-    USHORT i,nPolySize;
-    Point aP0;
-
-
-    if (bGivenPos) {
-        aP0=ReadPoint();
-        if (bCoord32) nOrderLen-=8; else nOrderLen-=4;
-    }
-    else aP0=aAttr.aCurPos;
-    nPolySize=nOrderLen/2;
-    if (nPolySize==0) return;
-    Polygon aPolygon(nPolySize);
-    for (i=0; i<nPolySize; i++) {
-#if defined SOLARIS && defined PPC
-        UINT8 nunsignedbyte;
-        *pOS2MET >> nunsignedbyte; aP0.X()+=(INT8)nunsignedbyte;
-        *pOS2MET >> nunsignedbyte; aP0.Y()+=(INT8)nunsignedbyte;
-#else
-        INT8 nsignedbyte;
-        *pOS2MET >> nsignedbyte; aP0.X()+=(long)nsignedbyte;
-        *pOS2MET >> nsignedbyte; aP0.Y()-=(long)nsignedbyte;
-#endif
-        aCalcBndRect.Union(Rectangle(aP0,Size(1,1)));
-        aPolygon.SetPoint(aP0,i);
-    }
-    aAttr.aCurPos=aPolygon.GetPoint(nPolySize-1);
-    if (pAreaStack!=NULL) AddPointsToArea(aPolygon);
-    else if (pPathStack!=NULL) AddPointsToPath(aPolygon);
-    else
-    {
-        SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-        SetRasterOp(aAttr.eLinMix);
-        DrawPolyLine( aPolygon );
-    }
-}
-
-void OS2METReader::ReadBox(BOOL bGivenPos)
-{
-    BYTE        nFlags;
-    Point       P0;
-    long        nHRound,nVRound;
-
-    *pOS2MET >> nFlags;
-    pOS2MET->SeekRel(1);
-
-    if ( bGivenPos )
-        P0 = ReadPoint();
-    else
-        P0 = aAttr.aCurPos;
-
-    aAttr.aCurPos=ReadPoint();
-    nHRound=ReadCoord(bCoord32);
-    nVRound=ReadCoord(bCoord32);
-
-    Rectangle aBoxRect( P0, aAttr.aCurPos );
-
-    if ( pAreaStack )
-        AddPointsToArea( Polygon( aBoxRect ) );
-    else if ( pPathStack )
-        AddPointsToPath( Polygon( aBoxRect ) );
-    else
-    {
-        if ( nFlags & 0x20 )
-            SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-        else
-            SetPen( COL_TRANSPARENT );
-
-        if ( nFlags & 0x40 )
-        {
-            ChangeBrush(aAttr.aPatCol,aAttr.aPatBgCol,aAttr.bFill);
-            SetRasterOp(aAttr.ePatMix);
-        }
-        else
-        {
-            ChangeBrush( Color( COL_TRANSPARENT ), Color( COL_TRANSPARENT ), FALSE );
-            SetRasterOp(aAttr.eLinMix);
-        }
-
-        if ( IsLineInfo() )
-        {
-            Polygon aPolygon( aBoxRect, nHRound, nVRound );
-            if ( nFlags & 0x40 )
-            {
-                pVirDev->Push( PUSH_LINECOLOR );
-                pVirDev->SetLineColor( COL_TRANSPARENT );
-                pVirDev->DrawRect( aBoxRect, nHRound, nVRound );
-                pVirDev->Pop();
-            }
-            pVirDev->DrawPolyLine( aPolygon, aLineInfo );
-        }
-        else
-            pVirDev->DrawRect( aBoxRect, nHRound, nVRound );
-    }
-}
-
-void OS2METReader::ReadBitBlt()
-{
-    Point aP1,aP2;
-    Size aSize;
-    sal_uInt32 nID;
-    OSBitmap * pB;
-    long nt;
-
-    pOS2MET->SeekRel(4);
-    *pOS2MET >> nID;
-    pOS2MET->SeekRel(4);
-    aP1=ReadPoint(); aP2=ReadPoint();
-    if (aP1.X() > aP2.X()) { nt=aP1.X(); aP1.X()=aP2.X(); aP2.X()=nt; }
-    if (aP1.Y() > aP2.Y()) { nt=aP1.Y(); aP1.Y()=aP2.Y(); aP2.Y()=nt; }
-    aSize=Size(aP2.X()-aP1.X(),aP2.Y()-aP1.Y());
-
-    pB=pBitmapList;
-    while (pB!=NULL && pB->nID!=nID) pB=pB->pSucc;
-    if (pB!=NULL) {
-        SetRasterOp(aAttr.ePatMix);
-        pVirDev->DrawBitmap(aP1,aSize,pB->aBitmap);
-    }
-}
-
-void OS2METReader::ReadChrStr(BOOL bGivenPos, BOOL bMove, BOOL bExtra, USHORT nOrderLen)
-{
-    Point aP0;
-    USHORT i, nLen;
-    char * pChr;
-    OSFont * pF;
-    Font aFont;
-    Size aSize;
-
-    pF = pFontList;
-    while (pF!=NULL && pF->nID!=aAttr.nChrSet) pF=pF->pSucc;
-    if (pF!=NULL)
-        aFont = pF->aFont;
-    aFont.SetColor(aAttr.aChrCol);
-    aFont.SetSize(Size(0,aAttr.aChrCellSize.Height()));
-    if ( aAttr.nChrAng != 0 )
-        aFont.SetOrientation(aAttr.nChrAng);
-
-    if (bGivenPos)
-        aP0 = ReadPoint();
-    else
-        aP0 = aAttr.aCurPos;
-    if (bExtra)
-    {
-        pOS2MET->SeekRel(2);
-        ReadPoint( FALSE );
-        ReadPoint( FALSE );
-        *pOS2MET >> nLen;
-    }
-    else
-    {
-        if ( !bGivenPos )
-            nLen = nOrderLen;
-        else if ( bCoord32 )
-            nLen = nOrderLen-8;
-        else
-            nLen = nOrderLen-4;
-    }
-    pChr = new char[nLen+1];
-    for (i=0; i<nLen; i++)
-        *pOS2MET >> pChr[i];
-    pChr[nLen] = 0;
-    String aStr( (const sal_Char*)pChr, gsl_getSystemTextEncoding() );
-    SetRasterOp(aAttr.eChrMix);
-    if (pVirDev->GetFont()!=aFont)
-        pVirDev->SetFont(aFont);
-    pVirDev->DrawText(aP0,aStr);
-
-    aSize = Size( pVirDev->GetTextWidth(aStr), pVirDev->GetTextHeight() );
-    if ( aAttr.nChrAng == 0 )
-    {
-        aCalcBndRect.Union(Rectangle( Point(aP0.X(),aP0.Y()-aSize.Height()),
-                                      Size(aSize.Width(),aSize.Height()*2)));
-        if (bMove)
-            aAttr.aCurPos = Point( aP0.X() + aSize.Width(), aP0.Y());
-    }
-    else
-    {
-        Polygon aDummyPoly(4);
-
-        aDummyPoly.SetPoint( Point( aP0.X(), aP0.Y() ), 0);                                 // TOP LEFT
-        aDummyPoly.SetPoint( Point( aP0.X(), aP0.Y() - aSize.Height() ), 1);                // BOTTOM LEFT
-        aDummyPoly.SetPoint( Point( aP0.X() + aSize.Width(), aP0.Y() ), 2);                 // TOP RIGHT
-        aDummyPoly.SetPoint( Point( aP0.X() + aSize.Width(), aP0.Y() - aSize.Height() ), 3);// BOTTOM RIGHT
-        aDummyPoly.Rotate( aP0, (short)aAttr.nChrAng );
-        if ( bMove )
-            aAttr.aCurPos = aDummyPoly.GetPoint( 0 );
-        aCalcBndRect.Union( Rectangle( aDummyPoly.GetPoint( 0 ), aDummyPoly.GetPoint( 3 ) ) );
-        aCalcBndRect.Union( Rectangle( aDummyPoly.GetPoint( 1 ), aDummyPoly.GetPoint( 2 ) ) );
-    }
-    delete[] pChr;
-}
-
-void OS2METReader::ReadArc(BOOL bGivenPos)
-{
-    Point aP1, aP2, aP3;
-    double x1,y1,x2,y2,x3,y3,p,q,cx,cy,ncx,ncy,r,rx,ry,w1,w3;
-    if (bGivenPos) aP1=ReadPoint(); else aP1=aAttr.aCurPos;
-    aP2=ReadPoint(); aP3=ReadPoint();
-    aAttr.aCurPos=aP3;
-    SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-    SetRasterOp(aAttr.eLinMix);
-    // OK, gegeben sind 3 Punkte der Ellipse, und das Verhaeltnis
-    // Breite zu Hoehe (als p zu q):
-    x1=aP1.X(); y1=aP1.Y();
-    x2=aP2.X(); y2=aP2.Y();
-    x3=aP3.X(); y3=aP3.Y();
-    p=aAttr.nArcP;q=aAttr.nArcQ;
-    // Berechnet wird der Mittelpunkt cx,cy der Ellipse:
-    ncy=2*p*p*((y3-y1)*(x2-x1)-(y1-y2)*(x1-x3));
-    ncx=2*q*q*(x2-x1);
-    if ( (ncx<0.001 && ncx>-0.001) || (ncy<0.001 && ncy>-0.001) ) {
-        // Berechnung nicht moeglich, Punkte liegen auf einer Linie
-        pVirDev->DrawLine(aP1,aP2);
-        pVirDev->DrawLine(aP2,aP3);
-        return;
-    }
-    cy=( q*q*((x3*x3-x1*x1)*(x2-x1)+(x2*x2-x1*x1)*(x1-x3)) +
-         p*p*((y3*y3-y1*y1)*(x2-x1)+(y2*y2-y1*y1)*(x1-x3)) ) / ncy;
-    cx=( q*q*(x2*x2-x1*x1)+p*p*(y2*y2-y1*y1)+cy*2*p*p*(y1-y2) ) / ncx;
-    // Nun brauchen wir noch den Radius in x und y Richtung:
-    r=sqrt(q*q*(x1-cx)*(x1-cx)+p*p*(y1-cy)*(y1-cy));
-    rx=r/q; ry=r/p;
-    // Jetzt stellt sich "nur noch" die Frage, wie Start- und Endpunkt
-    // gewaehlt werden muessen, damit Punkt Nr. 2 innerhalb des
-    // gezeichneten Bogens liegt:
-    w1=fmod((atan2(x1-cx,y1-cy)-atan2(x2-cx,y2-cy)),6.28318530718); if (w1<0) w1+=6.28318530718;
-    w3=fmod((atan2(x3-cx,y3-cy)-atan2(x2-cx,y2-cy)),6.28318530718); if (w3<0) w3+=6.28318530718;
-    if (w3<w1) {
-        pVirDev->DrawArc(Rectangle((long)(cx-rx),(long)(cy-ry),
-                                   (long)(cx+rx),(long)(cy+ry)),aP1,aP3);
-    }
-    else {
-        pVirDev->DrawArc(Rectangle((long)(cx-rx),(long)(cy-ry),
-                                   (long)(cx+rx),(long)(cy+ry)),aP3,aP1);
-    }
-}
-
-void OS2METReader::ReadFullArc(BOOL bGivenPos, USHORT nOrderSize)
-{
-    Point aCenter;
-    long nP,nQ,nR,nS;
-    Rectangle aRect;
-    sal_uInt32 nMul; USHORT nMulS;
-
-    if (bGivenPos) {
-        aCenter=ReadPoint();
-        if (bCoord32) nOrderSize-=8; else nOrderSize-=4;
-    }
-    else aCenter=aAttr.aCurPos;
-
-    nP=aAttr.nArcP; nQ=aAttr.nArcQ; nR=aAttr.nArcR; nS=aAttr.nArcS;
-    if (nP<0) nP=-nP;
-    if (nQ<0) nQ=-nQ;
-    if (nR<0) nR=-nR;
-    if (nS<0) nS=-nS;
-    if (nOrderSize>=4) *pOS2MET >> nMul;
-    else { *pOS2MET >> nMulS; nMul=((ULONG)nMulS)<<8; }
-    if (nMul!=0x00010000) {
-        nP=(nP*nMul)>>16;
-        nQ=(nQ*nMul)>>16;
-        nR=(nR*nMul)>>16;
-        nS=(nS*nMul)>>16;
-    }
-
-    aRect=Rectangle(aCenter.X()-nP,aCenter.Y()-nQ,
-                    aCenter.X()+nP,aCenter.Y()+nQ);
-    aCalcBndRect.Union(aRect);
-
-    if (pAreaStack!=NULL) {
-        ChangeBrush(aAttr.aPatCol,aAttr.aPatBgCol,aAttr.bFill);
-        SetRasterOp(aAttr.ePatMix);
-        if ((pAreaStack->nFlags&0x40)!=0)
-            SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-        else
-            SetPen( COL_TRANSPARENT, 0, PEN_NULL );
-    }
-    else
-    {
-        SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-        ChangeBrush(Color( COL_TRANSPARENT ),Color( COL_TRANSPARENT ),FALSE);
-        SetRasterOp(aAttr.eLinMix);
-    }
-    pVirDev->DrawEllipse(aRect);
-}
-
-void OS2METReader::ReadPartialArc(BOOL bGivenPos, USHORT nOrderSize)
-{
-    Point aP0, aCenter,aPStart,aPEnd;
-    long nP,nQ,nR,nS,nStart, nSweep;
-    Rectangle aRect;
-    sal_uInt32 nMul; USHORT nMulS;
-    double fStart, fEnd;
-
-    if (bGivenPos) {
-        aP0=ReadPoint();
-        if (bCoord32) nOrderSize-=8; else nOrderSize-=4;
-    }
-    else aP0=aAttr.aCurPos;
-    aCenter=ReadPoint();
-
-    nP=aAttr.nArcP; nQ=aAttr.nArcQ; nR=aAttr.nArcR; nS=aAttr.nArcS;
-    if (nP<0) nP=-nP;
-    if (nQ<0) nQ=-nQ;
-    if (nR<0) nR=-nR;
-    if (nS<0) nS=-nS;
-    if (nOrderSize>=12) *pOS2MET >> nMul;
-    else { *pOS2MET >> nMulS; nMul=((ULONG)nMulS)<<8; }
-    if (nMul!=0x00010000) {
-        nP=(nP*nMul)>>16;
-        nQ=(nQ*nMul)>>16;
-        nR=(nR*nMul)>>16;
-        nS=(nS*nMul)>>16;
-    }
-
-    *pOS2MET >> nStart >> nSweep;
-    fStart=((double)nStart)/65536.0/180.0*3.14159265359;
-    fEnd=fStart+((double)nSweep)/65536.0/180.0*3.14159265359;
-    aPStart=Point(aCenter.X()+(long)( cos(fStart)*nP),
-                  aCenter.Y()+(long)(-sin(fStart)*nQ));
-    aPEnd=  Point(aCenter.X()+(long)( cos(fEnd)*nP),
-                  aCenter.Y()+(long)(-sin(fEnd)*nQ));
-
-    aRect=Rectangle(aCenter.X()-nP,aCenter.Y()-nQ,
-                    aCenter.X()+nP,aCenter.Y()+nQ);
-    aCalcBndRect.Union(aRect);
-
-    SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-    SetRasterOp(aAttr.eLinMix);
-
-    pVirDev->DrawLine(aP0,aPStart);
-    pVirDev->DrawArc(aRect,aPStart,aPEnd);
-    aAttr.aCurPos=aPEnd;
-}
-
-void OS2METReader::ReadPolygons()
-{
-    sal_uInt32 i,j,nNumPolys, nNumPoints;
-    PolyPolygon aPolyPoly;
-    Polygon aPoly;
-    Point aPoint;
-    BYTE nFlags;
-
-    *pOS2MET >> nFlags >> nNumPolys;
-    for (i=0; i<nNumPolys; i++) {
-        *pOS2MET >> nNumPoints;
-        if (i==0) nNumPoints++;
-        aPoly.SetSize((short)nNumPoints);
-        for (j=0; j<nNumPoints; j++) {
-            if (i==0 && j==0) aPoint=aAttr.aCurPos;
-            else aPoint=ReadPoint();
-            aPoly.SetPoint(aPoint,(short)j);
-            if (i==nNumPolys-1 && j==nNumPoints-1) aAttr.aCurPos=aPoint;
-        }
-        aPolyPoly.Insert(aPoly);
-    }
-
-    ChangeBrush(aAttr.aPatCol,aAttr.aPatBgCol,aAttr.bFill);
-    SetRasterOp(aAttr.ePatMix);
-    if ((nFlags&0x01)!=0)
-        SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-    else
-        SetPen( COL_TRANSPARENT, 0, PEN_NULL );
-    DrawPolyPolygon( aPolyPoly );
-}
-
-void OS2METReader::ReadBezier(BOOL bGivenPos, USHORT nOrderLen)
-{
-    USHORT i, nNumPoints = nOrderLen / ( bCoord32 ? 8 : 4 );
-
-    if( !bGivenPos )
-        nNumPoints++;
-
-    if( !nNumPoints )
-        return;
-
-    Polygon aPolygon( nNumPoints );
-
-    for( i=0; i < nNumPoints; i++ )
-    {
-        if( i==0 && !bGivenPos)
-            aPolygon.SetPoint( aAttr.aCurPos, i );
-        else
-            aPolygon.SetPoint( ReadPoint(), i );
-    }
-
-    if( !( nNumPoints % 4 ) )
-    {
-        // create bezier polygon
-        const USHORT    nSegPoints = 25;
-        const USHORT    nSegments = aPolygon.GetSize() >> 2;
-        Polygon         aBezPoly( nSegments * nSegPoints );
-
-        USHORT nSeg, nBezPos, nStartPos;
-        for( nSeg = 0, nBezPos = 0, nStartPos = 0; nSeg < nSegments; nSeg++, nStartPos += 4 )
-        {
-            const Polygon aSegPoly( aPolygon[ nStartPos ], aPolygon[ nStartPos + 1 ],
-                                    aPolygon[ nStartPos + 3 ], aPolygon[ nStartPos + 2 ],
-                                    nSegPoints );
-
-            for( USHORT nSegPos = 0; nSegPos < nSegPoints; )
-                aBezPoly[ nBezPos++ ] = aSegPoly[ nSegPos++ ];
-        }
-
-        nNumPoints = nBezPos;
-
-        if( nNumPoints != aBezPoly.GetSize() )
-            aBezPoly.SetSize( nNumPoints );
-
-        aPolygon = aBezPoly;
-    }
-
-    aAttr.aCurPos = aPolygon[ nNumPoints - 1 ];
-
-    if (pAreaStack!=NULL)
-        AddPointsToArea(aPolygon);
-    else if (pPathStack!=NULL)
-        AddPointsToPath(aPolygon);
-    else
-    {
-        SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-        SetRasterOp(aAttr.eLinMix);
-        DrawPolyLine( aPolygon );
-    }
-}
-
-void OS2METReader::ReadFillet(BOOL bGivenPos, USHORT nOrderLen)
-{
-    USHORT i,nNumPoints;
-
-    if (bCoord32) nNumPoints=nOrderLen/8; else nNumPoints=nOrderLen/4;
-    if (!bGivenPos) nNumPoints++;
-    if (nNumPoints==0) return;
-    Polygon aPolygon(nNumPoints);
-    for (i=0; i<nNumPoints; i++) {
-        if (i==0 && !bGivenPos) aPolygon.SetPoint(aAttr.aCurPos,i);
-        else aPolygon.SetPoint(ReadPoint(),i);
-    }
-    aAttr.aCurPos=aPolygon.GetPoint(nNumPoints-1);
-    if (pAreaStack!=NULL) AddPointsToArea(aPolygon);
-    else if (pPathStack!=NULL) AddPointsToPath(aPolygon);
-    else {
-        SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-        SetRasterOp(aAttr.eLinMix);
-        DrawPolyLine( aPolygon );
-    }
-}
-
-void OS2METReader::ReadFilletSharp(BOOL bGivenPos, USHORT nOrderLen)
-{
-    USHORT i,nNumPoints;
-
-    if (bGivenPos) {
-        aAttr.aCurPos=ReadPoint();
-        if (bCoord32) nOrderLen-=8; else nOrderLen-=4;
-    }
-    if (bCoord32) nNumPoints=1+nOrderLen/10;
-    else nNumPoints=1+nOrderLen/6;
-    Polygon aPolygon(nNumPoints);
-    aPolygon.SetPoint(aAttr.aCurPos,0);
-    for (i=1; i<nNumPoints; i++) aPolygon.SetPoint(ReadPoint(),i);
-    aAttr.aCurPos=aPolygon.GetPoint(nNumPoints-1);
-    if (pAreaStack!=NULL) AddPointsToArea(aPolygon);
-    else if (pPathStack!=NULL) AddPointsToPath(aPolygon);
-    else
-    {
-        SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-        SetRasterOp(aAttr.eLinMix);
-        DrawPolyLine( aPolygon );
-    }
-}
-
-void OS2METReader::ReadMarker(BOOL bGivenPos, USHORT nOrderLen)
-{
-    USHORT i,nNumPoints;
-    long x,y;
-
-    SetPen( aAttr.aMrkCol );
-    SetRasterOp(aAttr.eMrkMix);
-    if (aAttr.nMrkSymbol>=5 && aAttr.nMrkSymbol<=9)
-    {
-        ChangeBrush(aAttr.aMrkCol,aAttr.aMrkCol,TRUE);
-    }
-    else
-    {
-        ChangeBrush(Color(COL_TRANSPARENT),Color(COL_TRANSPARENT),FALSE);
-    }
-    if (bCoord32) nNumPoints=nOrderLen/8; else nNumPoints=nOrderLen/4;
-    if (!bGivenPos) nNumPoints++;
-    for (i=0; i<nNumPoints; i++) {
-        if (i!=0 || bGivenPos) aAttr.aCurPos=ReadPoint();
-        x=aAttr.aCurPos.X(); y=aAttr.aCurPos.Y();
-        aCalcBndRect.Union(Rectangle(x-5,y-5,x+5,y+5));
-        switch (aAttr.nMrkSymbol) {
-            case  2:   // PLUS
-                pVirDev->DrawLine(Point(x-4,y),Point(x+4,y));
-                pVirDev->DrawLine(Point(x,y-4),Point(x,y+4));
-                break;
-            case  3:   // DIAMOND
-            case  7: { // SOLIDDIAMOND
-                Polygon aPoly(4);
-                aPoly.SetPoint(Point(x,y+4),0);
-                aPoly.SetPoint(Point(x+4,y),1);
-                aPoly.SetPoint(Point(x,y-4),2);
-                aPoly.SetPoint(Point(x-4,y),3);
-                pVirDev->DrawPolygon(aPoly);
-                break;
-            }
-            case  4:   // SQARE
-            case  8: { // SOLIDSUARE
-                Polygon aPoly(4);
-                aPoly.SetPoint(Point(x+4,y+4),0);
-                aPoly.SetPoint(Point(x+4,y-4),1);
-                aPoly.SetPoint(Point(x-4,y-4),2);
-                aPoly.SetPoint(Point(x-4,y+4),3);
-                pVirDev->DrawPolygon(aPoly);
-                break;
-            }
-            case  5: { // SIXPOINTSTAR
-                Polygon aPoly(12);
-                aPoly.SetPoint(Point(x  ,y-4),0);
-                aPoly.SetPoint(Point(x+2,y-2),1);
-                aPoly.SetPoint(Point(x+4,y-2),2);
-                aPoly.SetPoint(Point(x+2,y  ),3);
-                aPoly.SetPoint(Point(x+4,y+2),4);
-                aPoly.SetPoint(Point(x+2,y+2),5);
-                aPoly.SetPoint(Point(x  ,y+4),6);
-                aPoly.SetPoint(Point(x-2,y+2),7);
-                aPoly.SetPoint(Point(x-4,y+2),8);
-                aPoly.SetPoint(Point(x-2,y  ),9);
-                aPoly.SetPoint(Point(x-4,y-2),10);
-                aPoly.SetPoint(Point(x-2,y-2),11);
-                pVirDev->DrawPolygon(aPoly);
-                break;
-            }
-            case  6: { // EIGHTPOINTSTAR
-                Polygon aPoly(16);
-                aPoly.SetPoint(Point(x  ,y-4),0);
-                aPoly.SetPoint(Point(x+1,y-2),1);
-                aPoly.SetPoint(Point(x+3,y-3),2);
-                aPoly.SetPoint(Point(x+2,y-1),3);
-                aPoly.SetPoint(Point(x+4,y  ),4);
-                aPoly.SetPoint(Point(x+2,y+1),5);
-                aPoly.SetPoint(Point(x+3,y+3),6);
-                aPoly.SetPoint(Point(x+1,y+2),7);
-                aPoly.SetPoint(Point(x  ,y+4),8);
-                aPoly.SetPoint(Point(x-1,y+2),9);
-                aPoly.SetPoint(Point(x-3,y+3),10);
-                aPoly.SetPoint(Point(x-2,y+1),11);
-                aPoly.SetPoint(Point(x-4,y  ),12);
-                aPoly.SetPoint(Point(x-2,y-1),13);
-                aPoly.SetPoint(Point(x-3,y-3),14);
-                aPoly.SetPoint(Point(x-1,y-2),15);
-                pVirDev->DrawPolygon(aPoly);
-                break;
-            }
-            case  9:   // DOT
-                pVirDev->DrawEllipse(Rectangle(x-1,y-1,x+1,y+1));
-                break;
-            case 10:   // SMALLCIRCLE
-                pVirDev->DrawEllipse(Rectangle(x-2,y-2,x+2,y+2));
-                break;
-            case 64:   // BLANK
-                break;
-            default:   // (=1) CROSS
-                pVirDev->DrawLine(Point(x-4,y-4),Point(x+4,y+4));
-                pVirDev->DrawLine(Point(x-4,y+4),Point(x+4,y-4));
-                break;
-        }
-    }
-}
-
-void OS2METReader::ReadOrder(USHORT nOrderID, USHORT nOrderLen)
-{
-    switch (nOrderID) {
-
-        case GOrdGivArc: ReadArc(TRUE); break;
-        case GOrdCurArc: ReadArc(FALSE); break;
-
-        case GOrdGivBzr: ReadBezier(TRUE,nOrderLen); break;
-        case GOrdCurBzr: ReadBezier(FALSE,nOrderLen); break;
-
-        case GOrdGivBox: ReadBox(TRUE); break;
-        case GOrdCurBox: ReadBox(FALSE); break;
-
-        case GOrdGivFil: ReadFillet(TRUE,nOrderLen); break;
-        case GOrdCurFil: ReadFillet(FALSE,nOrderLen); break;
-
-        case GOrdGivCrc: ReadFullArc(TRUE,nOrderLen); break;
-        case GOrdCurCrc: ReadFullArc(FALSE,nOrderLen); break;
-
-        case GOrdGivLin: ReadLine(TRUE, nOrderLen); break;
-        case GOrdCurLin: ReadLine(FALSE, nOrderLen); break;
-
-        case GOrdGivMrk: ReadMarker(TRUE, nOrderLen); break;
-        case GOrdCurMrk: ReadMarker(FALSE, nOrderLen); break;
-
-        case GOrdGivArP: ReadPartialArc(TRUE,nOrderLen); break;
-        case GOrdCurArP: ReadPartialArc(FALSE,nOrderLen); break;
-
-        case GOrdGivRLn: ReadRelLine(TRUE,nOrderLen); break;
-        case GOrdCurRLn: ReadRelLine(FALSE,nOrderLen); break;
-
-        case GOrdGivSFl: ReadFilletSharp(TRUE,nOrderLen); break;
-        case GOrdCurSFl: ReadFilletSharp(FALSE,nOrderLen); break;
-
-        case GOrdGivStM: ReadChrStr(TRUE , TRUE , FALSE, nOrderLen); break;
-        case GOrdCurStM: ReadChrStr(FALSE, TRUE , FALSE, nOrderLen); break;
-        case GOrdGivStr: ReadChrStr(TRUE , FALSE, FALSE, nOrderLen); break;
-        case GOrdCurStr: ReadChrStr(FALSE, FALSE, FALSE, nOrderLen); break;
-        case GOrdGivStx: ReadChrStr(TRUE , FALSE, TRUE , nOrderLen); break;
-        case GOrdCurStx: ReadChrStr(FALSE, FALSE, TRUE , nOrderLen); break;
-
-        case GOrdGivImg: OOODEBUG("GOrdGivImg",0);
-            break;
-        case GOrdCurImg: OOODEBUG("GOrdCurImg",0);
-            break;
-        case GOrdImgDat: OOODEBUG("GOrdImgDat",0);
-            break;
-        case GOrdEndImg: OOODEBUG("GOrdEndImg",0);
-            break;
-
-        case GOrdBegAra: {
-            OSArea * p=new OSArea;
-            p->bClosed=FALSE;
-            p->pSucc=pAreaStack; pAreaStack=p;
-            *pOS2MET >> (p->nFlags);
-            p->aCol=aAttr.aPatCol;
-            p->aBgCol=aAttr.aPatBgCol;
-            p->eMix=aAttr.ePatMix;
-            p->eBgMix=aAttr.ePatBgMix;
-            p->bFill=aAttr.bFill;
-            break;
-        }
-        case GOrdEndAra:
-        {
-            OSArea * p=pAreaStack;
-            if ( p )
-            {
-                pAreaStack = p->pSucc;
-                if ( pPathStack )
-                {
-                    for ( USHORT i=0; i<p->aPPoly.Count(); i++ )
-                    {
-                        AddPointsToPath( p->aPPoly.GetObject( i ) );
-                        CloseFigure();
-                    }
-                }
-                else
-                {
-                    if ( ( p->nFlags & 0x40 ) == 0 )
-                        SetPen( COL_TRANSPARENT, 0, PEN_NULL );
-                    else
-                        SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-
-                    ChangeBrush(p->aCol,p->aBgCol,p->bFill);
-                    SetRasterOp(p->eMix);
-                    DrawPolyPolygon( p->aPPoly );
-                }
-                delete p;
-            }
-        }
-        break;
-
-        case GOrdBegElm:// OOODEBUG("GOrdBegElm",0);
-            break;
-        case GOrdEndElm:// OOODEBUG("GOrdEndElm",0);
-            break;
-
-        case GOrdBegPth: {
-            OSPath * p=new OSPath;
-            p->pSucc=pPathStack; pPathStack=p;
-            pOS2MET->SeekRel(2);
-            *pOS2MET >> p->nID;
-            p->bClosed=FALSE;
-            p->bStroke=FALSE;
-            break;
-        }
-        case GOrdEndPth: {
-            OSPath * p, * pprev, * psucc;
-            if (pPathStack==NULL) break;
-            p=pPathList; pprev=NULL;
-            while (p!=NULL) {
-                psucc=p->pSucc;
-                if (p->nID==pPathStack->nID) {
-                    if (pprev==NULL) pPathList=psucc; else pprev->pSucc=psucc;
-                    delete p;
-                }
-                else pprev=p;
-                p=psucc;
-            }
-            p=pPathStack;
-            pPathStack=p->pSucc;
-            p->pSucc=pPathList; pPathList=p;
-            break;
-        }
-        case GOrdFilPth:
-        {
-            sal_uInt32 nID;
-            UINT16  nDummy;
-            OSPath* p = pPathList;
-
-            *pOS2MET >> nDummy
-                     >> nID;
-
-            if ( ! ( nDummy & 0x20 ) )  // #30933# i do not know the exact meaning of this bit,
-            {                           // but if set it seems to be better not to fill this path
-                while( p && p->nID != nID )
-                    p = p->pSucc;
-
-                if( p )
-                {
-                    if( p->bStroke )
-                    {
-                        SetPen( aAttr.aPatCol, aAttr.nStrLinWidth, PEN_SOLID );
-                        ChangeBrush(Color(COL_TRANSPARENT),Color(COL_TRANSPARENT),FALSE);
-                        SetRasterOp( aAttr.ePatMix );
-                        if ( IsLineInfo() )
-                        {
-                            for ( USHORT i = 0; i < p->aPPoly.Count(); i++ )
-                                pVirDev->DrawPolyLine( p->aPPoly.GetObject( i ), aLineInfo );
-                        }
-                        else
-                            pVirDev->DrawPolyPolygon( p->aPPoly );
-                    }
-                    else
-                    {
-                        SetPen( COL_TRANSPARENT, 0, PEN_NULL );
-                        ChangeBrush( aAttr.aPatCol, aAttr.aPatBgCol, aAttr.bFill );
-                        SetRasterOp( aAttr.ePatMix );
-                        pVirDev->DrawPolyPolygon( p->aPPoly );
-                    }
-                }
-            }
-        }
-        break;
-
-        case GOrdModPth:
-        {
-            OSPath* p = pPathList;
-
-            while( p && p->nID != 1 )
-                p = p->pSucc;
-
-            if( p )
-                p->bStroke = TRUE;
-        }
-        break;
-
-        case GOrdOutPth:
-        {
-            sal_uInt32 nID;
-            USHORT  i,nC;
-            OSPath* p=pPathList;
-            pOS2MET->SeekRel(2);
-            *pOS2MET >> nID;
-            while (p!=NULL && p->nID!=nID)
-                p=p->pSucc;
-
-            if( p!=NULL )
-            {
-                SetPen( aAttr.aLinCol, aAttr.nStrLinWidth, aAttr.eLinStyle );
-                SetRasterOp(aAttr.eLinMix);
-                ChangeBrush(Color(COL_TRANSPARENT),Color(COL_TRANSPARENT),FALSE);
-                nC=p->aPPoly.Count();
-                for (i=0; i<nC; i++)
-                {
-                    if (i+1<nC || p->bClosed==TRUE)
-                        DrawPolygon( p->aPPoly.GetObject( i ) );
-                    else
-                        DrawPolyLine( p->aPPoly.GetObject( i ) );
-                }
-            }
-            break;
-        }
-        case GOrdSClPth: {  OOODEBUG("GOrdSClPth",0);
-            sal_uInt32 nID;
-            OSPath * p=pPathList;
-            pOS2MET->SeekRel(2);
-            *pOS2MET >> nID;
-            if (nID==0) p=NULL;
-            while (p!=NULL && p->nID!=nID) p=p->pSucc;
-            if (p!=NULL) pVirDev->SetClipRegion(Region(p->aPPoly));
-            else pVirDev->SetClipRegion();
-            break;
-        }
-        case GOrdNopNop:
-            break;
-        case GOrdRemark: //OOODEBUG("GOrdRemark",0);
-            break;
-        case GOrdSegLab: OOODEBUG("GOrdSegLab",0);
-            break;
-
-        case GOrdBitBlt: ReadBitBlt(); break;
-
-        case GOrdCalSeg: OOODEBUG("GOrdCalSeg",0);
-            break;
-        case GOrdSSgBnd: OOODEBUG("GOrdSSgBnd",0);
-            break;
-        case GOrdSegChr: OOODEBUG("GOrdSegChr",0);
-            break;
-        case GOrdCloFig:
-            CloseFigure();
-            break;
-        case GOrdEndSym: OOODEBUG("GOrdEndSym",0);
-            break;
-        case GOrdEndPlg: OOODEBUG("GOrdEndPlg",0);
-            break;
-        case GOrdEscape: OOODEBUG("GOrdEscape",0);
-            break;
-        case GOrdExtEsc: OOODEBUG("GOrdExtEsc",0);
-            break;
-
-        case GOrdPolygn: ReadPolygons(); break;
-
-        case GOrdStkPop: PopAttr(); break;
-
-        case GOrdPIvAtr: PushAttr(nOrderID);
-        case GOrdSIvAtr: {
-            BYTE nA, nP, nFlags, nMix;
-            ULONG nVal;
-            Color aCol;
-            RasterOp eROP;
-            *pOS2MET >> nA >> nP >> nFlags;
-            if (nOrderID==GOrdPIvAtr) {
-                pAttrStack->nIvAttrA=nA;
-                pAttrStack->nIvAttrP=nP;
-            }
-            if (nA<=2) {
-                if ((nFlags&0x80)!=0) {
-                    if (nA==1) switch (nP) {
-                        case 1: aAttr.aLinCol=aDefAttr.aLinCol; break;
-                        case 2: aAttr.aChrCol=aDefAttr.aChrCol; break;
-                        case 3: aAttr.aMrkCol=aDefAttr.aMrkCol; break;
-                        case 4: aAttr.aPatCol=aDefAttr.aPatCol; break;
-                        case 5: aAttr.aImgCol=aDefAttr.aImgCol; break;
-                    }
-                    else switch (nP) {
-                        case 1: aAttr.aLinBgCol=aDefAttr.aLinBgCol; break;
-                        case 2: aAttr.aChrBgCol=aDefAttr.aChrBgCol; break;
-                        case 3: aAttr.aMrkBgCol=aDefAttr.aMrkBgCol; break;
-                        case 4: aAttr.aPatBgCol=aDefAttr.aPatBgCol; break;
-                        case 5: aAttr.aImgBgCol=aDefAttr.aImgBgCol; break;
-                    }
-                }
-                else {
-                    nVal=ReadLittleEndian3BytesLong();
-                    if      ((nFlags&0x40)!=0 && nVal==1) aCol=Color(COL_BLACK);
-                    else if ((nFlags&0x40)!=0 && nVal==2) aCol=Color(COL_WHITE);
-                    else if ((nFlags&0x40)!=0 && nVal==4) aCol=Color(COL_WHITE);
-                    else if ((nFlags&0x40)!=0 && nVal==5) aCol=Color(COL_BLACK);
-                    else aCol=GetPaletteColor(nVal);
-                    if (nA==1) switch (nP) {
-                        case 1: aAttr.aLinCol=aCol; break;
-                        case 2: aAttr.aChrCol=aCol; break;
-                        case 3: aAttr.aMrkCol=aCol; break;
-                        case 4: aAttr.aPatCol=aCol; break;
-                        case 5: aAttr.aImgCol=aCol; break;
-                    }
-                    else switch (nP) {
-                        case 1: aAttr.aLinBgCol=aCol; break;
-                        case 2: aAttr.aChrBgCol=aCol; break;
-                        case 3: aAttr.aMrkBgCol=aCol; break;
-                        case 4: aAttr.aPatBgCol=aCol; break;
-                        case 5: aAttr.aImgBgCol=aCol; break;
-                    }
-                }
-            }
-            else {
-                *pOS2MET >> nMix;
-                if (nMix==0) {
-                    if (nA==1) switch (nP) {
-                        case 1: aAttr.eLinMix=aDefAttr.eLinMix; break;
-                        case 2: aAttr.eChrMix=aDefAttr.eChrMix; break;
-                        case 3: aAttr.eMrkMix=aDefAttr.eMrkMix; break;
-                        case 4: aAttr.ePatMix=aDefAttr.ePatMix; break;
-                        case 5: aAttr.eImgMix=aDefAttr.eImgMix; break;
-                    }
-                    else switch (nP) {
-                        case 1: aAttr.eLinBgMix=aDefAttr.eLinBgMix; break;
-                        case 2: aAttr.eChrBgMix=aDefAttr.eChrBgMix; break;
-                        case 3: aAttr.eMrkBgMix=aDefAttr.eMrkBgMix; break;
-                        case 4: aAttr.ePatBgMix=aDefAttr.ePatBgMix; break;
-                        case 5: aAttr.eImgBgMix=aDefAttr.eImgBgMix; break;
-                    }
-                }
-                else {
-                    eROP=OS2MixToRasterOp(nMix);
-                    if (nA==1) switch (nP) {
-                        case 1: aAttr.eLinMix=eROP; break;
-                        case 2: aAttr.eChrMix=eROP; break;
-                        case 3: aAttr.eMrkMix=eROP; break;
-                        case 4: aAttr.ePatMix=eROP; break;
-                        case 5: aAttr.eImgMix=eROP; break;
-                    }
-                    else switch (nP) {
-                        case 1: aAttr.eLinBgMix=eROP; break;
-                        case 2: aAttr.eChrBgMix=eROP; break;
-                        case 3: aAttr.eMrkBgMix=eROP; break;
-                        case 4: aAttr.ePatBgMix=eROP; break;
-                        case 5: aAttr.eImgBgMix=eROP; break;
-                    }
-                }
-            }
-            break;
-        }
-        case GOrdPIxCol: PushAttr(nOrderID);
-        case GOrdSIxCol: {
-            BYTE nFlags;
-            ULONG nVal;
-            Color aCol;
-            *pOS2MET >> nFlags;
-            if ((nFlags&0x80)!=0) {
-                aAttr.aLinCol=aDefAttr.aLinCol;
-                aAttr.aChrCol=aDefAttr.aChrCol;
-                aAttr.aMrkCol=aDefAttr.aMrkCol;
-                aAttr.aPatCol=aDefAttr.aPatCol;
-                aAttr.aImgCol=aDefAttr.aImgCol;
-            }
-            else {
-                nVal=ReadLittleEndian3BytesLong();
-                if      ((nFlags&0x40)!=0 && nVal==1) aCol=Color(COL_BLACK);
-                else if ((nFlags&0x40)!=0 && nVal==2) aCol=Color(COL_WHITE);
-                else if ((nFlags&0x40)!=0 && nVal==4) aCol=Color(COL_WHITE);
-                else if ((nFlags&0x40)!=0 && nVal==5) aCol=Color(COL_BLACK);
-                else aCol=GetPaletteColor(nVal);
-                aAttr.aLinCol = aAttr.aChrCol = aAttr.aMrkCol = aAttr.aPatCol =
-                aAttr.aImgCol = aCol;
-            }
-            break;
-        }
-
-        case GOrdPColor:
-        case GOrdPXtCol: PushAttr(nOrderID);
-        case GOrdSColor:
-        case GOrdSXtCol: {
-            BYTE nbyte;
-            USHORT nVal;
-            Color aCol;
-            if (nOrderID==GOrdPColor || nOrderID==GOrdSColor) {
-                *pOS2MET >> nbyte; nVal=((USHORT)nbyte)|0xff00;
-            }
-            else *pOS2MET >> nVal;
-            if (nVal==0x0000 || nVal==0xff00)  {
-                aAttr.aLinCol=aDefAttr.aLinCol;
-                aAttr.aChrCol=aDefAttr.aChrCol;
-                aAttr.aMrkCol=aDefAttr.aMrkCol;
-                aAttr.aPatCol=aDefAttr.aPatCol;
-                aAttr.aImgCol=aDefAttr.aImgCol;
-            }
-            else {
-                if      (nVal==0x0007) aCol=Color(COL_WHITE);
-                else if (nVal==0x0008) aCol=Color(COL_BLACK);
-                else if (nVal==0xff08) aCol=GetPaletteColor(1);
-                else aCol=GetPaletteColor(((ULONG)nVal) & 0x000000ff);
-                aAttr.aLinCol = aAttr.aChrCol = aAttr.aMrkCol = aAttr.aPatCol =
-                aAttr.aImgCol = aCol;
-            }
-            break;
-        }
-
-        case GOrdPBgCol: PushAttr(nOrderID);
-        case GOrdSBgCol: {
-            USHORT nVal;
-            Color aCol;
-            *pOS2MET >> nVal;
-            if (nVal==0x0000 || nVal==0xff00)  {
-                aAttr.aLinBgCol=aDefAttr.aLinBgCol;
-                aAttr.aChrBgCol=aDefAttr.aChrBgCol;
-                aAttr.aMrkBgCol=aDefAttr.aMrkBgCol;
-                aAttr.aPatBgCol=aDefAttr.aPatBgCol;
-                aAttr.aImgBgCol=aDefAttr.aImgBgCol;
-            }
-            else {
-                if      (nVal==0x0007) aCol=Color(COL_WHITE);
-                else if (nVal==0x0008) aCol=Color(COL_BLACK);
-                else if (nVal==0xff08) aCol=GetPaletteColor(0);
-                else aCol=GetPaletteColor(((ULONG)nVal) & 0x000000ff);
-                aAttr.aLinBgCol = aAttr.aChrBgCol = aAttr.aMrkBgCol =
-                aAttr.aPatBgCol = aAttr.aImgBgCol = aCol;
-            }
-            break;
-        }
-        case GOrdPBxCol: PushAttr(nOrderID);
-        case GOrdSBxCol: {
-            BYTE nFlags;
-            ULONG nVal;
-            Color aCol;
-            *pOS2MET >> nFlags;
-            if ((nFlags&0x80)!=0) {
-                aAttr.aLinBgCol=aDefAttr.aLinBgCol;
-                aAttr.aChrBgCol=aDefAttr.aChrBgCol;
-                aAttr.aMrkBgCol=aDefAttr.aMrkBgCol;
-                aAttr.aPatBgCol=aDefAttr.aPatBgCol;
-                aAttr.aImgBgCol=aDefAttr.aImgBgCol;
-            }
-            else {
-                nVal=ReadLittleEndian3BytesLong();
-                if      ((nFlags&0x40)!=0 && nVal==1) aCol=Color(COL_BLACK);
-                else if ((nFlags&0x40)!=0 && nVal==2) aCol=Color(COL_WHITE);
-                else if ((nFlags&0x40)!=0 && nVal==4) aCol=Color(COL_WHITE);
-                else if ((nFlags&0x40)!=0 && nVal==5) aCol=Color(COL_BLACK);
-                else aCol=GetPaletteColor(nVal);
-                aAttr.aLinBgCol = aAttr.aChrBgCol = aAttr.aMrkBgCol =
-                aAttr.aPatBgCol = aAttr.aImgBgCol = aCol;
-            }
-            break;
-        }
-
-        case GOrdPMixMd: PushAttr(nOrderID);
-        case GOrdSMixMd: {
-            BYTE nMix;
-            *pOS2MET >> nMix;
-            if (nMix==0) {
-                aAttr.eLinMix=aDefAttr.eLinMix;
-                aAttr.eChrMix=aDefAttr.eChrMix;
-                aAttr.eMrkMix=aDefAttr.eMrkMix;
-                aAttr.ePatMix=aDefAttr.ePatMix;
-                aAttr.eImgMix=aDefAttr.eImgMix;
-            }
-            else {
-                aAttr.eLinMix = aAttr.eChrMix = aAttr.eMrkMix =
-                aAttr.ePatMix = aAttr.eImgMix = OS2MixToRasterOp(nMix);
-            }
-            break;
-        }
-        case GOrdPBgMix: PushAttr(nOrderID);
-        case GOrdSBgMix: {
-            BYTE nMix;
-            *pOS2MET >> nMix;
-            if (nMix==0) {
-                aAttr.eLinBgMix=aDefAttr.eLinBgMix;
-                aAttr.eChrBgMix=aDefAttr.eChrBgMix;
-                aAttr.eMrkBgMix=aDefAttr.eMrkBgMix;
-                aAttr.ePatBgMix=aDefAttr.ePatBgMix;
-                aAttr.eImgBgMix=aDefAttr.eImgBgMix;
-            }
-            else {
-                aAttr.eLinBgMix = aAttr.eChrBgMix = aAttr.eMrkBgMix =
-                aAttr.ePatBgMix = aAttr.eImgBgMix = OS2MixToRasterOp(nMix);
-            }
-            break;
-        }
-        case GOrdPPtSet: PushAttr(nOrderID);
-        case GOrdSPtSet: OOODEBUG("GOrdSPtSet",0);
-            break;
-
-        case GOrdPPtSym: PushAttr(nOrderID);
-        case GOrdSPtSym: {
-            BYTE nPatt;
-            *pOS2MET >> nPatt;
-            aAttr.bFill = ( nPatt != 0x0f );
-            break;
-        }
-
-        case GOrdPPtRef: PushAttr(nOrderID);
-        case GOrdSPtRef: OOODEBUG("GOrdSPtRef",0);
-            break;
-
-        case GOrdPLnEnd: PushAttr(nOrderID);
-        case GOrdSLnEnd:
-            break;
-
-        case GOrdPLnJoi: PushAttr(nOrderID);
-        case GOrdSLnJoi:
-            break;
-
-        case GOrdPLnTyp: PushAttr(nOrderID);
-        case GOrdSLnTyp: {
-            BYTE nType;
-            *pOS2MET >> nType;
-            switch (nType) {
-                case 0:         aAttr.eLinStyle=aDefAttr.eLinStyle; break;
-                case 1: case 4: aAttr.eLinStyle=PEN_DOT; break;
-                case 2: case 5: aAttr.eLinStyle=PEN_DASH; break;
-                case 3: case 6: aAttr.eLinStyle=PEN_DASHDOT; break;
-                case 8:         aAttr.eLinStyle=PEN_NULL; break;
-                default:        aAttr.eLinStyle=PEN_SOLID;
-            }
-            break;
-        }
-        case GOrdPLnWdt: PushAttr(nOrderID);
-        case GOrdSLnWdt: {
-            BYTE nbyte;
-            *pOS2MET >> nbyte;
-            if (nbyte==0) aAttr.nLinWidth=aDefAttr.nLinWidth;
-            else aAttr.nLinWidth=(USHORT)nbyte-1;
-            break;
-        }
-        case GOrdPFrLWd: PushAttr(nOrderID);
-        case GOrdSFrLWd:
-            break;
-
-        case GOrdPStLWd: PushAttr(nOrderID);
-        case GOrdSStLWd :
-        {
-            BYTE nFlags;
-            long nWd;
-
-            *pOS2MET >> nFlags;
-            if ( nFlags & 0x80 )
-                aAttr.nStrLinWidth = aDefAttr.nStrLinWidth;
-            else
-            {
-                pOS2MET->SeekRel( 1 );
-                nWd = ReadCoord( bCoord32 );
-                if ( nWd < 0 )
-                    nWd = -nWd;
-                aAttr.nStrLinWidth = (USHORT)nWd;
-            }
-            break;
-        }
-        case GOrdPChDir: PushAttr(nOrderID);
-        case GOrdSChDir:
-            break;
-
-        case GOrdPChPrc: PushAttr(nOrderID);
-        case GOrdSChPrc:
-            break;
-
-        case GOrdPChSet: PushAttr(nOrderID);
-        case GOrdSChSet: {
-            BYTE nbyte; *pOS2MET >> nbyte;
-            aAttr.nChrSet=((ULONG)nbyte)&0xff;
-            break;
-        }
-        case GOrdPChAng: PushAttr(nOrderID);
-        case GOrdSChAng: {
-            long nX,nY;
-            nX=ReadCoord(bCoord32); nY=ReadCoord(bCoord32);
-            if (nX>=0 && nY==0) aAttr.nChrAng=0;
-            else {
-                aAttr.nChrAng=(short)(atan2((double)nY,(double)nX)/3.1415926539*1800.0);
-                while (aAttr.nChrAng<0) aAttr.nChrAng+=3600;
-                aAttr.nChrAng%=3600;
-            }
-            break;
-        }
-        case GOrdPChBrx: PushAttr(nOrderID);
-        case GOrdSChBrx:
-            break;
-
-        case GOrdPChCel: PushAttr(nOrderID);
-        case GOrdSChCel: {
-            BYTE nbyte;
-            USHORT nLen=nOrderLen;
-            aAttr.aChrCellSize.Width()=ReadCoord(bCoord32);
-            aAttr.aChrCellSize.Height()=ReadCoord(bCoord32);
-            if (bCoord32) nLen-=8; else nLen-=4;
-            if (nLen>=4) {
-                pOS2MET->SeekRel(4); nLen-=4;
-            }
-            if (nLen>=2) {
-                *pOS2MET >> nbyte;
-                if ((nbyte&0x80)==0 && aAttr.aChrCellSize==Size(0,0))
-                    aAttr.aChrCellSize=aDefAttr.aChrCellSize;
-            }
-            break;
-        }
-        case GOrdPChXtr: PushAttr(nOrderID);
-        case GOrdSChXtr:
-            break;
-
-        case GOrdPChShr: PushAttr(nOrderID);
-        case GOrdSChShr:
-            break;
-
-        case GOrdPTxAlg: PushAttr(nOrderID);
-        case GOrdSTxAlg: OOODEBUG("GOrdSTxAlg",0);
-            break;
-
-        case GOrdPMkPrc: PushAttr(nOrderID);
-        case GOrdSMkPrc: {
-            BYTE nbyte;
-            *pOS2MET >> nbyte;
-            if (nbyte==0) aAttr.nMrkPrec=aDefAttr.nMrkPrec;
-            else aAttr.nMrkPrec=nbyte;
-            break;
-        }
-
-        case GOrdPMkSet: PushAttr(nOrderID);
-        case GOrdSMkSet: {
-            BYTE nbyte;
-            *pOS2MET >> nbyte;
-            if (nbyte==0) aAttr.nMrkSet=aDefAttr.nMrkSet;
-            else aAttr.nMrkSet=nbyte;
-            break;
-        }
-
-        case GOrdPMkSym: PushAttr(nOrderID);
-        case GOrdSMkSym: {
-            BYTE nbyte;
-            *pOS2MET >> nbyte;
-            if (nbyte==0) aAttr.nMrkSymbol=aDefAttr.nMrkSymbol;
-            else aAttr.nMrkSymbol=nbyte;
-            break;
-        }
-
-        case GOrdPMkCel: PushAttr(nOrderID);
-        case GOrdSMkCel: {
-            BYTE nbyte;
-            USHORT nLen=nOrderLen;
-            aAttr.aMrkCellSize.Width()=ReadCoord(bCoord32);
-            aAttr.aMrkCellSize.Height()=ReadCoord(bCoord32);
-            if (bCoord32) nLen-=8; else nLen-=4;
-            if (nLen>=2) {
-                *pOS2MET >> nbyte;
-                if ((nbyte&0x80)==0 && aAttr.aMrkCellSize==Size(0,0))
-                    aAttr.aMrkCellSize=aDefAttr.aMrkCellSize;
-            }
-            break;
-        }
-
-        case GOrdPArcPa: PushAttr(nOrderID);
-        case GOrdSArcPa:
-            aAttr.nArcP=ReadCoord(bCoord32);
-            aAttr.nArcQ=ReadCoord(bCoord32);
-            aAttr.nArcR=ReadCoord(bCoord32);
-            aAttr.nArcS=ReadCoord(bCoord32);
-            break;
-
-        case GOrdPCrPos: PushAttr(nOrderID);
-        case GOrdSCrPos:
-            aAttr.aCurPos=ReadPoint();
-            break;
-
-        case GOrdPMdTrn: PushAttr(nOrderID);
-        case GOrdSMdTrn: OOODEBUG("GOrdSMdTrn",0);
-            break;
-
-        case GOrdPPkIdn: PushAttr(nOrderID);
-        case GOrdSPkIdn: OOODEBUG("GOrdSPkIdn",0);
-            break;
-
-        case GOrdSVwTrn: OOODEBUG("GOrdSVwTrn",0);
-            break;
-
-        case GOrdPVwWin: PushAttr(nOrderID);
-        case GOrdSVwWin: OOODEBUG("GOrdSVwWin",0);
-            break;
-        default: OOODEBUG("Order unbekannt:",nOrderID);
-    }
-}
-
-void OS2METReader::ReadDsc(USHORT nDscID, USHORT /*nDscLen*/)
-{
-    switch (nDscID) {
-        case 0x00f7: { // 'Specify GVM Subset'
-            BYTE nbyte;
-            pOS2MET->SeekRel(6);
-            *pOS2MET >> nbyte;
-            if      (nbyte==0x05) bCoord32=TRUE;
-            else if (nbyte==0x04) bCoord32=FALSE;
-            else {
-                pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-                ErrorCode=1;
-            }
-            break;
-        }
-        case 0x00f6:
-        {
-            // 'Set Picture Descriptor'
-            BOOL b32;
-            BYTE nbyte,nUnitType;
-            long x1,y1,x2,y2,nt,xr,yr;
-
-            pOS2MET->SeekRel(2);
-            *pOS2MET >> nbyte;
-
-            if (nbyte==0x05)
-                b32=TRUE;
-            else if(nbyte==0x04)
-                b32=FALSE;
-            else
-            {
-                b32 = FALSE;   // -Wall added the case.
-                pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-                ErrorCode=2;
-            }
-
-            *pOS2MET >> nUnitType;
-
-            xr=ReadCoord(b32);
-            yr=ReadCoord(b32);
-
-            ReadCoord(b32);
-
-            if (nUnitType==0x00 && xr>0 && yr>0)
-                aGlobMapMode=MapMode(MAP_INCH,Point(0,0),Fraction(10,xr),Fraction(10,yr));
-            else if (nUnitType==0x01 && xr>0 && yr>0)
-                aGlobMapMode=MapMode(MAP_CM,Point(0,0),Fraction(10,xr),Fraction(10,yr));
-            else
-                aGlobMapMode=MapMode();
-
-            x1=ReadCoord(b32);
-            x2=ReadCoord(b32);
-            y1=ReadCoord(b32);
-            y2=ReadCoord(b32);
-
-            if (x1>x2)
-            {
-                nt=x1;
-                x1=x2;
-                x2=nt;
-            }
-
-            if (y1>y2)
-            {
-                nt=y1;
-                y1=y2;
-                y2=nt;
-            }
-
-            aBoundingRect.Left() = x1;
-            aBoundingRect.Right() = x2;
-            aBoundingRect.Top() = y1;
-            aBoundingRect.Bottom() = y2;
-
-            // no output beside this bounding rect
-            pVirDev->IntersectClipRegion( Rectangle( Point(), aBoundingRect.GetSize() ) );
-
-            break;
-        }
-        case 0x0021: // 'Set Current Defaults'
-            break;
-    }
-}
-
-void OS2METReader::ReadImageData(USHORT nDataID, USHORT nDataLen)
-{
-    OSBitmap * p=pBitmapList; if (p==NULL) return; // Nanu ?
-
-    switch (nDataID) {
-
-        case 0x0070:   // Begin Segment
-            break;
-
-        case 0x0091:   // Begin Image Content
-            break;
-
-        case 0x0094:   // Image Size
-            pOS2MET->SeekRel(5);
-            p->nHeight=ReadBigEndianWord();
-            p->nWidth=ReadBigEndianWord();
-            break;
-
-        case 0x0095:   // Image Encoding
-            break;
-
-        case 0x0096: { // Image IDE-Size
-            BYTE nbyte;
-            *pOS2MET >> nbyte; p->nBitsPerPixel=nbyte;
-            break;
-        }
-
-        case 0x0097:   // Image LUT-ID
-            break;
-
-        case 0x009b:   // IDE Structure
-            break;
-
-        case 0xfe92: { // Image Data
-            // Spaetestens jetzt brauchen wir die temporaere BMP-Datei
-            // und darin mindestens den Header + Palette.
-            if (p->pBMP==NULL) {
-                p->pBMP=new SvMemoryStream();
-                p->pBMP->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
-                if (p->nWidth==0 || p->nHeight==0 || p->nBitsPerPixel==0) {
-                    pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-                    ErrorCode=3;
-                    return;
-                }
-                // Schreibe (Windows-)BITMAPINFOHEADER:
-                *(p->pBMP) << ((sal_uInt32)40) << p->nWidth << p->nHeight;
-                *(p->pBMP) << ((USHORT)1) << p->nBitsPerPixel;
-                *(p->pBMP) << ((sal_uInt32)0) << ((sal_uInt32)0) << ((sal_uInt32)0) << ((sal_uInt32)0);
-                *(p->pBMP) << ((sal_uInt32)0) << ((sal_uInt32)0);
-                // Schreibe Farbtabelle:
-                if (p->nBitsPerPixel<=8) {
-                    USHORT i, nColTabSize=1<<(p->nBitsPerPixel);
-                    for (i=0; i<nColTabSize; i++) *(p->pBMP) << GetPalette0RGB(i);
-                }
-            }
-            // OK, nun werden die Map-Daten ruebergeschoben. Leider haben OS2 und
-            // BMP eine unterschiedliche Reihenfolge von RGB bei 24-Bit.
-            BYTE * pBuf=new BYTE[nDataLen];
-            pOS2MET->Read(pBuf,nDataLen);
-            if (p->nBitsPerPixel==24) {
-                ULONG i, j, nAlign, nBytesPerLine;
-                BYTE nTemp;
-                nBytesPerLine=(p->nWidth*3+3)&0xfffffffc;
-                nAlign=p->nMapPos-(p->nMapPos % nBytesPerLine);
-                i=0;
-                while (nAlign+i+2<p->nMapPos+nDataLen) {
-                    if (nAlign+i>=p->nMapPos) {
-                        j=nAlign+i-p->nMapPos;
-                        nTemp=pBuf[j]; pBuf[j]=pBuf[j+2]; pBuf[j+2]=nTemp;
-                    }
-                    i+=3; if (i+2>=nBytesPerLine) {
-                        nAlign+=nBytesPerLine;
-                        i=0;
-                    }
-                }
-            }
-            p->pBMP->Write(pBuf,nDataLen);
-            p->nMapPos+=nDataLen;
-            delete[] pBuf;
-            break;
-        }
-        case 0x0093:   // End Image Content
-            break;
-
-        case 0x0071:   // End Segment
-            break;
-    }
-}
-
-void OS2METReader::ReadFont(USHORT nFieldSize)
-{
-    ULONG nPos, nMaxPos;
-    USHORT nLen;
-    BYTE nByte, nTripType, nTripType2;
-    OSFont * pF=new OSFont;
-    pF->pSucc=pFontList; pFontList=pF;
-    pF->nID=0;
-    pF->aFont.SetTransparent(TRUE);
-    pF->aFont.SetAlign(ALIGN_BASELINE);
-
-    nPos=pOS2MET->Tell();
-    nMaxPos=nPos+(ULONG)nFieldSize;
-    pOS2MET->SeekRel(2); nPos+=2;
-    while (nPos<nMaxPos && pOS2MET->GetError()==0) {
-        *pOS2MET >> nByte; nLen =((USHORT)nByte) & 0x00ff;
-        *pOS2MET >> nTripType;
-        switch (nTripType) {
-            case 0x02:
-                *pOS2MET >> nTripType2;
-                switch (nTripType2) {
-                    case 0x84:   // Font name
-                        break;
-                    case 0x08: { // Font Typeface
-                        char str[33];
-                        pOS2MET->SeekRel(1);
-                        pOS2MET->Read( &str, 32 );
-                        str[ 32 ] = 0;
-                        String aStr( (const sal_Char*)str, gsl_getSystemTextEncoding() );
-                        if ( aStr.CompareIgnoreCaseToAscii( "Helv" ) == COMPARE_EQUAL )
-                            aStr = String::CreateFromAscii( "Helvetica" );
-                        pF->aFont.SetName( aStr );
-                        break;
-                    }
-                }
-                break;
-            case 0x24:   // Icid
-                *pOS2MET >> nTripType2;
-                switch (nTripType2) {
-                    case 0x05:   //Icid
-                        *pOS2MET >> nByte;
-                        pF->nID=((ULONG)nByte)&0xff;
-                        break;
-                }
-                break;
-            case 0x20:   // Font Binary GCID
-                break;
-            case 0x1f: { // Font Attributes
-                FontWeight eWeight;
-                BYTE nbyte;
-                *pOS2MET >> nbyte;
-                switch (nbyte) {
-                    case 1:  eWeight=WEIGHT_THIN;       break;
-                    case 2:  eWeight=WEIGHT_ULTRALIGHT; break;
-                    case 3:  eWeight=WEIGHT_LIGHT;      break;
-                    case 4:  eWeight=WEIGHT_SEMILIGHT;  break;
-                    case 5:  eWeight=WEIGHT_NORMAL;     break;
-                    case 6:  eWeight=WEIGHT_SEMIBOLD;   break;
-                    case 7:  eWeight=WEIGHT_BOLD;       break;
-                    case 8:  eWeight=WEIGHT_ULTRABOLD;  break;
-                    case 9:  eWeight=WEIGHT_BLACK;      break;
-                    default: eWeight=WEIGHT_DONTKNOW;
-                }
-                pF->aFont.SetWeight(eWeight);
-                break;
-            }
-        }
-        nPos+=nLen; pOS2MET->Seek(nPos);
-    }
-}
-
-void OS2METReader::ReadField(USHORT nFieldType, USHORT nFieldSize)
-{
-    switch (nFieldType) {
-        case BegDocumnMagic:
-            break;
-        case EndDocumnMagic:
-            break;
-        case BegResGrpMagic:
-            break;
-        case EndResGrpMagic:
-            break;
-        case BegColAtrMagic:
-            break;
-        case EndColAtrMagic:
-            break;
-        case BlkColAtrMagic: {
-            ULONG nPos, nMaxPos;
-            BYTE nbyte;
-            ULONG nCol;
-            USHORT nStartIndex, nEndIndex, i, nElemLen, nBytesPerCol;
-
-            nPos=pOS2MET->Tell();
-            nMaxPos=nPos+(ULONG)nFieldSize;
-            pOS2MET->SeekRel(3); nPos+=3;
-            while (nPos<nMaxPos && pOS2MET->GetError()==0) {
-                *pOS2MET >> nbyte; nElemLen=((USHORT)nbyte) & 0x00ff;
-                if (nElemLen>11) {
-                    pOS2MET->SeekRel(4);
-                    nStartIndex=ReadBigEndianWord();
-                    pOS2MET->SeekRel(3);
-                    *pOS2MET >> nbyte; nBytesPerCol=((USHORT)nbyte) & 0x00ff;
-                    nEndIndex=nStartIndex+(nElemLen-11)/nBytesPerCol;
-                    for (i=nStartIndex; i<nEndIndex; i++) {
-                        if (nBytesPerCol > 3) pOS2MET->SeekRel(nBytesPerCol-3);
-                        nCol=ReadBigEndian3BytesLong();
-                        SetPalette0RGB(i,nCol);
-                    }
-                }
-                else if (nElemLen<10) {
-                    pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-                    ErrorCode=4;
-                }
-                nPos+=(ULONG)nElemLen;
-                pOS2MET->Seek(nPos);
-            }
-            break;
-        }
-        case MapColAtrMagic:
-            break;
-        case BegImgObjMagic: {
-            // neue Bitmap schonmal herstellen: (wird spaeter gefuellt)
-            OSBitmap * pB=new OSBitmap;
-            pB->pSucc=pBitmapList; pBitmapList=pB;
-            pB->pBMP=NULL; pB->nWidth=0; pB->nHeight=0; pB->nBitsPerPixel=0;
-            pB->nMapPos=0;
-            // ID der Bitmap ermitteln:
-            BYTE i,nbyte,nbyte2;
-            pB->nID=0;
-            for (i=0; i<4; i++) {
-                *pOS2MET >> nbyte >> nbyte2;
-                nbyte=((nbyte-0x30)<<4)|(nbyte2-0x30);
-                pB->nID=(pB->nID>>8)|(((ULONG)nbyte)<<24);
-            }
-            // neue Palette auf den Paletten-Stack bringen: (wird spaeter gefuellt)
-            OSPalette * pP=new OSPalette;
-            pP->pSucc=pPaletteStack; pPaletteStack=pP;
-            pP->p0RGB=NULL; pP->nSize=0;
-            break;
-        }
-        case EndImgObjMagic: {
-            // Temporaere Windows-BMP-Datei auslesen:
-            if (pBitmapList==NULL || pBitmapList->pBMP==NULL ||
-                pBitmapList->pBMP->GetError()!=0) {
-                pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-                ErrorCode=5;
-                return;
-            }
-            pBitmapList->pBMP->Seek(0);
-
-            pBitmapList->aBitmap.Read( *( pBitmapList->pBMP ), FALSE );
-
-            if (pBitmapList->pBMP->GetError()!=0) {
-                pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-                ErrorCode=6;
-            }
-            delete pBitmapList->pBMP; pBitmapList->pBMP=NULL;
-            // Palette vom Stack killen:
-            OSPalette * pP=pPaletteStack;
-            if (pP!=NULL) {
-                pPaletteStack=pP->pSucc;
-                if (pP->p0RGB!=NULL) delete[] pP->p0RGB;
-                delete pP;
-            }
-            break;
-        }
-        case DscImgObjMagic:
-            break;
-        case DatImgObjMagic: {
-            USHORT nDataID, nDataLen;
-            BYTE nbyte;
-            ULONG nPos, nMaxPos;
-
-            nPos=pOS2MET->Tell();
-            nMaxPos=nPos+(ULONG)nFieldSize;
-            while (nPos<nMaxPos && pOS2MET->GetError()==0) {
-                *pOS2MET >> nbyte; nDataID=((USHORT)nbyte)&0x00ff;
-                if (nDataID==0x00fe) {
-                    *pOS2MET >> nbyte;
-                    nDataID=(nDataID<<8)|(((USHORT)nbyte)&0x00ff);
-                    nDataLen=ReadBigEndianWord();
-                    nPos+=4;
-                }
-                else {
-                    *pOS2MET >> nbyte; nDataLen=((USHORT)nbyte)&0x00ff;
-                    nPos+=2;
-                }
-                ReadImageData(nDataID, nDataLen);
-                nPos+=(ULONG)nDataLen;
-                pOS2MET->Seek(nPos);
-            }
-            break;
-        }
-
-        case BegObEnv1Magic:
-            break;
-        case EndObEnv1Magic:
-            break;
-        case BegGrfObjMagic:
-            break;
-        case EndGrfObjMagic: {
-            SvStream * pSave;
-            ULONG nPos, nMaxPos;
-            USHORT nOrderID, nOrderLen;
-            BYTE nbyte;
-
-            if (pOrdFile==NULL) break;
-
-            // in pOrdFile wurden alle "DatGrfObj"-Felder gesammelt, so
-            // dass die darin enthaltnen "Orders" zusammenhangend und nicht durch
-            // "Fields" segmentiert sind. Um sie aus dem MemoryStream auszulesen,
-            // ohne grosse Umstaende deswegen zu haben (frueher wurden die "Orders"
-            // direkt aus pOS2MET gelesen), hier ein kleiner Trick:
-            pSave=pOS2MET;
-            pOS2MET=pOrdFile; //(!)
-            nMaxPos=pOS2MET->Tell();
-            pOS2MET->Seek(0);
-
-            // "Segmentheader":
-            *pOS2MET >> nbyte;
-            if (nbyte==0x70) { // Header vorhanden
-                pOS2MET->SeekRel(15); // brauchen wir aber nicht
-            }
-            else pOS2MET->SeekRel(-1); // Kein Header, Byte zurueck
-
-            // Schleife ueber Order:
-            while (pOS2MET->Tell()<nMaxPos && pOS2MET->GetError()==0) {
-                *pOS2MET >> nbyte; nOrderID=((USHORT)nbyte) & 0x00ff;
-                if (nOrderID==0x00fe) {
-                    *pOS2MET >> nbyte;
-                    nOrderID=(nOrderID << 8) | (((USHORT)nbyte) & 0x00ff);
-                }
-                if (nOrderID>0x00ff || nOrderID==GOrdPolygn) {
-                    // ooo: Laut OS2-Doku sollte die Orderlaenge nun als Big-Endian-Word
-                    // gegeben sein (Zitat: "Highorder byte precedes loworder byte").
-                    // Tatsaechlich gibt es aber Dateien, die die Laenge als
-                    // Little-Endian-Word angeben (zu mindestens fuer nOrderID==GOrdPolygn).
-                    // Also werfen wir eine Muenze oder was ?
-                    *pOS2MET >> nbyte; nOrderLen=(USHORT)nbyte&0x00ff;
-                    *pOS2MET >> nbyte; if (nbyte!=0) nOrderLen=nOrderLen<<8|(((USHORT)nbyte)&0x00ff);
-                }
-                else if (nOrderID==GOrdSTxAlg || nOrderID==GOrdPTxAlg) nOrderLen=2;
-                else if ((nOrderID&0xff88)==0x0008) nOrderLen=1;
-                else if (nOrderID==0x0000 || nOrderID==0x00ff) nOrderLen=0;
-                else { *pOS2MET >> nbyte; nOrderLen=((USHORT)nbyte) & 0x00ff; }
-                nPos=pOS2MET->Tell();
-                ReadOrder(nOrderID, nOrderLen);
-                if (nPos+nOrderLen < pOS2MET->Tell()) {
-                    OOODEBUG("Order kuerzer als er denkt! OrderID:",nOrderID);
-                    OOODEBUG("...und zwar bei Position (Parameteranfang):",nPos);
-                }
-                else if (nPos+nOrderLen != pOS2MET->Tell()) {
-                    OOODEBUG(String(nOrderID)+String(" Order nicht alles gelesen! bei:"),nPos);
-                }
-                pOS2MET->Seek(nPos+nOrderLen);
-            }
-
-            pOS2MET=pSave;
-            if (pOrdFile->GetError()) {
-                pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-                ErrorCode=10;
-            }
-            delete pOrdFile; pOrdFile=NULL;
-            break;
-        }
-        case DscGrfObjMagic: {
-            ULONG nPos, nMaxPos;
-            USHORT nDscID, nDscLen;
-            BYTE nbyte;
-
-            nMaxPos=pOS2MET->Tell()+(ULONG)nFieldSize;
-            while (pOS2MET->Tell()<nMaxPos && pOS2MET->GetError()==0) {
-                *pOS2MET >> nbyte; nDscID =((USHORT)nbyte) & 0x00ff;
-                *pOS2MET >> nbyte; nDscLen=((USHORT)nbyte) & 0x00ff;
-                nPos=pOS2MET->Tell();
-                ReadDsc(nDscID, nDscLen);
-                pOS2MET->Seek(nPos+nDscLen);
-            }
-            break;
-        }
-        case DatGrfObjMagic: {
-            if (pOrdFile==NULL) {
-                pOrdFile = new SvMemoryStream;
-                pOrdFile->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
-            }
-            BYTE * pBuf; pBuf = new BYTE[nFieldSize];
-            pOS2MET->Read(pBuf,nFieldSize);
-            pOrdFile->Write(pBuf,nFieldSize);
-            delete[] pBuf;
-            break;
-        }
-        case MapCodFntMagic:
-            ReadFont(nFieldSize);
-            break;
-
-        case MapDatResMagic:
-            break;
-    }
-}
-
-void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaFile )
-{
-    USHORT nFieldSize;
-    USHORT nFieldType;
-    ULONG nPos, nStartPos, nEndPos, nPercent, nLastPercent;
-    BYTE nMagicByte;
-
-    ErrorCode=0;
-
-    pOS2MET             = &rStreamOS2MET;
-    nOrigPos            = pOS2MET->Tell();
-    nOrigNumberFormat   = pOS2MET->GetNumberFormatInt();
-
-    bCoord32 = TRUE;
-    pPaletteStack=NULL;
-    pAreaStack=NULL;
-    pPathStack=NULL;
-    pPathList=NULL;
-    pFontList=NULL;
-    pBitmapList=NULL;
-    pAttrStack=NULL;
-
-    aDefAttr.aLinCol     =Color(COL_BLACK);
-    aDefAttr.aLinBgCol   =Color(COL_WHITE);
-    aDefAttr.eLinMix     =ROP_OVERPAINT;
-    aDefAttr.eLinBgMix   =ROP_OVERPAINT;
-    aDefAttr.aChrCol     =Color(COL_BLACK);
-    aDefAttr.aChrBgCol   =Color(COL_WHITE);
-    aDefAttr.eChrMix     =ROP_OVERPAINT;
-    aDefAttr.eChrBgMix   =ROP_OVERPAINT;
-    aDefAttr.aMrkCol     =Color(COL_BLACK);
-    aDefAttr.aMrkBgCol   =Color(COL_WHITE);
-    aDefAttr.eMrkMix     =ROP_OVERPAINT;
-    aDefAttr.eMrkBgMix   =ROP_OVERPAINT;
-    aDefAttr.aPatCol     =Color(COL_BLACK);
-    aDefAttr.aPatBgCol   =Color(COL_WHITE);
-    aDefAttr.ePatMix     =ROP_OVERPAINT;
-    aDefAttr.ePatBgMix   =ROP_OVERPAINT;
-    aDefAttr.aImgCol     =Color(COL_BLACK);
-    aDefAttr.aImgBgCol   =Color(COL_WHITE);
-    aDefAttr.eImgMix     =ROP_OVERPAINT;
-    aDefAttr.eImgBgMix   =ROP_OVERPAINT;
-    aDefAttr.nArcP       =1;
-    aDefAttr.nArcQ       =1;
-    aDefAttr.nArcR       =0;
-    aDefAttr.nArcS       =0;
-    aDefAttr.nChrAng     =0;
-    aDefAttr.aChrCellSize=Size(12,12);
-    aDefAttr.nChrSet     =0;
-    aDefAttr.aCurPos     =Point(0,0);
-    aDefAttr.eLinStyle   =PEN_SOLID;
-    aDefAttr.nLinWidth   =0;
-    aDefAttr.aMrkCellSize=Size(10,10);
-    aDefAttr.nMrkPrec    =0x01;
-    aDefAttr.nMrkSet     =0xff;
-    aDefAttr.nMrkSymbol  =0x01;
-    aDefAttr.bFill       =TRUE;
-    aDefAttr.nStrLinWidth=0;
-
-    aAttr=aDefAttr;
-
-    pOrdFile=NULL;
-
-    pVirDev = new VirtualDevice();
-    pVirDev->EnableOutput(FALSE);
-    rGDIMetaFile.Record(pVirDev);
-
-    pOS2MET->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
-
-    nStartPos=pOS2MET->Tell();
-    nEndPos=pOS2MET->Seek(STREAM_SEEK_TO_END); pOS2MET->Seek(nStartPos);
-    Callback(0); nLastPercent=0;
-
-    nPos=pOS2MET->Tell();
-    if ( nStartPos == nEndPos )
-    {
-        nEndPos = 100;
-        nStartPos = 0;
-    }
-
-    for (;;) {
-
-        nPercent=(nPos-nStartPos)*100/(nEndPos-nStartPos);
-        if (nLastPercent+4<=nPercent) {
-            if (Callback((USHORT)nPercent)==TRUE) break;
-            nLastPercent=nPercent;
-        }
-
-        nFieldSize=ReadBigEndianWord();
-
-        *pOS2MET >> nMagicByte;
-        if (nMagicByte!=0xd3) {
-            pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-            ErrorCode=7;
-            break;
-        }
-        *pOS2MET >> nFieldType;
-
-        pOS2MET->SeekRel(3);
-        nPos+=8; nFieldSize-=8;
-
-        if (pOS2MET->GetError()) break;
-        if (pOS2MET->IsEof()) {
-            pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-            ErrorCode=8;
-            break;
-        }
-
-        if (nFieldType==EndDocumnMagic) break;
-
-        ReadField(nFieldType, nFieldSize);
-
-        nPos+=(ULONG)nFieldSize;
-        if (pOS2MET->Tell()>nPos)  {
-            pOS2MET->SetError(SVSTREAM_FILEFORMAT_ERROR);
-            ErrorCode=9;
-            break;
-        }
-        pOS2MET->Seek(nPos);
-    }
-
-    rGDIMetaFile.Stop();
-    delete pVirDev;
-
-    rGDIMetaFile.SetPrefMapMode( aGlobMapMode );
-
-    if( aBoundingRect.GetWidth() && aBoundingRect.GetHeight() )
-        rGDIMetaFile.SetPrefSize( aBoundingRect.GetSize() );
-    else
-    {
-        if( aCalcBndRect.Left() || aCalcBndRect.Top() )
-            rGDIMetaFile.Move( -aCalcBndRect.Left(), -aCalcBndRect.Top() );
-
-        rGDIMetaFile.SetPrefSize( aCalcBndRect.GetSize() );
-    }
-
-    if (pOrdFile!=NULL) delete pOrdFile;
-
-    while (pAreaStack!=NULL) {
-        OSArea * p=pAreaStack;
-        pAreaStack=p->pSucc;
-        delete p;
-    }
-
-    while (pPathStack!=NULL) {
-        OSPath * p=pPathStack;
-        pPathStack=p->pSucc;
-        delete p;
-    }
-
-    while (pPathList!=NULL) {
-        OSPath * p=pPathList;
-        pPathList=p->pSucc;
-        delete p;
-    }
-
-    while (pFontList!=NULL) {
-        OSFont * p=pFontList;
-        pFontList=p->pSucc;
-        delete p;
-    }
-
-    while (pBitmapList!=NULL) {
-        OSBitmap * p=pBitmapList;
-        pBitmapList=p->pSucc;
-        if (p->pBMP!=NULL) delete p->pBMP;
-        delete p;
-    }
-
-    while (pAttrStack!=NULL) {
-        OSAttr * p=pAttrStack;
-        pAttrStack=p->pSucc;
-        delete p;
-    }
-
-    while (pPaletteStack!=NULL) {
-        OSPalette * p=pPaletteStack;
-        pPaletteStack=p->pSucc;
-        if (p->p0RGB!=NULL) delete[] p->p0RGB;
-        delete p;
-    }
-
-    pOS2MET->SetNumberFormatInt(nOrigNumberFormat);
-
-    if (pOS2MET->GetError()) {
-        OOODEBUG("Fehler Nr.:",ErrorCode);
-        pOS2MET->Seek(nOrigPos);
-    }
-}
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
-{
-    OS2METReader    aOS2METReader;
-    GDIMetaFile     aMTF;
-    BOOL            bRet = FALSE;
-
-    aOS2METReader.ReadOS2MET( rStream, aMTF );
-
-    if ( !rStream.GetError() )
-    {
-        rGraphic=Graphic( aMTF );
-        bRet = TRUE;
-    }
-
-    return bRet;
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/goodies/source/filter.vcl/ios2met/makefile.mk b/goodies/source/filter.vcl/ios2met/makefile.mk
deleted file mode 100644
index c987476316c6..000000000000
--- a/goodies/source/filter.vcl/ios2met/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=ios2met
-DEPTARGET=vios2met
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ios2met.obj
-
-# ==========================================================================
-
-SHL1TARGET=     ime$(DLLPOSTFIX)
-SHL1IMPLIB=     ios2met
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-
-SHL1LIBS=       $(SLB)$/ios2met.lib # $(LB)$/rtftoken.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/ios2met.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-# ==========================================================================
-
-.INCLUDE :  target.mk
-
diff --git a/goodies/source/filter.vcl/ipbm/exports.map b/goodies/source/filter.vcl/ipbm/exports.map
deleted file mode 100644
index 0e2a1bcdec9d..000000000000
--- a/goodies/source/filter.vcl/ipbm/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-PBMIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/ipbm/ipbm.cxx b/goodies/source/filter.vcl/ipbm/ipbm.cxx
deleted file mode 100644
index 227490fc9d8e..000000000000
--- a/goodies/source/filter.vcl/ipbm/ipbm.cxx
+++ /dev/null
@@ -1,567 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ipbm.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <svtools/fltcall.hxx>
-
-//============================ PBMReader ==================================
-
-class PBMReader {
-
-private:
-
-    SvStream*           mpPBM;          // Die einzulesende PBM-Datei
-
-    BOOL                mbStatus;
-    BOOL                mbRemark;       // FALSE wenn sich stream in einem Kommentar befindet
-    BOOL                mbRaw;          // RAW/ASCII MODE
-    ULONG               mnMode;         // 0->PBM, 1->PGM, 2->PPM
-    Bitmap              maBmp;
-    BitmapWriteAccess*  mpAcc;
-    ULONG               mnWidth, mnHeight;  // Bildausmass in Pixeln
-    ULONG               mnCol;
-    ULONG               mnMaxVal;           // maximaler wert in den
-    BOOL                ImplCallback( USHORT nPercent );
-    BOOL                ImplReadBody();
-    BOOL                ImplReadHeader();
-
-public:
-                        PBMReader();
-                        ~PBMReader();
-    BOOL                ReadPBM( SvStream & rPBM, Graphic & rGraphic );
-};
-
-//=================== Methoden von PBMReader ==============================
-
-PBMReader::PBMReader() :
-    mbStatus    ( TRUE ),
-    mbRemark    ( FALSE ),
-    mbRaw       ( TRUE ),
-    mpAcc       ( NULL )
-{
-}
-
-PBMReader::~PBMReader()
-{
-}
-
-BOOL PBMReader::ImplCallback( USHORT /*nPercent*/ )
-{
-/*
-    if ( pCallback != NULL )
-    {
-        if ( ( (*pCallback)( pCallerData, nPercent ) ) == TRUE )
-        {
-            mpPBM->SetError( SVSTREAM_FILEFORMAT_ERROR );
-            return TRUE;
-        }
-    }
-*/
-    return FALSE;
-}
-
-BOOL PBMReader::ReadPBM( SvStream & rPBM, Graphic & rGraphic )
-{
-    USHORT i;
-
-    if ( rPBM.GetError() )
-        return FALSE;
-
-    mpPBM = &rPBM;
-    mpPBM->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-
-    // Kopf einlesen:
-
-    if ( ( mbStatus = ImplReadHeader() ) == FALSE )
-        return FALSE;
-
-    if ( mnWidth == 0 || mnHeight == 0 )
-        return FALSE;
-
-    // 0->PBM, 1->PGM, 2->PPM
-    switch ( mnMode )
-    {
-        case 0 :
-            maBmp = Bitmap( Size( mnWidth, mnHeight ), 1 );
-            if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == FALSE )
-                return FALSE;
-            mpAcc->SetPaletteEntryCount( 2 );
-            mpAcc->SetPaletteColor( 0, BitmapColor( 0xff, 0xff, 0xff ) );
-            mpAcc->SetPaletteColor( 1, BitmapColor( 0x00, 0x00, 0x00 ) );
-            break;
-
-        case 1 :
-            if ( mnMaxVal <= 1 )
-                maBmp = Bitmap( Size( mnWidth, mnHeight ), 1);
-            else if ( mnMaxVal <= 15 )
-                maBmp = Bitmap( Size( mnWidth, mnHeight ), 4);
-            else
-                maBmp = Bitmap( Size( mnWidth, mnHeight ), 8);
-
-            if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == FALSE )
-                return FALSE;
-            mnCol = (USHORT)mnMaxVal + 1;
-            if ( mnCol > 256 )
-                mnCol = 256;
-
-            mpAcc->SetPaletteEntryCount( 256 );
-            for ( i = 0; i < mnCol; i++ )
-            {
-                ULONG nCount = 255 * i / mnCol;
-                mpAcc->SetPaletteColor( i, BitmapColor( (BYTE)nCount, (BYTE)nCount, (BYTE)nCount ) );
-            }
-            break;
-        case 2 :
-            maBmp = Bitmap( Size( mnWidth, mnHeight ), 24 );
-            if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == FALSE )
-                return FALSE;
-            break;
-    }
-
-    // Bitmap-Daten einlesen
-    mbStatus = ImplReadBody();
-
-    if ( mpAcc )
-    {
-        maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
-    }
-    if ( mbStatus )
-        rGraphic = maBmp;
-
-    return mbStatus;
-}
-
-BOOL PBMReader::ImplReadHeader()
-{
-    BYTE    nID[ 2 ];
-    BYTE    nDat;
-    BYTE    nMax, nCount = 0;
-    BOOL    bFinished = FALSE;
-
-    *mpPBM >> nID[ 0 ] >> nID[ 1 ];
-    if ( nID[ 0 ] != 'P' )
-        return FALSE;
-    switch ( nID[ 1 ] )
-    {
-        case '1' :
-            mbRaw = FALSE;
-        case '4' :
-            mnMode = 0;
-            nMax = 2;               // number of parameters in Header
-            break;
-        case '2' :
-            mbRaw = FALSE;
-        case '5' :
-            mnMode = 1;
-            nMax = 3;
-            break;
-        case '3' :
-            mbRaw = FALSE;
-        case '6' :
-            mnMode = 2;
-            nMax = 3;
-            break;
-        default:
-            return FALSE;
-    }
-
-    mnMaxVal = mnWidth = mnHeight = 0;
-
-    while ( bFinished == FALSE )
-    {
-        if ( mpPBM->GetError() )
-            return FALSE;
-
-        *mpPBM >> nDat;
-
-        if ( nDat == '#' )
-        {
-            mbRemark = TRUE;
-            continue;
-        }
-        else if ( ( nDat == 0x0d ) || ( nDat == 0x0a ) )
-        {
-            mbRemark = FALSE;
-            nDat = 0x20;
-        }
-        if ( mbRemark )
-            continue;
-
-        if ( ( nDat == 0x20 ) || ( nDat == 0x09 ) )
-        {
-            if ( ( nCount == 0 ) && mnWidth )
-                nCount++;
-            else if ( ( nCount == 1 ) && mnHeight )
-            {
-                if ( ++nCount == nMax )
-                    bFinished = TRUE;
-            }
-            else if ( ( nCount == 2 ) && mnMaxVal )
-            {
-                bFinished = TRUE;
-            }
-            continue;
-        }
-        if ( ( nDat >= '0' ) && ( nDat <= '9' ) )
-        {
-            nDat -= '0';
-            if ( nCount == 0 )
-            {
-                mnWidth *= 10;
-                mnWidth += nDat;
-            }
-            else if ( nCount == 1 )
-            {
-                mnHeight *= 10;
-                mnHeight += nDat;
-            }
-            else if ( nCount == 2 )
-            {
-                mnMaxVal *= 10;
-                mnMaxVal += nDat;
-            }
-        }
-        else
-            return FALSE;
-    }
-    return mbStatus;
-}
-
-BOOL PBMReader::ImplReadBody()
-{
-    BOOL    bPara, bFinished = FALSE;
-    BYTE    nDat = 0, nCount;
-    ULONG   nGrey, nRGB[3];
-    ULONG   nWidth = 0;
-    ULONG   nHeight = 0;
-    signed char nShift = 0;
-
-    if ( mbRaw )
-    {
-        switch ( mnMode )
-        {
-
-            // PBM
-            case 0 :
-                while ( nHeight != mnHeight )
-                {
-                    if ( mpPBM->IsEof() || mpPBM->GetError() )
-                        return FALSE;
-
-                    if ( --nShift < 0 )
-                    {
-                        *mpPBM >> nDat;
-                        nShift = 7;
-                    }
-                    mpAcc->SetPixel( nHeight, nWidth, nDat >> nShift );
-                    if ( ++nWidth == mnWidth )
-                    {
-                        nShift = 0;
-                        nWidth = 0;
-                        nHeight++;
-                        ImplCallback( (USHORT)( ( 100 * nHeight ) / mnHeight ) );   // processing output in percent
-                    }
-                }
-                break;
-
-            // PGM
-            case 1 :
-                while ( nHeight != mnHeight )
-                {
-                    if ( mpPBM->IsEof() || mpPBM->GetError() )
-                        return FALSE;
-
-                    *mpPBM >> nDat;
-                    mpAcc->SetPixel( nHeight, nWidth++, nDat);
-
-                    if ( nWidth == mnWidth )
-                    {
-                        nWidth = 0;
-                        nHeight++;
-                        ImplCallback( (USHORT)( ( 100 * nHeight ) / mnHeight ) );   // processing output in percent
-                    }
-                }
-                break;
-
-            // PPM
-            case 2 :
-                while ( nHeight != mnHeight )
-                {
-                    if ( mpPBM->IsEof() || mpPBM->GetError() )
-                        return FALSE;
-
-                    BYTE    nR, nG, nB;
-                    ULONG   nRed, nGreen, nBlue;
-                    *mpPBM >> nR >> nG >> nB;
-                    nRed = 255 * nR / mnMaxVal;
-                    nGreen = 255 * nG / mnMaxVal;
-                    nBlue = 255 * nB / mnMaxVal;
-                    mpAcc->SetPixel( nHeight, nWidth++, BitmapColor( (BYTE)nRed, (BYTE)nGreen, (BYTE)nBlue ) );
-                    if ( nWidth == mnWidth )
-                    {
-                        nWidth = 0;
-                        nHeight++;
-                        ImplCallback( (USHORT) ( ( 100 * nHeight ) / mnHeight ) );  // processing output in percent
-                    }
-                }
-                break;
-        }
-    }
-    else switch  ( mnMode )
-    {
-        // PBM
-        case 0 :
-            while ( bFinished == FALSE )
-            {
-                if ( mpPBM->IsEof() || mpPBM->GetError() )
-                    return FALSE;
-
-                *mpPBM >> nDat;
-
-                if ( nDat == '#' )
-                {
-                    mbRemark = TRUE;
-                    continue;
-                }
-                else if ( ( nDat == 0x0d ) || ( nDat == 0x0a ) )
-                {
-                    mbRemark = FALSE;
-                    continue;
-                }
-                if ( mbRemark || nDat == 0x20 || nDat == 0x09 )
-                    continue;
-
-                if ( nDat == '0' || nDat == '1' )
-                {
-                    mpAcc->SetPixel( nHeight, nWidth, (BYTE)nDat-'0' );
-                    nWidth++;
-                    if ( nWidth == mnWidth )
-                    {
-                        nWidth = 0;
-                        if ( ++nHeight == mnHeight )
-                            bFinished = TRUE;
-                        ImplCallback( (USHORT) ( ( 100 * nHeight ) / mnHeight ) );  // processing output in percent
-                    }
-                }
-                else
-                    return FALSE;
-            }
-            break;
-
-        // PGM
-        case 1 :
-
-            bPara = FALSE;
-            nCount = 0;
-            nGrey = 0;
-
-            while ( bFinished == FALSE )
-            {
-                if ( nCount )
-                {
-                    nCount--;
-                    if ( nGrey <= mnMaxVal )
-                        nGrey = 255 * nGrey / mnMaxVal;
-                        mpAcc->SetPixel( nHeight, nWidth++, (BYTE)nGrey );
-                    nGrey = 0;
-                    if ( nWidth == mnWidth )
-                    {
-                        nWidth = 0;
-                        if ( ++nHeight == mnHeight )
-                            bFinished = TRUE;
-                        ImplCallback( (USHORT) ( ( 100 * nHeight ) / mnHeight ) );  // processing output in percent
-                    }
-                    continue;
-                }
-
-                if ( mpPBM->IsEof() || mpPBM->GetError() )
-                    return FALSE;
-
-                *mpPBM >> nDat;
-
-                if ( nDat == '#' )
-                {
-                    mbRemark = TRUE;
-                    if ( bPara )
-                    {
-                        bPara = FALSE;
-                        nCount++;
-                    }
-                    continue;
-                }
-                else if ( ( nDat == 0x0d ) || ( nDat == 0x0a ) )
-                {
-                    mbRemark = FALSE;
-                    if ( bPara )
-                    {
-                        bPara = FALSE;
-                        nCount++;
-                    }
-                    continue;
-                }
-
-                if ( nDat == 0x20 || nDat == 0x09 )
-                {
-                    if ( bPara )
-                    {
-                        bPara = FALSE;
-                        nCount++;
-                    }
-                    continue;
-                }
-                if ( nDat >= '0' && nDat <= '9' )
-                {
-                    bPara = TRUE;
-                    nGrey *= 10;
-                    nGrey += nDat-'0';
-                    continue;
-                }
-                else
-                    return FALSE;
-            }
-            break;
-
-
-
-        // PPM
-        case 2 :
-
-            bPara = FALSE;
-            nCount = 0;
-            nRGB[ 0 ] = nRGB[ 1 ] = nRGB[ 2 ] = 0;
-
-            while ( bFinished == FALSE )
-            {
-                if ( nCount == 3 )
-                {
-                    nCount = 0;
-                    mpAcc->SetPixel( nHeight, nWidth++, BitmapColor( (BYTE)nRGB[ 0 ], (BYTE)nRGB[ 1 ], (BYTE)nRGB[ 2 ] ) );
-                    nCount = 0;
-                    nRGB[ 0 ] = nRGB[ 1 ] = nRGB[ 2 ] = 0;
-                    if ( nWidth == mnWidth )
-                    {
-                        nWidth = 0;
-                        if ( ++nHeight == mnHeight )
-                            bFinished = TRUE;
-                        ImplCallback( (USHORT) ( ( 100 * nHeight ) / mnHeight ) );  // processing output in percent
-                    }
-                    continue;
-                }
-
-                if ( mpPBM->IsEof() || mpPBM->GetError() )
-                    return FALSE;
-
-                *mpPBM >> nDat;
-
-                if ( nDat == '#' )
-                {
-                    mbRemark = TRUE;
-                    if ( bPara )
-                    {
-                        bPara = FALSE;
-                        nCount++;
-                    }
-                    continue;
-                }
-                else if ( ( nDat == 0x0d ) || ( nDat == 0x0a ) )
-                {
-                    mbRemark = FALSE;
-                    if ( bPara )
-                    {
-                        bPara = FALSE;
-                        nCount++;
-                    }
-                    continue;
-                }
-
-                if ( nDat == 0x20 || nDat == 0x09 )
-                {
-                    if ( bPara )
-                    {
-                        bPara = FALSE;
-                        nCount++;
-                    }
-                    continue;
-                }
-                if ( nDat >= '0' && nDat <= '9' )
-                {
-                    bPara = TRUE;
-                    nRGB[ nCount ] *= 10;
-                    nRGB[ nCount ] += nDat-'0';
-                    continue;
-                }
-                else
-                    return FALSE;
-            }
-            break;
-    }
-    return mbStatus;
-}
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
-{
-    PBMReader aPBMReader;
-
-    return aPBMReader.ReadPBM( rStream, rGraphic );
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/goodies/source/filter.vcl/ipbm/makefile.mk b/goodies/source/filter.vcl/ipbm/makefile.mk
deleted file mode 100644
index 84a9815a4974..000000000000
--- a/goodies/source/filter.vcl/ipbm/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=ipbm
-DEPTARGET=vipbm
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/ipbm.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	ipb$(DLLPOSTFIX)
-SHL1IMPLIB= 	ipbm
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=		$(SLB)$/ipbm.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/ipbm.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
-
diff --git a/goodies/source/filter.vcl/ipcd/exports.map b/goodies/source/filter.vcl/ipcd/exports.map
deleted file mode 100644
index a0719af28be2..000000000000
--- a/goodies/source/filter.vcl/ipcd/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-PCDIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/ipcd/ipcd.cxx b/goodies/source/filter.vcl/ipcd/ipcd.cxx
deleted file mode 100644
index f7a5f3652cbf..000000000000
--- a/goodies/source/filter.vcl/ipcd/ipcd.cxx
+++ /dev/null
@@ -1,425 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ipcd.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include "rtl/alloc.h"
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <vcl/svapp.hxx>
-#include <svtools/fltcall.hxx>
-#include <svl/solar.hrc>
-#include <svtools/FilterConfigItem.hxx>
-
-//============================ PCDReader ==================================
-
-// Diese Aufloesungen sind in einer PCD-Datei enthalten:
-enum PCDResolution {
-    PCDRES_BASE16,  //  192 x  128
-    PCDRES_BASE4,   //  384 x  256
-    PCDRES_BASE,    //  768 x  512
-    // Die folgenden sind komprimiert und koennen
-    // von uns NICHT gelesen werden:
-    PCDRES_4BASE,   // 1536 x 1024
-    PCDRES_16BASE   // 3072 x 3072
-};
-
-class PCDReader {
-
-private:
-
-    BOOL bStatus;
-
-    ULONG               nLastPercent;
-
-    SvStream*           pPCD;
-    BitmapWriteAccess*  mpAcc;
-
-    BYTE                nOrientation;   // Ausrichtung des Bildes in der PCD-Datei:
-                                        // 0 - Turmspitze zeigt nach oben
-                                        // 1 - Turmspitze zeigt nach rechts
-                                        // 2 - Turmspitze zeigt nach unten
-                                        // 3 - Turmspitze zeigt nach links
-
-    PCDResolution       eResolution;    // Welche Aufloesung wir haben wollen
-
-    ULONG               nWidth;         // Breite des PCD-Bildes
-    ULONG               nHeight;        // Hoehe des PCD-Bildes
-    ULONG               nImagePos;      // Position des Bildes in der PCD-Datei
-
-    // Temporare BLue-Green-Red-Bitmap
-    ULONG               nBMPWidth;
-    ULONG               nBMPHeight;
-
-    void    MayCallback(ULONG nPercent);
-
-    void    CheckPCDImagePacFile();
-        // Prueft, ob es eine Photo-CD-Datei mit 'Image Pac' ist.
-
-    void    ReadOrientation();
-        // Liest die Ausrichtung und setzt nOrientation
-
-    void    ReadImage(ULONG nMinPercent, ULONG nMaxPercent);
-
-public:
-
-    PCDReader() {}
-    ~PCDReader() {}
-
-    BOOL ReadPCD( SvStream & rPCD, Graphic & rGraphic, FilterConfigItem* pConfigItem );
-};
-
-//=================== Methoden von PCDReader ==============================
-
-BOOL PCDReader::ReadPCD( SvStream & rPCD, Graphic & rGraphic, FilterConfigItem* pConfigItem )
-{
-    Bitmap       aBmp;
-
-    bStatus      = TRUE;
-    nLastPercent = 0;
-    pPCD         = &rPCD;
-
-    MayCallback( 0 );
-
-    // Ist es eine PCD-Datei mit Bild ? ( setzt bStatus == FALSE, wenn nicht ):
-    CheckPCDImagePacFile();
-
-    // Orientierung des Bildes einlesen:
-    ReadOrientation();
-
-    // Welche Aufloesung wollen wir ?:
-    eResolution = PCDRES_BASE;
-    if ( pConfigItem )
-    {
-        sal_Int32 nResolution = pConfigItem->ReadInt32( String( RTL_CONSTASCII_USTRINGPARAM( "Resolution" ) ), 2 );
-        if ( nResolution == 1 )
-            eResolution = PCDRES_BASE4;
-        else if ( nResolution == 0 )
-            eResolution = PCDRES_BASE16;
-    }
-    // Groesse und Position (Position in PCD-Datei) des Bildes bestimmen:
-    switch (eResolution)
-    {
-        case PCDRES_BASE16 :
-            nWidth = 192;
-            nHeight = 128;
-            nImagePos = 8192;
-            break;
-
-        case PCDRES_BASE4 :
-            nWidth = 384;
-            nHeight = 256;
-            nImagePos = 47104;
-            break;
-
-        case PCDRES_BASE :
-            nWidth = 768;
-            nHeight = 512;
-            nImagePos = 196608;
-            break;
-
-        default:
-            bStatus = FALSE;
-    }
-    if ( bStatus )
-    {
-        if ( ( nOrientation & 0x01 ) == 0 )
-        {
-            nBMPWidth = nWidth;
-            nBMPHeight = nHeight;
-        }
-        else
-        {
-            nBMPWidth = nHeight;
-            nBMPHeight = nWidth;
-        }
-        aBmp = Bitmap( Size( nBMPWidth, nBMPHeight ), 24 );
-        if ( ( mpAcc = aBmp.AcquireWriteAccess() ) == FALSE )
-            return FALSE;
-
-        ReadImage( 5 ,65 );
-
-        aBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
-        rGraphic = aBmp;
-    }
-    return bStatus;
-}
-
-// -------------------------------------------------------------------------------------------
-
-void PCDReader::MayCallback(ULONG /*nPercent*/)
-{
-/*
-    if ( nPercent >= nLastPercent + 3 )
-    {
-        nLastPercent=nPercent;
-        if ( pCallback != NULL && nPercent <= 100 && bStatus == TRUE )
-        {
-            if ( ( (*pCallback)( pCallerData, (USHORT)nPercent ) ) == TRUE )
-                bStatus = FALSE;
-        }
-    }
-*/
-}
-
-// -------------------------------------------------------------------------------------------
-
-void PCDReader::CheckPCDImagePacFile()
-{
-    char Buf[ 8 ];
-
-    pPCD->Seek( 2048 );
-    pPCD->Read( Buf, 7 );
-    Buf[ 7 ] = 0;
-    if ( ByteString( Buf ).CompareTo( "PCD_IPI" ) != COMPARE_EQUAL )
-        bStatus = FALSE;
-}
-
-// -------------------------------------------------------------------------------------------
-
-void PCDReader::ReadOrientation()
-{
-    if ( bStatus == FALSE )
-        return;
-    pPCD->Seek( 194635 );
-    *pPCD >> nOrientation;
-    nOrientation &= 0x03;
-}
-
-// -------------------------------------------------------------------------------------------
-
-void PCDReader::ReadImage(ULONG nMinPercent, ULONG nMaxPercent)
-{
-    ULONG  nx,ny,nW2,nH2,nYPair,ndy,nXPair;
-    long   nL,nCb,nCr,nRed,nGreen,nBlue;
-    BYTE * pt;
-    BYTE * pL0; // Luminanz fuer jeden Pixel der 1. Zeile des aktuellen Zeilen-Paars
-    BYTE * pL1; // Luminanz fuer jeden Pixel der 2. Zeile des aktuellen Zeilen-Paars
-    BYTE * pCb; // Blau-Chrominanz fuer je 2x2 Pixel des aktuellen Zeilen-Paars
-    BYTE * pCr; // Rot-Chrominanz fuer je 2x2 Pixel des aktuellen Zeilen-Paars
-    BYTE * pL0N, * pL1N, * pCbN, * pCrN; // wie oben, nur fuer das naechste Zeilen-Paar
-
-    if ( bStatus == FALSE )
-        return;
-
-    nW2=nWidth>>1;
-    nH2=nHeight>>1;
-
-    pL0 =(BYTE*)rtl_allocateMemory( nWidth );
-    pL1 =(BYTE*)rtl_allocateMemory( nWidth );
-    pCb =(BYTE*)rtl_allocateMemory( nW2+1 );
-    pCr =(BYTE*)rtl_allocateMemory( nW2+1 );
-    pL0N=(BYTE*)rtl_allocateMemory( nWidth );
-    pL1N=(BYTE*)rtl_allocateMemory( nWidth );
-    pCbN=(BYTE*)rtl_allocateMemory( nW2+1 );
-    pCrN=(BYTE*)rtl_allocateMemory( nW2+1 );
-
-    if ( pL0 == NULL || pL1 == NULL || pCb == NULL || pCr == NULL ||
-        pL0N == NULL || pL1N == NULL || pCbN == NULL || pCrN == NULL)
-    {
-        rtl_freeMemory((void*)pL0 );
-        rtl_freeMemory((void*)pL1 );
-        rtl_freeMemory((void*)pCb );
-        rtl_freeMemory((void*)pCr );
-        rtl_freeMemory((void*)pL0N);
-        rtl_freeMemory((void*)pL1N);
-        rtl_freeMemory((void*)pCbN);
-        rtl_freeMemory((void*)pCrN);
-        bStatus = FALSE;
-        return;
-    }
-
-    pPCD->Seek( nImagePos );
-
-    // naechstes Zeilen-Paar := erstes Zeile-Paar:
-    pPCD->Read( pL0N, nWidth );
-    pPCD->Read( pL1N, nWidth );
-    pPCD->Read( pCbN, nW2 );
-    pPCD->Read( pCrN, nW2 );
-    pCbN[ nW2 ] = pCbN[ nW2 - 1 ];
-    pCrN[ nW2 ] = pCrN[ nW2 - 1 ];
-
-    for ( nYPair = 0; nYPair < nH2; nYPair++ )
-    {
-        // aktuelles Zeilen-Paar := naechstes Zeilen-Paar
-        pt=pL0; pL0=pL0N; pL0N=pt;
-        pt=pL1; pL1=pL1N; pL1N=pt;
-        pt=pCb; pCb=pCbN; pCbN=pt;
-        pt=pCr; pCr=pCrN; pCrN=pt;
-
-        // naechstes Zeilen-Paar holen:
-        if ( nYPair < nH2 - 1 )
-        {
-            pPCD->Read( pL0N, nWidth );
-            pPCD->Read( pL1N, nWidth );
-            pPCD->Read( pCbN, nW2 );
-            pPCD->Read( pCrN, nW2 );
-            pCbN[nW2]=pCbN[ nW2 - 1 ];
-            pCrN[nW2]=pCrN[ nW2 - 1 ];
-        }
-        else
-        {
-            for ( nXPair = 0; nXPair < nW2; nXPair++ )
-            {
-                pCbN[ nXPair ] = pCb[ nXPair ];
-                pCrN[ nXPair ] = pCr[ nXPair ];
-            }
-        }
-
-        // Schleife uber die beiden Zeilen des Zeilen-Paars:
-        for ( ndy = 0; ndy < 2; ndy++ )
-        {
-            ny = ( nYPair << 1 ) + ndy;
-
-            // Schleife ueber X:
-            for ( nx = 0; nx < nWidth; nx++ )
-            {
-                // nL,nCb,nCr fuer den Pixel nx,ny holen/berechenen:
-                nXPair = nx >> 1;
-                if ( ndy == 0 )
-                {
-                    nL = (long)pL0[ nx ];
-                    if (( nx & 1 ) == 0 )
-                    {
-                        nCb = (long)pCb[ nXPair ];
-                        nCr = (long)pCr[ nXPair ];
-                    }
-                    else
-                    {
-                        nCb = ( ( (long)pCb[ nXPair ] ) + ( (long)pCb[ nXPair + 1 ] ) ) >> 1;
-                        nCr = ( ( (long)pCr[ nXPair ] ) + ( (long)pCr[ nXPair + 1 ] ) ) >> 1;
-                    }
-                }
-                else {
-                    nL = pL1[ nx ];
-                    if ( ( nx & 1 ) == 0 )
-                    {
-                        nCb = ( ( (long)pCb[ nXPair ] ) + ( (long)pCbN[ nXPair ] ) ) >> 1;
-                        nCr = ( ( (long)pCr[ nXPair ] ) + ( (long)pCrN[ nXPair ] ) ) >> 1;
-                    }
-                    else
-                    {
-                        nCb = ( ( (long)pCb[ nXPair ] ) + ( (long)pCb[ nXPair + 1 ] ) +
-                               ( (long)pCbN[ nXPair ] ) + ( (long)pCbN[ nXPair + 1 ] ) ) >> 2;
-                        nCr = ( ( (long)pCr[ nXPair ] ) + ( (long)pCr[ nXPair + 1] ) +
-                               ( (long)pCrN[ nXPair ] ) + ( (long)pCrN[ nXPair + 1 ] ) ) >> 2;
-                    }
-                }
-                // Umwandlung von nL,nCb,nCr in nRed,nGreen,nBlue:
-                nL *= 89024L;
-                nCb -= 156;
-                nCr -= 137;
-                nRed = ( nL + nCr * 119374L + 0x8000 ) >> 16;
-                if ( nRed < 0 )
-                    nRed = 0;
-                if ( nRed > 255)
-                    nRed = 255;
-                nGreen = ( nL - nCb * 28198L - nCr * 60761L + 0x8000 ) >> 16;
-                if ( nGreen < 0 )
-                    nGreen = 0;
-                if ( nGreen > 255 )
-                    nGreen = 255;
-                nBlue = ( nL + nCb * 145352L + 0x8000 ) >> 16;
-                if ( nBlue < 0 )
-                    nBlue = 0;
-                if ( nBlue > 255 )
-                    nBlue = 255;
-
-                // Farbwert in pBMPMap eintragen:
-                if ( nOrientation < 2 )
-                {
-                    if ( nOrientation == 0 )
-                        mpAcc->SetPixel( ny, nx, BitmapColor( (BYTE)nRed, (BYTE)nGreen, (BYTE)nBlue ) );
-                    else
-                        mpAcc->SetPixel( nWidth - 1 - nx, ny, BitmapColor( (BYTE)nRed, (BYTE)nGreen, (BYTE)nBlue ) );
-                }
-                else
-                {
-                    if ( nOrientation == 2 )
-                        mpAcc->SetPixel( nHeight - 1 - ny, ( nWidth - 1 - nx ), BitmapColor( (BYTE)nRed, (BYTE)nGreen, (BYTE)nBlue ) );
-                    else
-                        mpAcc->SetPixel( nx, ( nHeight - 1 - ny ), BitmapColor( (BYTE)nRed, (BYTE)nGreen, (BYTE)nBlue ) );
-                }
-            }
-        }
-
-        if ( pPCD->GetError() )
-            bStatus = FALSE;
-        MayCallback( nMinPercent + ( nMaxPercent - nMinPercent ) * nYPair / nH2 );
-        if ( bStatus == FALSE )
-            break;
-    }
-    rtl_freeMemory((void*)pL0 );
-    rtl_freeMemory((void*)pL1 );
-    rtl_freeMemory((void*)pCb );
-    rtl_freeMemory((void*)pCr );
-    rtl_freeMemory((void*)pL0N);
-    rtl_freeMemory((void*)pL1N);
-    rtl_freeMemory((void*)pCbN);
-    rtl_freeMemory((void*)pCrN);
-}
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem* pConfigItem, BOOL )
-{
-    PCDReader aPCDReader;
-    return aPCDReader.ReadPCD( rStream, rGraphic, pConfigItem );
-}
-
-//============================= fuer Windows ==================================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
-
diff --git a/goodies/source/filter.vcl/ipcd/makefile.mk b/goodies/source/filter.vcl/ipcd/makefile.mk
deleted file mode 100644
index 7782b7b8e627..000000000000
--- a/goodies/source/filter.vcl/ipcd/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# 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
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=ipcd
-DEPTARGET=vipcd
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ipcd.obj
-
-# ==========================================================================
-
-SHL1TARGET=     icd$(DLLPOSTFIX)
-SHL1IMPLIB=     ipcd
-SHL1STDLIBS=    $(SVTOOLLIB) $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=       $(SLB)$/ipcd.lib # $(LB)$/rtftoken.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/ipcd.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/goodies/source/filter.vcl/ipcx/exports.map b/goodies/source/filter.vcl/ipcx/exports.map
deleted file mode 100644
index d44f79111a96..000000000000
--- a/goodies/source/filter.vcl/ipcx/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-PCXIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/ipcx/ipcx.cxx b/goodies/source/filter.vcl/ipcx/ipcx.cxx
deleted file mode 100644
index af8e46c5ba67..000000000000
--- a/goodies/source/filter.vcl/ipcx/ipcx.cxx
+++ /dev/null
@@ -1,461 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ipcx.cxx,v $
- * $Revision: 1.8.30.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_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <svtools/fltcall.hxx>
-
-//============================ PCXReader ==================================
-
-class PCXReader {
-
-private:
-
-    SvStream*           pPCX;               // Die einzulesende PCX-Datei
-
-    Bitmap              aBmp;
-    BitmapWriteAccess*  pAcc;
-    BYTE                nVersion;           // PCX-Version
-    BYTE                nEncoding;          // Art der Komprimierung
-    ULONG               nBitsPerPlanePix;   // Bits Pro Ebene pro Pixel
-    ULONG               nPlanes;            // Anzahl Ebenen
-    ULONG               nBytesPerPlaneLin;  // Bytes in einer Ebenen pro Zeile
-    USHORT              nPaletteInfo;
-
-    ULONG               nWidth, nHeight;    // Bildausmass in Pixeln
-    USHORT              nResX, nResY;       // Aufloesung in Pixel pro Inch oder 0,0
-    USHORT              nDestBitsPerPixel;  // Bits pro Pixel der Zielbitmap 1,4,8 oder 24
-    BYTE*               pPalette;           //
-    BOOL                nStatus;            // status nun nicht mehr am stream abfragen ( SJ )
-
-
-    BOOL                Callback( USHORT nPercent );
-    void                ImplReadBody();
-    void                ImplReadPalette( ULONG nCol );
-    void                ImplReadHeader();
-
-public:
-                        PCXReader();
-                        ~PCXReader();
-    BOOL                ReadPCX( SvStream & rPCX, Graphic & rGraphic );
-                        // Liesst aus dem Stream eine PCX-Datei und fuellt das GDIMetaFile
-};
-
-//=================== Methoden von PCXReader ==============================
-
-PCXReader::PCXReader() :
-    pAcc        ( NULL )
-{
-    pPalette = new BYTE[ 768 ];
-}
-
-PCXReader::~PCXReader()
-{
-    delete[] pPalette;
-}
-
-BOOL PCXReader::Callback( USHORT /*nPercent*/ )
-{
-/*
-    if (pCallback!=NULL) {
-        if (((*pCallback)(pCallerData,nPercent))==TRUE) {
-            nStatus = FALSE;
-            return TRUE;
-        }
-    }
-*/
-    return FALSE;
-}
-
-BOOL PCXReader::ReadPCX( SvStream & rPCX, Graphic & rGraphic )
-{
-    if ( rPCX.GetError() )
-        return FALSE;
-
-    ULONG*  pDummy = new ULONG; delete pDummy; // damit unter OS/2
-                                               // das richtige (Tools-)new
-                                               // verwendet wird, da es sonst
-                                               // in dieser DLL nur Vector-news
-                                               // gibt;
-
-    pPCX = &rPCX;
-    pPCX->SetNumberFormatInt(NUMBERFORMAT_INT_LITTLEENDIAN);
-
-    // Kopf einlesen:
-
-    nStatus = TRUE;
-
-    ImplReadHeader();
-
-    // BMP-Header und ggf. (eventuell zunaechst ungueltige) Farbpalette schreiben:
-    if ( nStatus )
-    {
-        aBmp = Bitmap( Size( nWidth, nHeight ), nDestBitsPerPixel );
-        if ( ( pAcc = aBmp.AcquireWriteAccess() ) == FALSE )
-            return FALSE;
-
-        if ( nDestBitsPerPixel <= 8 )
-        {
-            USHORT nColors = 1 << nDestBitsPerPixel;
-            BYTE* pPal = pPalette;
-            pAcc->SetPaletteEntryCount( nColors );
-            for ( USHORT i = 0; i < nColors; i++, pPal += 3 )
-            {
-                pAcc->SetPaletteColor( i, BitmapColor ( pPal[ 0 ], pPal[ 1 ], pPal[ 2 ] ) );
-            }
-        }
-        // Bitmap-Daten einlesen
-        ImplReadBody();
-
-        // Wenn erweiterte Farbpalette am Ende von PCX, dann diese einlesen, und nochmals
-        // in Palette schreiben:
-        if ( nDestBitsPerPixel == 8 && nStatus )
-        {
-            BYTE* pPal = pPalette;
-            pPCX->SeekRel(1);
-            ImplReadPalette(256);
-            pAcc->SetPaletteEntryCount( 256 );
-            for ( USHORT i = 0; i < 256; i++, pPal += 3 )
-            {
-                pAcc->SetPaletteColor( i, BitmapColor ( pPal[ 0 ], pPal[ 1 ], pPal[ 2 ] ) );
-            }
-        }
-    /*
-        // Aufloesung einstellen:
-        if (nResX!=0 && nResY!=0) {
-            MapMode aMapMode(MAP_INCH,Point(0,0),Fraction(1,nResX),Fraction(1,nResY));
-            rBitmap.SetPrefMapMode(aMapMode);
-            rBitmap.SetPrefSize(Size(nWidth,nHeight));
-        }
-    */  if ( nStatus && pAcc )
-        {
-            aBmp.ReleaseAccess( pAcc ), pAcc = NULL;
-            rGraphic = aBmp;
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-void PCXReader::ImplReadHeader()
-{
-    BYTE nbyte;
-    USHORT nushort;
-    USHORT nMinX,nMinY,nMaxX,nMaxY;
-
-    *pPCX >> nbyte >> nVersion >> nEncoding;
-    if ( nbyte!=0x0a || (nVersion != 0 && nVersion != 2 && nVersion != 3 && nVersion != 5) || nEncoding > 1 )
-    {
-        nStatus = FALSE;
-        return;
-    }
-
-    *pPCX >> nbyte; nBitsPerPlanePix = (ULONG)nbyte;
-    *pPCX >> nMinX >> nMinY >> nMaxX >> nMaxY;
-
-    if ((nMinX > nMaxX) || (nMinY > nMaxY))
-    {
-        nStatus = FALSE;
-        return;
-    }
-
-    nWidth = nMaxX-nMinX+1;
-    nHeight = nMaxY-nMinY+1;
-
-    *pPCX >> nResX;
-    *pPCX >> nResY;
-    if ( nResX >= nWidth || nResY >= nHeight || ( nResX != nResY ) )
-        nResX = nResY = 0;
-
-    ImplReadPalette( 16 );
-
-    pPCX->SeekRel( 1 );
-    *pPCX >> nbyte;   nPlanes = (ULONG)nbyte;
-    *pPCX >> nushort; nBytesPerPlaneLin = (ULONG)nushort;
-    *pPCX >> nPaletteInfo;
-
-    pPCX->SeekRel( 58 );
-
-    nDestBitsPerPixel = (USHORT)( nBitsPerPlanePix * nPlanes );
-    if (nDestBitsPerPixel == 2 || nDestBitsPerPixel == 3) nDestBitsPerPixel = 4;
-
-    if ( ( nDestBitsPerPixel != 1 && nDestBitsPerPixel != 4 && nDestBitsPerPixel != 8 && nDestBitsPerPixel != 24 )
-        || nPlanes > 4 || nBytesPerPlaneLin < ( ( nWidth * nBitsPerPlanePix+7 ) >> 3 ) )
-    {
-        nStatus = FALSE;
-        return;
-    }
-
-    // Wenn das Bild nur 2 Farben hat, ist die Palette zumeist ungueltig, und es handelt sich
-    // immer (?) um ein schwarz-weiss-Bild:
-    if ( nPlanes == 1 && nBitsPerPlanePix == 1 )
-    {
-        pPalette[ 0 ] = pPalette[ 1 ] = pPalette[ 2 ] = 0x00;
-        pPalette[ 3 ] = pPalette[ 4 ] = pPalette[ 5 ] = 0xff;
-    }
-}
-
-void PCXReader::ImplReadBody()
-{
-    BYTE    *pPlane[ 4 ], * pDest, * pSource1, * pSource2, * pSource3, *pSource4;
-    ULONG   i, nx, ny, np, nCount, nUsedLineSize, nLineSize, nPercent;
-    ULONG   nLastPercent = 0;
-    BYTE    nDat = 0, nCol = 0;
-
-    nUsedLineSize = (ULONG)( ( ( nWidth * (ULONG)nDestBitsPerPixel ) + 7 ) >> 3 );
-    nLineSize = ( nUsedLineSize + 3 ) & 0xfffc;
-
-    for( np = 0; np < nPlanes; np++ )
-        pPlane[ np ] = new BYTE[ nBytesPerPlaneLin ];
-
-    nCount = 0;
-    for ( ny = 0; ny < nHeight; ny++ )
-    {
-        if (pPCX->GetError() || pPCX->IsEof())
-        {
-            nStatus = FALSE;
-            break;
-        }
-        nPercent = ny * 60 / nHeight + 10;
-        if ( ny == 0 || nLastPercent + 4 <= nPercent )
-        {
-            nLastPercent = nPercent;
-            if ( Callback( (USHORT)nPercent ) == TRUE )
-                break;
-        }
-        for ( np = 0; np < nPlanes; np++)
-        {
-            if ( nEncoding == 0)
-                pPCX->Read( (void *)pPlane[ np ], nBytesPerPlaneLin );
-            else
-            {
-                pDest = pPlane[ np ];
-                nx = nBytesPerPlaneLin;
-                while ( nCount > 0 && nx > 0)
-                {
-                    *(pDest++) = nDat;
-                    nx--;
-                    nCount--;
-                }
-                while ( nx > 0 )
-                {
-                    *pPCX >> nDat;
-                    if ( ( nDat & 0xc0 ) == 0xc0 )
-                    {
-                        nCount =( (ULONG)nDat ) & 0x003f;
-                        *pPCX >> nDat;
-                        if ( nCount < nx )
-                        {
-                            nx -= nCount;
-                            while ( nCount > 0)
-                            {
-                                *(pDest++) = nDat;
-                                nCount--;
-                            }
-                        }
-                        else
-                        {
-                            nCount -= nx;
-                            do
-                            {
-                                *(pDest++) = nDat;
-                                nx--;
-                            }
-                            while ( nx > 0 );
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        *(pDest++) = nDat;
-                        nx--;
-                    }
-                }
-            }
-        }
-        pSource1 = pPlane[ 0 ];
-        pSource2 = pPlane[ 1 ];
-        pSource3 = pPlane[ 2 ];
-        pSource4 = pPlane[ 3 ];
-        switch ( nBitsPerPlanePix + ( nPlanes << 8 ) )
-        {
-            // 2 colors
-            case 0x101 :
-                for ( i = 0; i < nWidth; i++ )
-                {
-                    ULONG nShift = ( i & 7 ) ^ 7;
-                    if ( nShift == 0 )
-                        pAcc->SetPixel( ny, i, ( *pSource1++ & 1 ) );
-                    else
-                        pAcc->SetPixel(
-                            ny, i,
-                            sal::static_int_cast< BYTE >(
-                                ( *pSource1 >> nShift ) & 1) );
-                }
-                break;
-            // 4 colors
-            case 0x102 :
-                for ( i = 0; i < nWidth; i++ )
-                {
-                    switch( i & 3 )
-                    {
-                        case 0 :
-                            nCol = *pSource1 >> 6;
-                            break;
-                        case 1 :
-                            nCol = ( *pSource1 >> 4 ) & 0x03 ;
-                            break;
-                        case 2 :
-                            nCol = ( *pSource1 >> 2 ) & 0x03;
-                            break;
-                        case 3 :
-                            nCol = ( *pSource1++ ) & 0x03;
-                            break;
-                    }
-                    pAcc->SetPixel( ny, i, nCol );
-                }
-                break;
-            // 256 colors
-            case 0x108 :
-                for ( i = 0; i < nWidth; i++ )
-                {
-                    pAcc->SetPixel( ny, i, *pSource1++ );
-                }
-                break;
-            // 8 colors
-            case 0x301 :
-                for ( i = 0; i < nWidth; i++ )
-                {
-                    ULONG nShift = ( i & 7 ) ^ 7;
-                    if ( nShift == 0 )
-                    {
-                        nCol = ( *pSource1++ & 1) + ( ( *pSource2++ << 1 ) & 2 ) + ( ( *pSource3++ << 2 ) & 4 );
-                        pAcc->SetPixel( ny, i, nCol );
-                    }
-                    else
-                    {
-                        nCol = sal::static_int_cast< BYTE >(
-                            ( ( *pSource1 >> nShift ) & 1)  + ( ( ( *pSource2 >> nShift ) << 1 ) & 2 ) +
-                            ( ( ( *pSource3 >> nShift ) << 2 ) & 4 ));
-                        pAcc->SetPixel( ny, i, nCol );
-                    }
-                }
-                break;
-            // 16 colors
-            case 0x401 :
-                for ( i = 0; i < nWidth; i++ )
-                {
-                    ULONG nShift = ( i & 7 ) ^ 7;
-                    if ( nShift == 0 )
-                    {
-                        nCol = ( *pSource1++ & 1) + ( ( *pSource2++ << 1 ) & 2 ) + ( ( *pSource3++ << 2 ) & 4 ) +
-                            ( ( *pSource4++ << 3 ) & 8 );
-                        pAcc->SetPixel( ny, i, nCol );
-                    }
-                    else
-                    {
-                        nCol = sal::static_int_cast< BYTE >(
-                            ( ( *pSource1 >> nShift ) & 1)  + ( ( ( *pSource2 >> nShift ) << 1 ) & 2 ) +
-                            ( ( ( *pSource3 >> nShift ) << 2 ) & 4 ) + ( ( ( *pSource4 >> nShift ) << 3 ) & 8 ));
-                        pAcc->SetPixel( ny, i, nCol );
-                    }
-                }
-                break;
-            // 16m colors
-            case 0x308 :
-                for ( i = 0; i < nWidth; i++ )
-                {
-                    pAcc->SetPixel( ny, i, Color( *pSource1++, *pSource2++, *pSource3++ ) );
-
-                }
-                break;
-            default :
-                nStatus = FALSE;
-                break;
-        }
-    }
-    for ( np = 0; np < nPlanes; np++ )
-        delete[] pPlane[ np ];
-}
-
-void PCXReader::ImplReadPalette( ULONG nCol )
-{
-    BYTE    r, g, b;
-    BYTE*   pPtr = pPalette;
-    for ( ULONG i = 0; i < nCol; i++ )
-    {
-        *pPCX >> r >> g >> b;
-        *pPtr++ = r;
-        *pPtr++ = g;
-        *pPtr++ = b;
-    }
-}
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
-{
-    PCXReader aPCXReader;
-    BOOL nRetValue = aPCXReader.ReadPCX( rStream, rGraphic );
-    if ( nRetValue == FALSE )
-        rStream.SetError( SVSTREAM_FILEFORMAT_ERROR );
-    return nRetValue;
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/goodies/source/filter.vcl/ipcx/makefile.mk b/goodies/source/filter.vcl/ipcx/makefile.mk
deleted file mode 100644
index 7f0f309ae786..000000000000
--- a/goodies/source/filter.vcl/ipcx/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=ipcx
-DEPTARGET=vipcx
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ipcx.obj
-
-# ==========================================================================
-
-SHL1TARGET=     ipx$(DLLPOSTFIX)
-SHL1IMPLIB=     ipcx
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=       $(SLB)$/ipcx.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/ipcx.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/goodies/source/filter.vcl/ipict/exports.map b/goodies/source/filter.vcl/ipict/exports.map
deleted file mode 100644
index 2576cecdca91..000000000000
--- a/goodies/source/filter.vcl/ipict/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-PICTIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/ipict/ipict.cxx b/goodies/source/filter.vcl/ipict/ipict.cxx
deleted file mode 100644
index 0ad31ff39acf..000000000000
--- a/goodies/source/filter.vcl/ipict/ipict.cxx
+++ /dev/null
@@ -1,1940 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ipict.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <string.h>
-#include <vcl/bmpacc.hxx>
-#include <vcl/graph.hxx>
-#include <tools/poly.hxx>
-#include <vcl/virdev.hxx>
-#include <svtools/fltcall.hxx>
-#include <math.h>
-
-// MT: NOOLDSV, someone should change the code...
-enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
-enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
-                  BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG,
-                  BRUSH_25, BRUSH_50, BRUSH_75,
-                  BRUSH_BITMAP };
-
-//============================ PictReader ==================================
-
-enum PictDrawingMethod {
-    PDM_FRAME, PDM_PAINT, PDM_ERASE, PDM_INVERT, PDM_FILL,
-    PDM_TEXT, PDM_UNDEFINED
-};
-
-class PictReader {
-
-private:
-
-    SvStream    * pPict;             // Die einzulesende Pict-Datei
-    VirtualDevice * pVirDev;         // Hier werden die Drawing-Methoden aufgerufen.
-                                     // Dabei findet ein Recording in das GDIMetaFile
-                                     // statt.
-    ULONG         nOrigPos;          // Anfaengliche Position in pPict
-    UINT16        nOrigNumberFormat; // Anfaengliches Nummern-Format von pPict
-    BOOL          IsVersion2;        // Ob es ein Version 2 Pictfile ist.
-    Rectangle     aBoundingRect;     // Min/Max-Rechteck fuer die ganze Zeichnung
-
-    Point         aPenPosition;
-    Point         aTextPosition;
-    Color         aActForeColor;
-    Color         aActBackColor;
-    PenStyle      eActPenPenStyle;
-    BrushStyle    eActPenBrushStyle;
-    BrushStyle    eActFillStyle;
-    BrushStyle    eActBackStyle;
-    USHORT        nActPenSize;
-    RasterOp      eActROP;
-    PictDrawingMethod eActMethod;
-    Size          aActOvalSize;
-    Font          aActFont;
-
-    Fraction        aHRes;
-    Fraction        aVRes;
-
-    BOOL Callback(USHORT nPercent);
-
-    Point ReadPoint();
-
-    Point ReadDeltaH(Point aBase);
-    Point ReadDeltaV(Point aBase);
-
-    Point ReadUnsignedDeltaH(Point aBase);
-    Point ReadUnsignedDeltaV(Point aBase);
-
-    Size ReadSize();
-
-    Color ReadColor();
-
-    Color ReadRGBColor();
-
-    void ReadRectangle(Rectangle & rRect);
-
-    ULONG ReadPolygon(Polygon & rPoly);
-
-    ULONG ReadPattern(PenStyle * pPenStyle, BrushStyle * pBrushStyle);
-
-    ULONG ReadPixPattern(PenStyle * pPenStyle, BrushStyle * pBrushStyle);
-
-    Rectangle aLastRect;
-    ULONG ReadAndDrawRect(PictDrawingMethod eMethod);
-    ULONG ReadAndDrawSameRect(PictDrawingMethod eMethod);
-
-    Rectangle aLastRoundRect;
-    ULONG ReadAndDrawRoundRect(PictDrawingMethod eMethod);
-    ULONG ReadAndDrawSameRoundRect(PictDrawingMethod eMethod);
-
-    Rectangle aLastOval;
-    ULONG ReadAndDrawOval(PictDrawingMethod eMethod);
-    ULONG ReadAndDrawSameOval(PictDrawingMethod eMethod);
-
-    Polygon aLastPolygon;
-    ULONG ReadAndDrawPolygon(PictDrawingMethod eMethod);
-    ULONG ReadAndDrawSamePolygon(PictDrawingMethod eMethod);
-
-    Rectangle aLastArcRect;
-    ULONG ReadAndDrawArc(PictDrawingMethod eMethod);
-    ULONG ReadAndDrawSameArc(PictDrawingMethod eMethod);
-
-    ULONG ReadAndDrawRgn(PictDrawingMethod eMethod);
-    ULONG ReadAndDrawSameRgn(PictDrawingMethod eMethod);
-
-    void DrawingMethod(PictDrawingMethod eMethod);
-
-    ULONG ReadAndDrawText();
-
-    ULONG ReadPixMapEtc(Bitmap & rBitmap, BOOL bBaseAddr, BOOL bColorTable,
-                        Rectangle * pSrcRect, Rectangle * pDestRect,
-                        BOOL bMode, BOOL bMaskRgn);
-
-    void ReadHeader();
-        // Liesst den Kopf der Pict-Datei, setzt IsVersion2 und aBoundingRect
-
-    ULONG ReadData(USHORT nOpcode);
-        // Liesst die Daten eines Opcodes ein und fuehrt die Operation aus.
-        // Auf jeden Fall wird die Anzahl der Datenbytes zu dem Opcode
-        // zurueckgeliefert.
-
-    void SetLineColor( const Color& rColor );
-    void SetFillColor( const Color& rColor );
-
-public:
-
-    PictReader() {}
-
-    void ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile );
-        // Liesst aus dem Stream eine Pict-Datei und fuellt das GDIMetaFile
-
-};
-
-//------------------------------------------------------------------------------------------------
-
-#define SETBYTE                                         \
-    switch ( nPixelSize )                               \
-    {                                                   \
-        case 1 :                                        \
-            pAcc->SetPixel( ny, nx++, nDat >> 7 );      \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat >> 6 );      \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat >> 5 );      \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat >> 4 );      \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat >> 3 );      \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat >> 2 );      \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat >> 1 );      \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat );           \
-            break;                                      \
-        case 2 :                                        \
-            pAcc->SetPixel( ny, nx++, nDat >> 6 );      \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat >> 4 & 3);   \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat >> 2 & 3 );  \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat & 3);        \
-            break;                                      \
-        case 4 :                                        \
-            pAcc->SetPixel( ny, nx++, nDat >> 4 );      \
-            if ( nx == nWidth ) break;                  \
-            pAcc->SetPixel( ny, nx++, nDat );           \
-            break;                                      \
-        case 8 :                                        \
-            pAcc->SetPixel( ny, nx++, nDat );           \
-            break;                                      \
-    }
-
-//------------------------------------------------------------------------------------------------
-
-#define BITMAPERROR                                     \
-{                                                       \
-    if ( pAcc )                                         \
-        aBitmap.ReleaseAccess( pAcc );                  \
-    if ( pReadAcc )                                     \
-        aBitmap.ReleaseAccess( pReadAcc );              \
-    return 0xffffffff;                                  \
-}
-
-//=================== Methoden von PictReader ==============================
-
-void PictReader::SetLineColor( const Color& rColor )
-{
-    pVirDev->SetLineColor( rColor );
-}
-
-void PictReader::SetFillColor( const Color& rColor )
-{
-    pVirDev->SetFillColor( rColor );
-}
-
-BOOL PictReader::Callback(USHORT /*nPercent*/)
-{
-/*
-    if (pCallback!=NULL) {
-        if (((*pCallback)(pCallerData,nPercent))==TRUE) {
-            pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
-            return TRUE;
-        }
-    }
-*/
-    return FALSE;
-}
-
-Point PictReader::ReadPoint()
-{
-    short nx,ny;
-
-    *pPict >> ny >> nx;
-
-   return Point( (long)nx - aBoundingRect.Left(),
-                 (long)ny - aBoundingRect.Top() );
-}
-
-Point PictReader::ReadDeltaH(Point aBase)
-{
-    signed char ndh;
-
-    *pPict >> ((char&)ndh);
-
-    return Point( aBase.X() + (long)ndh, aBase.Y() );
-}
-
-Point PictReader::ReadDeltaV(Point aBase)
-{
-    signed char ndv;
-
-    *pPict >> ((char&)ndv);
-
-    return Point( aBase.X(), aBase.Y() + (long)ndv );
-}
-
-Point PictReader::ReadUnsignedDeltaH(Point aBase)
-{
-    sal_uInt8 ndh;
-
-    *pPict >> ndh;
-
-    return Point( aBase.X() + (long)ndh, aBase.Y() );
-}
-
-Point PictReader::ReadUnsignedDeltaV(Point aBase)
-{
-    sal_uInt8 ndv;
-
-    *pPict >> ndv;
-
-    return Point( aBase.X(), aBase.Y() + (long)ndv );
-}
-
-Size PictReader::ReadSize()
-{
-    short nx,ny;
-
-    *pPict >> ny >> nx;
-
-    return Size( (long)nx, (long)ny );
-}
-
-Color PictReader::ReadColor()
-{
-    sal_uInt32 nCol;
-    Color aCol;
-
-    *pPict >> nCol;
-    switch (nCol)
-    {
-        case  33: aCol=Color( COL_BLACK );        break;
-        case  30: aCol=Color( COL_WHITE );        break;
-        case 205: aCol=Color( COL_LIGHTRED );     break;
-        case 341: aCol=Color( COL_LIGHTGREEN );   break;
-        case 409: aCol=Color( COL_LIGHTBLUE );    break;
-        case 273: aCol=Color( COL_LIGHTCYAN );    break;
-        case 137: aCol=Color( COL_LIGHTMAGENTA ); break;
-        case  69: aCol=Color( COL_YELLOW );       break;
-        default:  aCol=Color( COL_LIGHTGRAY );
-    }
-    return aCol;
-}
-
-
-Color PictReader::ReadRGBColor()
-{
-    USHORT nR, nG, nB;
-
-    *pPict >> nR >> nG >> nB;
-    return Color( (BYTE) ( nR >> 8 ), (BYTE) ( nG >> 8 ), (BYTE) ( nB >> 8 ) );
-}
-
-
-void PictReader::ReadRectangle(Rectangle & rRect)
-{
-    Point aTopLeft, aBottomRight;
-
-    aTopLeft=ReadPoint();
-    aBottomRight=ReadPoint();
-    aBottomRight.X() -= 1;
-    aBottomRight.Y() -= 1;
-    rRect=Rectangle(aTopLeft,aBottomRight);
-}
-
-
-ULONG PictReader::ReadPolygon(Polygon & rPoly)
-{
-    USHORT nSize,i;
-    ULONG nDataSize;
-
-    *pPict >> nSize;
-    pPict->SeekRel(8);
-    nDataSize=(ULONG)nSize;
-    nSize=(nSize-10)/4;
-    rPoly.SetSize(nSize);
-    for (i=0; i<nSize; i++) rPoly.SetPoint(ReadPoint(),i);
-    return nDataSize;
-}
-
-ULONG PictReader::ReadPattern(PenStyle * pPenStyle, BrushStyle * pBrushStyle)
-{
-    short nx,ny,nBitCount;
-    unsigned char nbyte[8];
-    BrushStyle eBrStyle;
-    PenStyle ePnStyle;
-    ULONG nHiBytes, nLoBytes;
-
-    // Anzahl der Bits im Pattern zaehlen, die auf 1 gesetzt sind:
-    nBitCount=0;
-    for (ny=0; ny<8; ny++) {
-        *pPict >> ((char&)nbyte[ny]);
-        for (nx=0; nx<8; nx++) {
-            if ( (nbyte[ny] & (1<<nx)) != 0 ) nBitCount++;
-        }
-    }
-
-    // Pattern in 2 Langworten unterbringen:
-    nHiBytes=(((((((ULONG)nbyte[0])<<8)|
-                 (ULONG)nbyte[1])<<8)|
-               (ULONG)nbyte[2])<<8)|
-             (ULONG)nbyte[3];
-    nLoBytes=(((((((ULONG)nbyte[4])<<8)|
-                 (ULONG)nbyte[5])<<8)|
-               (ULONG)nbyte[6])<<8)|
-             (ULONG)nbyte[7];
-
-    // Einen PenStyle machen:
-    if      (nBitCount<=0)  ePnStyle=PEN_NULL;
-    else if (nBitCount<=16) ePnStyle=PEN_DOT;
-    else if (nBitCount<=32) ePnStyle=PEN_DASHDOT;
-    else if (nBitCount<=48) ePnStyle=PEN_DASH;
-    else                    ePnStyle=PEN_SOLID;
-
-    // Einen BrushStyle machen:
-    if      (nHiBytes==0xffffffff && nLoBytes==0xffffffff) eBrStyle=BRUSH_SOLID;
-    else if (nHiBytes==0xff000000 && nLoBytes==0x00000000) eBrStyle=BRUSH_HORZ;
-    else if (nHiBytes==0x80808080 && nLoBytes==0x80808080) eBrStyle=BRUSH_VERT;
-    else if (nHiBytes==0xff808080 && nLoBytes==0x80808080) eBrStyle=BRUSH_CROSS;
-    else if (nHiBytes==0x01824428 && nLoBytes==0x10284482) eBrStyle=BRUSH_DIAGCROSS;
-    else if (nHiBytes==0x80402010 && nLoBytes==0x08040201) eBrStyle=BRUSH_UPDIAG;
-    else if (nHiBytes==0x01020408 && nLoBytes==0x10204080) eBrStyle=BRUSH_DOWNDIAG;
-    else if (nBitCount<=24) eBrStyle=BRUSH_25;
-    else if (nBitCount<=40) eBrStyle=BRUSH_50;
-    else if (nBitCount<=56) eBrStyle=BRUSH_75;
-    else                    eBrStyle=BRUSH_SOLID;
-
-    if (pPenStyle!=0) *pPenStyle=ePnStyle;
-
-    if (pBrushStyle!=0) *pBrushStyle=eBrStyle;
-
-    return 8;
-}
-
-ULONG PictReader::ReadPixPattern(PenStyle * pPenStyle, BrushStyle * pBrushStyle)
-{
-    // Keine Ahnung, ob dies richtig ist, weil kein Bild gefunden, das
-    // PixPatterns enthaelt. Auch hier nur der Versuch, die Groesse der Daten zu
-    // ermitteln, und einfache StarView-Styles daraus zu machen. Gluecklicherweise
-    // enthaelt ein PixPattern immer auch ein normales Pattern.
-
-    ULONG nDataSize;
-    USHORT nPatType;
-    Bitmap aBMP;
-
-    *pPict >> nPatType;
-    if (nPatType==1) {
-        ReadPattern(pPenStyle,pBrushStyle);
-        nDataSize=ReadPixMapEtc(aBMP,FALSE,TRUE,NULL,NULL,FALSE,FALSE);
-        if (nDataSize!=0xffffffff) nDataSize+=10;
-    }
-    else if (nPatType==2) {
-        ReadPattern(pPenStyle,pBrushStyle);
-        pPict->SeekRel(6); // RGBColor
-        nDataSize=16;
-    }
-    else nDataSize=0xffffffff;
-
-    return nDataSize;
-}
-
-ULONG PictReader::ReadAndDrawRect(PictDrawingMethod eMethod)
-{
-    ReadRectangle(aLastRect);
-    DrawingMethod(eMethod);
-    pVirDev->DrawRect(aLastRect);
-    return 8;
-}
-
-ULONG PictReader::ReadAndDrawSameRect(PictDrawingMethod eMethod)
-{
-    DrawingMethod(eMethod);
-    pVirDev->DrawRect(aLastRect);
-    return 0;
-}
-
-ULONG PictReader::ReadAndDrawRoundRect(PictDrawingMethod eMethod)
-{
-    ReadRectangle(aLastRoundRect);
-    DrawingMethod(eMethod);
-    pVirDev->DrawRect(aLastRoundRect,aActOvalSize.Width(),aActOvalSize.Height());
-    return 8;
-}
-
-ULONG PictReader::ReadAndDrawSameRoundRect(PictDrawingMethod eMethod)
-{
-    DrawingMethod(eMethod);
-    pVirDev->DrawRect(aLastRoundRect,aActOvalSize.Width(),aActOvalSize.Height());
-    return 0;
-}
-
-ULONG PictReader::ReadAndDrawOval(PictDrawingMethod eMethod)
-{
-    ReadRectangle(aLastOval);
-    DrawingMethod(eMethod);
-    pVirDev->DrawEllipse(aLastOval);
-    return 8;
-}
-
-ULONG PictReader::ReadAndDrawSameOval(PictDrawingMethod eMethod)
-{
-    DrawingMethod(eMethod);
-    pVirDev->DrawEllipse(aLastOval);
-    return 0;
-}
-
-ULONG PictReader::ReadAndDrawPolygon(PictDrawingMethod eMethod)
-{
-    ULONG nDataSize;
-
-    nDataSize=ReadPolygon(aLastPolygon);
-    DrawingMethod(eMethod);
-    if (eMethod==PDM_FRAME) pVirDev->DrawPolyLine(aLastPolygon);
-    else pVirDev->DrawPolygon(aLastPolygon);
-    return nDataSize;
-}
-
-ULONG PictReader::ReadAndDrawSamePolygon(PictDrawingMethod eMethod)
-{
-    DrawingMethod(eMethod);
-    if (eMethod==PDM_FRAME) pVirDev->DrawPolyLine(aLastPolygon);
-    else pVirDev->DrawPolygon(aLastPolygon);
-    return 0;
-}
-
-
-ULONG PictReader::ReadAndDrawArc(PictDrawingMethod eMethod)
-{
-    short nstartAngle, narcAngle;
-    double fAng1, fAng2;
-    Point aStartPt, aEndPt, aCenter;
-
-    ReadRectangle(aLastArcRect);
-    *pPict >> nstartAngle >> narcAngle;
-    if (narcAngle<0) {
-        nstartAngle = nstartAngle + narcAngle;
-        narcAngle=-narcAngle;
-    }
-    fAng1=((double)nstartAngle)/180.0*3.14159265359;
-    fAng2=((double)(nstartAngle+narcAngle))/180.0*3.14159265359;
-    aCenter=Point((aLastArcRect.Left()+aLastArcRect.Right())/2,
-                  (aLastArcRect.Top()+aLastArcRect.Bottom())/2);
-    aStartPt=Point(aCenter.X()+(long)( sin(fAng2)*256.0),
-                   aCenter.Y()+(long)(-cos(fAng2)*256.0));
-    aEndPt=  Point(aCenter.X()+(long)( sin(fAng1)*256.0),
-                   aCenter.Y()+(long)(-cos(fAng1)*256.0));
-    DrawingMethod(eMethod);
-    if (eMethod==PDM_FRAME) pVirDev->DrawArc(aLastArcRect,aStartPt,aEndPt);
-    else pVirDev->DrawPie(aLastArcRect,aStartPt,aEndPt);
-    return 12;
-}
-
-ULONG PictReader::ReadAndDrawSameArc(PictDrawingMethod eMethod)
-{
-    short nstartAngle, narcAngle;
-    double fAng1, fAng2;
-    Point aStartPt, aEndPt, aCenter;
-
-    *pPict >> nstartAngle >> narcAngle;
-    if (narcAngle<0) {
-        nstartAngle = nstartAngle + narcAngle;
-        narcAngle=-narcAngle;
-    }
-    fAng1=((double)nstartAngle)/180.0*3.14159265359;
-    fAng2=((double)(nstartAngle+narcAngle))/180.0*3.14159265359;
-    aCenter=Point((aLastArcRect.Left()+aLastArcRect.Right())/2,
-                  (aLastArcRect.Top()+aLastArcRect.Bottom())/2);
-    aStartPt=Point(aCenter.X()+(long)( sin(fAng2)*256.0),
-                   aCenter.Y()+(long)(-cos(fAng2)*256.0));
-    aEndPt=  Point(aCenter.X()+(long)( sin(fAng1)*256.0),
-                   aCenter.Y()+(long)(-cos(fAng1)*256.0));
-        DrawingMethod(eMethod);
-    if (eMethod==PDM_FRAME) pVirDev->DrawArc(aLastArcRect,aStartPt,aEndPt);
-    else pVirDev->DrawPie(aLastArcRect,aStartPt,aEndPt);
-    return 4;
-}
-
-ULONG PictReader::ReadAndDrawRgn(PictDrawingMethod eMethod)
-{
-    USHORT nSize;
-
-        DrawingMethod(eMethod);
-    *pPict >> nSize;
-    // ...???...
-    return (ULONG)nSize;
-}
-
-ULONG PictReader::ReadAndDrawSameRgn(PictDrawingMethod eMethod)
-{
-        DrawingMethod(eMethod);
-    // ...???...
-    return 0;
-}
-
-void PictReader::DrawingMethod(PictDrawingMethod eMethod)
-{
-    if( eActMethod==eMethod ) return;
-    switch (eMethod) {
-        case PDM_FRAME:
-            SetLineColor( aActForeColor );
-            SetFillColor( Color(COL_TRANSPARENT) );
-            pVirDev->SetRasterOp(eActROP);
-            break;
-        case PDM_PAINT:
-            SetLineColor( Color(COL_TRANSPARENT) );
-            SetFillColor( aActForeColor );
-            pVirDev->SetRasterOp(eActROP);
-            break;
-        case PDM_ERASE:
-            SetLineColor( Color(COL_TRANSPARENT) );
-            SetFillColor( aActForeColor );
-            pVirDev->SetRasterOp(ROP_OVERPAINT);
-            break;
-        case PDM_INVERT:
-            SetLineColor( Color(COL_TRANSPARENT));
-            SetFillColor( Color( COL_BLACK ) );
-            pVirDev->SetRasterOp(ROP_INVERT);
-            break;
-        case PDM_FILL:
-            SetLineColor( Color(COL_TRANSPARENT) );
-            SetFillColor( aActForeColor );
-            pVirDev->SetRasterOp(ROP_OVERPAINT);
-            break;
-        case PDM_TEXT:
-            aActFont.SetColor(aActForeColor);
-            aActFont.SetFillColor(aActBackColor);
-            aActFont.SetTransparent(TRUE);
-            pVirDev->SetFont(aActFont);
-            pVirDev->SetRasterOp(ROP_OVERPAINT);
-            break;
-        default:
-            break;  // -Wall undefined not handled...
-    }
-    eActMethod=eMethod;
-}
-
-ULONG PictReader::ReadAndDrawText()
-{
-    char        nByteLen;
-    sal_uInt32  nLen, nDataLen;
-    sal_Char    sText[256];
-
-    DrawingMethod(PDM_TEXT);
-    *pPict >> nByteLen; nLen=((ULONG)nByteLen)&0x000000ff;
-    nDataLen = nLen + 1;
-    pPict->Read( &sText, nLen );
-
-    // Stoerende Steuerzeuichen wegnehmen:
-    while ( nLen > 0 && ( (unsigned char)sText[ nLen - 1 ] ) < 32 )
-            nLen--;
-    sText[ nLen ] = 0;
-    String aString( (const sal_Char*)&sText, gsl_getSystemTextEncoding() );
-    pVirDev->DrawText( Point( aTextPosition.X(), aTextPosition.Y() ), aString );
-    return nDataLen;
-}
-
-ULONG PictReader::ReadPixMapEtc( Bitmap &rBitmap, BOOL bBaseAddr, BOOL bColorTable, Rectangle* pSrcRect,
-                                    Rectangle* pDestRect, BOOL bMode, BOOL bMaskRgn )
-{
-    Bitmap              aBitmap;
-    BitmapWriteAccess*  pAcc = NULL;
-    BitmapReadAccess*   pReadAcc = NULL;
-    USHORT              ny, nx, nColTabSize;
-    USHORT              nRowBytes, nBndX, nBndY, nWidth, nHeight, nVersion, nPackType, nPixelType,
-                        nPixelSize, nCmpCount, nCmpSize;
-    sal_uInt32          nPackSize, nPlaneBytes, nHRes, nVRes;
-    BYTE                nDat, nRed, nGreen, nBlue, nDummy;
-    ULONG               i, nDataSize = 0;
-
-    // In nDataSize wird mitgerechnet, wie gross die gesammten Daten sind.
-    nDataSize = 0;
-
-    // ggf. BaseAddr ueberlesen
-    if ( bBaseAddr )
-    {
-        pPict->SeekRel( 4 );
-        nDataSize += 4;
-    }
-
-    // PixMap oder Bitmap-Struktur einlesen;
-    *pPict >> nRowBytes >> nBndY >> nBndX >> nHeight >> nWidth;
-    nHeight = nHeight - nBndY;
-    nWidth = nWidth - nBndX;
-
-    if ( ( nRowBytes & 0x8000 ) != 0 )
-    {   // it is a PixMap
-        nRowBytes &= 0x3fff;
-        *pPict >> nVersion >> nPackType >> nPackSize >> nHRes >> nVRes >> nPixelType >>
-                    nPixelSize >> nCmpCount >> nCmpSize >> nPlaneBytes;
-
-        pPict->SeekRel( 8 );
-        nDataSize += 46;
-
-        sal_uInt16 nDstBitCount = nPixelSize;
-        if ( nDstBitCount > 8 )
-            nDstBitCount = 24;
-        else if ( nDstBitCount == 2 )
-            nDstBitCount = 4;
-        aBitmap = Bitmap( Size( nWidth, nHeight ), nDstBitCount );
-
-        if ( ( pAcc = aBitmap.AcquireWriteAccess() ) == NULL )
-            BITMAPERROR;
-
-        if ( bColorTable )
-        {
-            pPict->SeekRel( 6 );
-            *pPict >> nColTabSize;
-
-            if ( ++nColTabSize > 256 )
-                BITMAPERROR;
-
-            pAcc->SetPaletteEntryCount( nColTabSize );
-
-            for ( i = 0; i < nColTabSize; i++ )
-            {
-                pPict->SeekRel(2);
-                *pPict >> nRed >> nDummy >> nGreen >> nDummy >> nBlue >> nDummy;
-                pAcc->SetPaletteColor( (USHORT) i, BitmapColor( nRed, nGreen, nBlue ) );
-            }
-            nDataSize += 8 + nColTabSize * 8;
-        }
-    }
-    else
-    {
-        nRowBytes &= 0x3fff;
-        nVersion = 0;
-        nPackType = 0;
-        nPackSize = nHRes = nVRes = nPlaneBytes = 0;
-        nPixelType = 0;
-        nPixelSize = nCmpCount = nCmpSize = 1;
-        nDataSize += 10;
-        aBitmap = Bitmap( Size( nWidth, nHeight ), 1 );
-        if ( ( pAcc = aBitmap.AcquireWriteAccess() ) == NULL )
-            BITMAPERROR;
-        pAcc->SetPaletteEntryCount( 2 );
-        pAcc->SetPaletteColor( 0, BitmapColor( 0xff, 0xff, 0xff ) );
-        pAcc->SetPaletteColor( 1, BitmapColor( 0, 0, 0 ) );
-    }
-
-    // ggf. Quell-Rechteck einlesen:
-    if ( pSrcRect != 0)
-    {
-        USHORT  nTop, nLeft, nBottom, nRight;
-        *pPict >> nTop >> nLeft >> nBottom >> nRight;
-        *pSrcRect = Rectangle( (ULONG)nLeft, (ULONG)nTop, (ULONG)nRight, (ULONG)nBottom );
-        nDataSize += 8;
-    }
-
-    // ggf. Ziel-Rechteck einlesen:
-    if ( pDestRect != 0 )
-    {
-        Point aTL, aBR;
-        aTL = ReadPoint();
-        aBR = ReadPoint();
-        *pDestRect = Rectangle( aTL, aBR );
-        nDataSize += 8;
-    }
-
-    // ggf. Modus einlesen (bzw. ueberspringen):
-    if ( bMode )
-    {
-        pPict->SeekRel(2);
-        nDataSize += 2;
-    }
-
-    // ggf. Region einlesen (bzw. ueberspringen):
-    if ( bMaskRgn )
-    {
-        USHORT nSize;
-        *pPict >> nSize;
-        pPict->SeekRel( nSize - 2 );
-        nDataSize += (ULONG)nSize;
-    }
-
-//  aSMem << (nHRes/1665L) << (nVRes/1665L) << ((ULONG)0) << ((ULONG)0);
-
-    // Lese und Schreibe Bitmap-Bits:
-    if ( nPixelSize == 1 || nPixelSize == 2 || nPixelSize == 4 || nPixelSize == 8 )
-    {
-        BYTE    nByteCountAsByte, nFlagCounterByte;
-        USHORT  nByteCount, nCount, nSrcBPL, nDestBPL;
-
-        if      ( nPixelSize == 1 ) nSrcBPL = ( nWidth + 7 ) >> 3;
-        else if ( nPixelSize == 2 ) nSrcBPL = ( nWidth + 3 ) >> 2;
-        else if ( nPixelSize == 4 ) nSrcBPL = ( nWidth + 1 ) >> 1;
-        else                        nSrcBPL = nWidth;
-        nDestBPL = ( nSrcBPL + 3 ) & 0xfffc;
-        if ( nRowBytes < nSrcBPL || nRowBytes > nDestBPL )
-            BITMAPERROR;
-
-        for ( ny = 0; ny < nHeight; ny++ )
-        {
-            nx = 0;
-            if ( nRowBytes < 8 || nPackType == 1 )
-            {
-                for ( i = 0; i < nRowBytes; i++ )
-                {
-                    *pPict >> nDat;
-                    if ( nx < nWidth )
-                        SETBYTE;
-                }
-                nDataSize += nRowBytes;
-            }
-            else
-            {
-                if ( nRowBytes > 250 )
-                {
-                    *pPict >> nByteCount;
-                    nDataSize += 2 + (ULONG)nByteCount;
-                }
-                else
-                {
-                    *pPict >> nByteCountAsByte;
-                    nByteCount = ( (USHORT)nByteCountAsByte ) & 0x00ff;
-                    nDataSize += 1 + (ULONG)nByteCount;
-                }
-
-                while ( nByteCount )
-                {
-                    *pPict >> nFlagCounterByte;
-                    if ( ( nFlagCounterByte & 0x80 ) == 0 )
-                    {
-                        nCount = ( (USHORT)nFlagCounterByte ) + 1;
-                        for ( i = 0; i < nCount; i++ )
-                        {
-                            *pPict >> nDat;
-                            if ( nx < nWidth )
-                                SETBYTE;
-                        }
-                        nByteCount -= 1 + nCount;
-                    }
-                    else
-                    {
-                        nCount = ( 1 - ( ( (USHORT)nFlagCounterByte ) | 0xff00 ) );
-                        *pPict >> nDat;
-                        for ( i = 0; i < nCount; i++ )
-                        {
-                            if ( nx < nWidth )
-                                SETBYTE;
-                        }
-                        nByteCount -= 2;
-                    }
-                }
-            }
-        }
-    }
-    else if ( nPixelSize == 16 )
-    {
-        BYTE    nByteCountAsByte, nFlagCounterByte;
-        USHORT  nByteCount, nCount, nDestBPL,nD;
-        ULONG   nSrcBitsPos;
-
-        if ( nRowBytes < 2 * nWidth )
-            BITMAPERROR;
-
-        nDestBPL = ( ( 3 * nWidth ) + 0x0003 ) & 0xfffc;
-
-        for ( ny = 0; ny < nHeight; ny++ )
-        {
-            nx = 0;
-            if ( nRowBytes < 8 || nPackType == 1 )
-            {
-                for ( i = 0; i < nWidth; i++ )
-                {
-                    *pPict >> nD;
-                    nRed = (BYTE)( nD >> 7 );
-                    nGreen = (BYTE)( nD >> 2 );
-                    nBlue = (BYTE)( nD << 3 );
-                    pAcc->SetPixel( ny, nx++, BitmapColor( nRed, nGreen, nBlue ) );
-                }
-                nDataSize += ( (ULONG)nWidth ) * 2;
-            }
-            else
-            {
-                nSrcBitsPos = pPict->Tell();
-                if ( nRowBytes > 250 )
-                {
-                    *pPict >> nByteCount;
-                    nByteCount += 2;
-                }
-                else
-                {
-                    *pPict >> nByteCountAsByte;
-                    nByteCount = ( (USHORT)nByteCountAsByte ) & 0x00ff;
-                    nByteCount++;
-                }
-                while ( nx != nWidth )
-                {
-                    *pPict >> nFlagCounterByte;
-                    if ( (nFlagCounterByte & 0x80) == 0)
-                    {
-                        nCount=((USHORT)nFlagCounterByte)+1;
-                        if ( nCount + nx > nWidth)              // SJ: the RLE decoding seems not to be correct here,
-                            nCount = nWidth - nx;               // I don't want to change this until I have a bugdoc for
-                        for (i=0; i<nCount; i++)                // this case. Have a look at 32bit, there I changed the
-                        {                                       // encoding, so that it is used a straight forward array
-                            *pPict >> nD;
-                            nRed = (BYTE)( nD >> 7 );
-                            nGreen = (BYTE)( nD >> 2 );
-                            nBlue = (BYTE)( nD << 3 );
-                            pAcc->SetPixel( ny, nx++, BitmapColor( nRed, nGreen, nBlue ) );
-                        }
-                    }
-                    else
-                    {
-                        nCount=(1-(((USHORT)nFlagCounterByte)|0xff00));
-                        if ( nCount + nx > nWidth )
-                            nCount = nWidth - nx;
-                        *pPict >> nD;
-                        nRed = (BYTE)( nD >> 7 );
-                        nGreen = (BYTE)( nD >> 2 );
-                        nBlue = (BYTE)( nD << 3 );
-                        for (i=0; i<nCount; i++)
-                        {
-                            pAcc->SetPixel( ny, nx++, BitmapColor( nRed, nGreen, nBlue ) );
-                        }
-                    }
-                }
-                nDataSize+=(ULONG)nByteCount;
-                pPict->Seek(nSrcBitsPos+(ULONG)nByteCount);
-            }
-        }
-    }
-    else if (nPixelSize==32)
-    {
-        BYTE                nByteCountAsByte, nFlagCounterByte;
-        USHORT              nByteCount, nCount;
-        ULONG               nSrcBitsPos;
-        BitmapColor         aBitmapColor;
-        if ( ( pReadAcc = aBitmap.AcquireReadAccess() ) == NULL )
-            BITMAPERROR;
-        if ( nRowBytes != 4*nWidth )
-            BITMAPERROR;
-
-        if ( nRowBytes < 8 || nPackType == 1 )
-        {
-            for ( ny = 0; ny < nHeight; ny++ )
-            {
-                if ( nRowBytes < 8 || nPackType == 1 )
-                {
-                    for ( nx = 0; nx < nWidth; nx++ )
-                    {
-                        *pPict >> nDummy >> nRed >> nGreen >> nBlue;
-                        pAcc->SetPixel( ny, nx, BitmapColor( nRed, nGreen, nBlue) );
-                    }
-                    nDataSize += ( (ULONG)nWidth ) * 4;
-                }
-            }
-        }
-        else if ( nPackType == 2 )
-        {
-            for ( ny = 0; ny < nHeight; ny++ )
-            {
-                for ( nx = 0; nx < nWidth; nx++ )
-                {
-                    *pPict >> nRed >> nGreen >> nBlue;
-                    pAcc->SetPixel( ny, nx, BitmapColor( nRed, nGreen, nBlue ) );
-                }
-                nDataSize += ( (ULONG)nWidth ) * 3;
-            }
-        }
-        else
-        {
-            if ( ( nCmpCount == 3 ) || ( nCmpCount == 4 ) )
-            {
-                sal_uInt8* pScanline = new sal_uInt8[ nWidth * nCmpCount ];
-                for ( ny = 0; ny < nHeight; ny++ )
-                {
-                    nSrcBitsPos = pPict->Tell();
-                    if ( nRowBytes > 250 )
-                    {
-                        *pPict >> nByteCount;
-                        nByteCount += 2;
-                    }
-                    else
-                    {
-                        *pPict >> nByteCountAsByte;
-                        nByteCount = (BYTE)nByteCountAsByte;
-                        nByteCount++;
-                    }
-                    i = 0;
-                    while( i < (sal_uInt32)( nWidth * nCmpCount ) )
-                    {
-                        *pPict >> nFlagCounterByte;
-                        if ( ( nFlagCounterByte & 0x80 ) == 0)
-                        {
-                            nCount = ( (USHORT)nFlagCounterByte ) + 1;
-                            if ( ( i + nCount ) > (sal_uInt32)( nWidth * nCmpCount ) )
-                                nCount = (sal_uInt16)( nWidth * nCmpCount - i );
-                            while( nCount-- )
-                            {
-                                *pPict >> nDat;
-                                pScanline[ i++ ] = nDat;
-                            }
-                        }
-                        else
-                        {
-                            nCount = ( 1 - ( ( (USHORT)nFlagCounterByte ) | 0xff00 ) );
-                            if ( ( i + nCount ) > (sal_uInt32)( nWidth * nCmpCount ) )
-                                nCount = (sal_uInt16)( nWidth * nCmpCount - i );
-                            *pPict >> nDat;
-                            while( nCount-- )
-                                pScanline[ i++ ] = nDat;
-                        }
-                    }
-                    sal_uInt8* pTmp = pScanline;
-                    if ( nCmpCount == 4 )
-                        pTmp += nWidth;
-                    for ( nx = 0; nx < nWidth; pTmp++ )
-                        pAcc->SetPixel( ny, nx++, BitmapColor( *pTmp, pTmp[ nWidth ], pTmp[ 2 * nWidth ] ) );
-                    nDataSize += (ULONG)nByteCount;
-                    pPict->Seek( nSrcBitsPos + (ULONG)nByteCount );
-                }
-                delete[] pScanline;
-            }
-        }
-    }
-    else
-        BITMAPERROR;
-    if ( pReadAcc )
-        aBitmap.ReleaseAccess( pReadAcc );
-    aBitmap.ReleaseAccess( pAcc );
-    rBitmap = aBitmap;
-    return nDataSize;
-}
-
-void PictReader::ReadHeader()
-{
-    char nC;
-    short y1,x1,y2,x2;
-
-    sal_Char    sBuf[ 3 ];
-    pPict->SeekRel( 10 );
-    pPict->Read( sBuf, 3 );
-    if ( sBuf[ 0 ] == 0x00 && sBuf[ 1 ] == 0x11 && ( sBuf[ 2 ] == 0x01 || sBuf[ 2 ] == 0x02 ) )
-        pPict->SeekRel( -13 );      // this maybe a pict from a ms document
-    else
-        pPict->SeekRel( 512 - 13 ); // 512 Bytes Muell am Anfang
-
-    pPict->SeekRel(2);              // Lo-16-bits von "picture size"
-    *pPict >> y1 >> x1 >> y2 >> x2; // Rahmen-Rechteck des Bildes
-    aBoundingRect=Rectangle( x1,y1, --x2, --y2 );
-
-    // Jetzt kommen x-beliebig viele Nullen
-    // (in manchen Dateien tatsaechlich mehr als eine):
-    do { *pPict >> nC; } while (nC==0 && pPict->IsEof()==FALSE);
-
-    // dann sollte der Versions-Opcode 0x11 folgen, dann die Versionsnummer:
-    if (nC==0x11)
-    {
-        *pPict >> nC;
-        if ( nC == 0x01 )
-            IsVersion2 = FALSE;         // Version 1
-        else                            // Version 2 oder hoeher
-        {
-            short   nExtVer;
-            // 3 Bytes ueberspringen, um auf
-            // ExtVersion2 oder Version2 zu kommen
-            pPict->SeekRel( 3 );
-            *pPict >> nExtVer;
-
-            // nachsehen, ob wir einen Extended-Version2-Header (==-2) haben
-            // oder einen einfachen Version2-Header (==-1);
-            // dementsprechend Aufloesung einlesen oder nicht
-            if ( nExtVer == -2 )
-            {
-                sal_Int16 nReserved;
-                sal_Int32 nHResFixed, nVResFixed;
-                *pPict >> nReserved >> nHResFixed >> nVResFixed;
-                double fHRes = nHResFixed;
-                fHRes /= 65536;
-                double fVRes = nVResFixed;
-                fVRes /= 65536;
-                aHRes /= fHRes;
-                aVRes /= fVRes;
-                *pPict >> y1 >> x1 >> y2 >> x2;     // reading the optimal bounding rect
-                aBoundingRect=Rectangle( x1,y1, --x2, --y2 );
-                pPict->SeekRel( -22 );
-            }
-            else
-            {
-                pPict->SeekRel( -4 );
-            }
-            IsVersion2=TRUE;
-        }
-    }
-    else {
-        // Eigentlich ist dies wohl kein Pict-File, aber es gibt tatsaechlich
-        // Dateien, bei denen mehr als 512 Bytes "Muell" am Anfang stehen.
-        // Somit koennte es theoretisch folgende Art von Header geben:
-        // <beliebig viele Bytes Muell> <Picture-Size (Lo-Bytes)> <BoundingRect>
-        // <beliebig viele Nullen> <0x11> ..
-        // Da aber in so einem Fall die Position von <BoundingRect> kaum auszumachen ist,
-        // gehen wir nun davon aus, dass in einer Datei immer entweder genau 512 Bytes Muell
-        // am Anfang sind (wie oben versucht), oder (wie normalerweise ueblich) genau eine 0 zwischen
-        // Bounding-Rectangle und 0x11. Des weiteren mag es hoechstens 1024 Bytes Muell geben,
-        // und das Ganze nur fuer Version 1 oder 2.
-        // Somit suchen wir nun nach der Folge 0x00,0x11,0x01 oder 0x00,0x11,0x02 innerhalb der
-        // "zweiten" 512 Bytes, und nehmen an, dass davor das Bounding-Rect steht, und hoffen
-        // dass das alles so seine Richtigkeit hat.
-        BYTE n1,n2,n3;
-        USHORT i,Found;
-        pPict->Seek(522);
-        Found=0;
-        *pPict >> n1 >> n2 >> n3;
-        for (i=0; i<512; i++) {
-            if (n1==0x00 && n2==0x11 && (n3==0x01 || n3==0x02)) { Found=1; break; }
-            n1=n2; n2=n3; *pPict >> n3;
-        }
-        if (Found!=0) {
-            pPict->SeekRel(-11);
-            *pPict >> y1 >> x1 >> y2 >> x2;
-            // Lieber nochmal nachsehen, ob das Bounding-Rectangle gut zu sein scheint:
-            if (x1+10<x2 && y1+10<y2 && y1>=-2048 && x1>=-2048 && x2<=2048 && y2<=2048) {
-                aBoundingRect=Rectangle( x1, y1, --x2, --y2 );
-                if (n3==0x01) {
-                    pPict->SeekRel(3);
-                    IsVersion2=FALSE;
-                }
-                else {
-                    pPict->SeekRel(4);
-                    IsVersion2=TRUE;
-                }
-            }
-            else pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
-        }
-        else pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
-    }
-}
-
-
-ULONG PictReader::ReadData(USHORT nOpcode)
-{
-    USHORT nUSHORT;
-    Point aPoint;
-    ULONG nDataSize=0;
-
-    switch(nOpcode) {
-
-    case 0x0000:   // NOP
-        nDataSize=0;
-        break;
-
-    case 0x0001: { // Clip
-        Rectangle aRect;
-        *pPict >> nUSHORT;
-        nDataSize=nUSHORT;
-        ReadRectangle(aRect);
-        pVirDev->SetClipRegion( Region( aRect ) );
-        break;
-    }
-    case 0x0002:   // BkPat
-        nDataSize=ReadPattern(NULL,&eActBackStyle);
-        eActMethod=PDM_UNDEFINED;
-        break;
-
-    case 0x0003:   // TxFont
-        *pPict >> nUSHORT;
-        if      (nUSHORT <=    1) aActFont.SetFamily(FAMILY_SWISS);
-        else if (nUSHORT <=   12) aActFont.SetFamily(FAMILY_DECORATIVE);
-        else if (nUSHORT <=   20) aActFont.SetFamily(FAMILY_ROMAN);
-        else if (nUSHORT ==   21) aActFont.SetFamily(FAMILY_SWISS);
-        else if (nUSHORT ==   22) aActFont.SetFamily(FAMILY_MODERN);
-        else if (nUSHORT <= 1023) aActFont.SetFamily(FAMILY_SWISS);
-        else                      aActFont.SetFamily(FAMILY_ROMAN);
-        if      ( nUSHORT == 23 ) aActFont.SetCharSet( RTL_TEXTENCODING_SYMBOL );
-        else    aActFont.SetCharSet( gsl_getSystemTextEncoding() );
-        eActMethod=PDM_UNDEFINED;
-        nDataSize=2;
-        break;
-
-    case 0x0004: {  // TxFace
-        char nFace;
-        *pPict >> nFace;
-        if ( (nFace & 0x01)!=0 ) aActFont.SetWeight(WEIGHT_BOLD);
-        else                     aActFont.SetWeight(WEIGHT_NORMAL);
-        if ( (nFace & 0x02)!=0 ) aActFont.SetItalic(ITALIC_NORMAL);
-        else                     aActFont.SetItalic(ITALIC_NONE);
-        if ( (nFace & 0x04)!=0 ) aActFont.SetUnderline(UNDERLINE_SINGLE);
-        else                     aActFont.SetUnderline(UNDERLINE_NONE);
-        if ( (nFace & 0x08)!=0 ) aActFont.SetOutline(TRUE);
-        else                     aActFont.SetOutline(FALSE);
-        if ( (nFace & 0x10)!=0 ) aActFont.SetShadow(TRUE);
-        else                     aActFont.SetShadow(FALSE);
-        eActMethod=PDM_UNDEFINED;
-        nDataSize=1;
-        break;
-    }
-    case 0x0005:   // TxMode
-        nDataSize=2;
-        break;
-
-    case 0x0006:   // SpExtra
-        nDataSize=4;
-        break;
-
-    case 0x0007: { // PnSize
-        Size aSize;
-        aSize=ReadSize();
-        nActPenSize=(USHORT)((aSize.Width()+aSize.Height())/2);
-        eActMethod=PDM_UNDEFINED;
-        nDataSize=4;
-        break;
-    }
-    case 0x0008:   // PnMode
-        *pPict >> nUSHORT;
-        switch (nUSHORT & 0x0007) {
-            case 0: eActROP=ROP_OVERPAINT; break; // Copy
-            case 1: eActROP=ROP_OVERPAINT; break; // Or
-            case 2: eActROP=ROP_XOR;       break; // Xor
-            case 3: eActROP=ROP_OVERPAINT; break; // Bic
-            case 4: eActROP=ROP_INVERT;    break; // notCopy
-            case 5: eActROP=ROP_OVERPAINT; break; // notOr
-            case 6: eActROP=ROP_XOR;       break; // notXor
-            case 7: eActROP=ROP_OVERPAINT; break; // notBic
-        }
-        eActMethod=PDM_UNDEFINED;
-        nDataSize=2;
-        break;
-
-    case 0x0009:   // PnPat
-        nDataSize=ReadPattern(&eActPenPenStyle,&eActPenBrushStyle);
-        eActMethod=PDM_UNDEFINED;
-        break;
-
-    case 0x000a:   // FillPat
-        nDataSize=ReadPattern(NULL,&eActFillStyle);
-        eActMethod=PDM_UNDEFINED;
-        break;
-
-    case 0x000b:   // OvSize
-        aActOvalSize=ReadSize();
-        nDataSize=4;
-        break;
-
-    case 0x000c:   // Origin
-        nDataSize=4;
-        break;
-
-    case 0x000d:   // TxSize
-    {
-        *pPict >> nUSHORT;
-        aActFont.SetSize( Size( 0, (long)nUSHORT ) );
-        eActMethod=PDM_UNDEFINED;
-        nDataSize=2;
-    }
-    break;
-
-    case 0x000e:   // FgColor
-        aActForeColor=ReadColor();
-        eActMethod=PDM_UNDEFINED;
-        nDataSize=4;
-        break;
-
-    case 0x000f:   // BkColor
-        aActBackColor=ReadColor();
-        nDataSize=4;
-        break;
-
-    case 0x0010:   // TxRatio
-        nDataSize=8;
-        break;
-
-    case 0x0011:   // VersionOp
-        nDataSize=1;
-        break;
-
-    case 0x0012:   // BkPixPat
-        nDataSize=ReadPixPattern(NULL,&eActBackStyle);
-        eActMethod=PDM_UNDEFINED;
-        break;
-
-    case 0x0013:   // PnPixPat
-        nDataSize=ReadPixPattern(&eActPenPenStyle,&eActPenBrushStyle);
-        eActMethod=PDM_UNDEFINED;
-        break;
-
-    case 0x0014:   // FillPixPat
-        nDataSize=ReadPixPattern(NULL,&eActFillStyle);
-        eActMethod=PDM_UNDEFINED;
-        break;
-
-    case 0x0015:   // PnLocHFrac
-        nDataSize=2;
-        break;
-
-    case 0x0016:   // ChExtra
-        nDataSize=2;
-        break;
-
-    case 0x0017:   // Reserved (0 Bytes)
-    case 0x0018:   // Reserved (0 Bytes)
-    case 0x0019:   // Reserved (0 Bytes)
-        nDataSize=0;
-        break;
-
-    case 0x001a:   // RGBFgCol
-        aActForeColor=ReadRGBColor();
-        eActMethod=PDM_UNDEFINED;
-        nDataSize=6;
-        break;
-
-    case 0x001b:   // RGBBkCol
-        aActBackColor=ReadRGBColor();
-        eActMethod=PDM_UNDEFINED;
-        nDataSize=6;
-        break;
-
-    case 0x001c:   // HiliteMode
-        nDataSize=0;
-        break;
-
-    case 0x001d:   // HiliteColor
-        nDataSize=6;
-        break;
-
-    case 0x001e:   // DefHilite
-        nDataSize=0;
-        break;
-
-    case 0x001f:   // OpColor
-        nDataSize=6;
-        break;
-
-    case 0x0020:   // Line
-        aPoint=ReadPoint(); aPenPosition=ReadPoint();
-        DrawingMethod(PDM_FRAME);
-        pVirDev->DrawLine(aPoint,aPenPosition);
-        nDataSize=8;
-        break;
-
-    case 0x0021:   // LineFrom
-        aPoint=aPenPosition; aPenPosition=ReadPoint();
-        DrawingMethod(PDM_FRAME);
-        pVirDev->DrawLine(aPoint,aPenPosition);
-        nDataSize=4;
-        break;
-
-    case 0x0022:   // ShortLine
-        aPoint=ReadPoint();
-        aPenPosition=ReadDeltaH(aPoint);
-        aPenPosition=ReadDeltaV(aPenPosition);
-        DrawingMethod(PDM_FRAME);
-        pVirDev->DrawLine(aPoint,aPenPosition);
-        nDataSize=6;
-        break;
-
-    case 0x0023:   // ShortLineFrom
-        aPoint=aPenPosition;
-        aPenPosition=ReadDeltaH(aPoint);
-        aPenPosition=ReadDeltaV(aPenPosition);
-        DrawingMethod(PDM_FRAME);
-        pVirDev->DrawLine(aPoint,aPenPosition);
-        nDataSize=2;
-        break;
-
-    case 0x0024:   // Reserved (n Bytes)
-    case 0x0025:   // Reserved (n Bytes)
-    case 0x0026:   // Reserved (n Bytes)
-    case 0x0027:   // Reserved (n Bytes)
-        *pPict >> nUSHORT;
-        nDataSize=2+nUSHORT;
-        break;
-
-    case 0x0028:   // LongText
-        aTextPosition=ReadPoint();
-        nDataSize=4+ReadAndDrawText();
-        break;
-
-    case 0x0029:   // DHText
-        aTextPosition=ReadUnsignedDeltaH(aTextPosition);
-        nDataSize=1+ReadAndDrawText();
-        break;
-
-    case 0x002a:   // DVText
-        aTextPosition=ReadUnsignedDeltaV(aTextPosition);
-        nDataSize=1+ReadAndDrawText();
-        break;
-
-    case 0x002b:   // DHDVText
-        aTextPosition=ReadUnsignedDeltaH(aTextPosition);
-        aTextPosition=ReadUnsignedDeltaV(aTextPosition);
-        nDataSize=2+ReadAndDrawText();
-        break;
-
-    case 0x002c: { // fontName
-        char        sFName[ 256 ], nByteLen;
-        sal_uInt16  nLen;
-        *pPict >> nUSHORT; nDataSize=nUSHORT+2;
-        *pPict >> nUSHORT;
-        if      (nUSHORT <=    1) aActFont.SetFamily(FAMILY_SWISS);
-        else if (nUSHORT <=   12) aActFont.SetFamily(FAMILY_DECORATIVE);
-        else if (nUSHORT <=   20) aActFont.SetFamily(FAMILY_ROMAN);
-        else if (nUSHORT ==   21) aActFont.SetFamily(FAMILY_SWISS);
-        else if (nUSHORT ==   22) aActFont.SetFamily(FAMILY_MODERN);
-        else if (nUSHORT <= 1023) aActFont.SetFamily(FAMILY_SWISS);
-        else                      aActFont.SetFamily(FAMILY_ROMAN);
-        if (nUSHORT==23) aActFont.SetCharSet( RTL_TEXTENCODING_SYMBOL);
-        else aActFont.SetCharSet( gsl_getSystemTextEncoding() );
-        *pPict >> nByteLen; nLen=((USHORT)nByteLen)&0x00ff;
-        pPict->Read( &sFName, nLen );
-        sFName[ nLen ] = 0;
-        String aString( (const sal_Char*)&sFName, gsl_getSystemTextEncoding() );
-        aActFont.SetName( aString );
-        eActMethod=PDM_UNDEFINED;
-        break;
-    }
-    case 0x002d:   // lineJustify
-        nDataSize=10;
-        break;
-
-    case 0x002e:   // glyphState
-        *pPict >> nUSHORT;
-        nDataSize=2+nUSHORT;
-        break;
-
-    case 0x002f:   // Reserved (n Bytes)
-        *pPict >> nUSHORT;
-        nDataSize=2+nUSHORT;
-        break;
-
-    case 0x0030:   // frameRect
-        nDataSize=ReadAndDrawRect(PDM_FRAME);
-        break;
-
-    case 0x0031:   // paintRect
-        nDataSize=ReadAndDrawRect(PDM_PAINT);
-        break;
-
-    case 0x0032:   // eraseRect
-        nDataSize=ReadAndDrawRect(PDM_ERASE);
-        break;
-
-    case 0x0033:   // invertRect
-        nDataSize=ReadAndDrawRect(PDM_INVERT);
-        break;
-
-    case 0x0034:   // fillRect
-        nDataSize=ReadAndDrawRect(PDM_FILL);
-        break;
-
-    case 0x0035:   // Reserved (8 Bytes)
-    case 0x0036:   // Reserved (8 Bytes)
-    case 0x0037:   // Reserved (8 Bytes)
-        nDataSize=8;
-        break;
-
-    case 0x0038:   // frameSameRect
-        nDataSize=ReadAndDrawSameRect(PDM_FRAME);
-        break;
-
-    case 0x0039:   // paintSameRect
-        nDataSize=ReadAndDrawSameRect(PDM_PAINT);
-        break;
-
-    case 0x003a:   // eraseSameRect
-        nDataSize=ReadAndDrawSameRect(PDM_ERASE);
-        break;
-
-    case 0x003b:   // invertSameRect
-        nDataSize=ReadAndDrawSameRect(PDM_INVERT);
-        break;
-
-    case 0x003c:   // fillSameRect
-        nDataSize=ReadAndDrawSameRect(PDM_FILL);
-        break;
-
-    case 0x003d:   // Reserved (0 Bytes)
-    case 0x003e:   // Reserved (0 Bytes)
-    case 0x003f:   // Reserved (0 Bytes)
-        nDataSize=0;
-        break;
-
-    case 0x0040:   // frameRRect
-        nDataSize=ReadAndDrawRoundRect(PDM_FRAME);
-        break;
-
-    case 0x0041:   // paintRRect
-        nDataSize=ReadAndDrawRoundRect(PDM_PAINT);
-        break;
-
-    case 0x0042:   // eraseRRect
-        nDataSize=ReadAndDrawRoundRect(PDM_ERASE);
-        break;
-
-    case 0x0043:   // invertRRect
-        nDataSize=ReadAndDrawRoundRect(PDM_INVERT);
-        break;
-
-    case 0x0044:   // fillRRect
-        nDataSize=ReadAndDrawRoundRect(PDM_FILL);
-        break;
-
-    case 0x0045:   // Reserved (8 Bytes)
-    case 0x0046:   // Reserved (8 Bytes)
-    case 0x0047:   // Reserved (8 Bytes)
-        nDataSize=8;
-        break;
-
-    case 0x0048:   // frameSameRRect
-        nDataSize=ReadAndDrawSameRoundRect(PDM_FRAME);
-        break;
-
-    case 0x0049:   // paintSameRRect
-        nDataSize=ReadAndDrawSameRoundRect(PDM_PAINT);
-        break;
-
-    case 0x004a:   // eraseSameRRect
-        nDataSize=ReadAndDrawSameRoundRect(PDM_ERASE);
-        break;
-
-    case 0x004b:   // invertSameRRect
-        nDataSize=ReadAndDrawSameRoundRect(PDM_INVERT);
-        break;
-
-    case 0x004c:   // fillSameRRect
-        nDataSize=ReadAndDrawSameRoundRect(PDM_FILL);
-        break;
-
-    case 0x004d:   // Reserved (0 Bytes)
-    case 0x004e:   // Reserved (0 Bytes)
-    case 0x004f:   // Reserved (0 Bytes)
-        nDataSize=0;
-        break;
-
-    case 0x0050:   // frameOval
-        nDataSize=ReadAndDrawOval(PDM_FRAME);
-        break;
-
-    case 0x0051:   // paintOval
-        nDataSize=ReadAndDrawOval(PDM_PAINT);
-        break;
-
-    case 0x0052:   // eraseOval
-        nDataSize=ReadAndDrawOval(PDM_ERASE);
-        break;
-
-    case 0x0053:   // invertOval
-        nDataSize=ReadAndDrawOval(PDM_INVERT);
-        break;
-
-    case 0x0054:   // fillOval
-        nDataSize=ReadAndDrawOval(PDM_FILL);
-        break;
-
-    case 0x0055:   // Reserved (8 Bytes)
-    case 0x0056:   // Reserved (8 Bytes)
-    case 0x0057:   // Reserved (8 Bytes)
-        nDataSize=8;
-        break;
-
-    case 0x0058:   // frameSameOval
-        nDataSize=ReadAndDrawSameOval(PDM_FRAME);
-        break;
-
-    case 0x0059:   // paintSameOval
-        nDataSize=ReadAndDrawSameOval(PDM_PAINT);
-        break;
-
-    case 0x005a:   // eraseSameOval
-        nDataSize=ReadAndDrawSameOval(PDM_ERASE);
-        break;
-
-    case 0x005b:   // invertSameOval
-        nDataSize=ReadAndDrawSameOval(PDM_INVERT);
-        break;
-
-    case 0x005c:   // fillSameOval
-        nDataSize=ReadAndDrawSameOval(PDM_FILL);
-        break;
-
-    case 0x005d:   // Reserved (0 Bytes)
-    case 0x005e:   // Reserved (0 Bytes)
-    case 0x005f:   // Reserved (0 Bytes)
-        nDataSize=0;
-        break;
-
-    case 0x0060:   // frameArc
-        nDataSize=ReadAndDrawArc(PDM_FRAME);
-        break;
-
-    case 0x0061:   // paintArc
-        nDataSize=ReadAndDrawArc(PDM_PAINT);
-        break;
-
-    case 0x0062:   // eraseArc
-        nDataSize=ReadAndDrawArc(PDM_ERASE);
-        break;
-
-    case 0x0063:   // invertArc
-        nDataSize=ReadAndDrawArc(PDM_INVERT);
-        break;
-
-    case 0x0064:   // fillArc
-        nDataSize=ReadAndDrawArc(PDM_FILL);
-        break;
-
-    case 0x0065:   // Reserved (12 Bytes)
-    case 0x0066:   // Reserved (12 Bytes)
-    case 0x0067:   // Reserved (12 Bytes)
-        nDataSize=12;
-        break;
-
-    case 0x0068:   // frameSameArc
-        nDataSize=ReadAndDrawSameArc(PDM_FRAME);
-        break;
-
-    case 0x0069:   // paintSameArc
-        nDataSize=ReadAndDrawSameArc(PDM_PAINT);
-        break;
-
-    case 0x006a:   // eraseSameArc
-        nDataSize=ReadAndDrawSameArc(PDM_ERASE);
-        break;
-
-    case 0x006b:   // invertSameArc
-        nDataSize=ReadAndDrawSameArc(PDM_INVERT);
-        break;
-
-    case 0x006c:   // fillSameArc
-        nDataSize=ReadAndDrawSameArc(PDM_FILL);
-        break;
-
-    case 0x006d:   // Reserved (4 Bytes)
-    case 0x006e:   // Reserved (4 Bytes)
-    case 0x006f:   // Reserved (4 Bytes)
-        nDataSize=4;
-        break;
-
-    case 0x0070:   // framePoly
-        nDataSize=ReadAndDrawPolygon(PDM_FRAME);
-        break;
-
-    case 0x0071:   // paintPoly
-        nDataSize=ReadAndDrawPolygon(PDM_PAINT);
-        break;
-
-    case 0x0072:   // erasePoly
-        nDataSize=ReadAndDrawPolygon(PDM_ERASE);
-        break;
-
-    case 0x0073:   // invertPoly
-        nDataSize=ReadAndDrawPolygon(PDM_INVERT);
-        break;
-
-    case 0x0074:   // fillPoly
-        nDataSize=ReadAndDrawPolygon(PDM_FILL);
-        break;
-
-    case 0x0075:   // Reserved (Polygon-Size)
-    case 0x0076:   // Reserved (Polygon-Size)
-    case 0x0077:   // Reserved (Polygon-Size)
-        *pPict >> nUSHORT; nDataSize=nUSHORT;
-        break;
-
-    case 0x0078:   // frameSamePoly
-        nDataSize=ReadAndDrawSamePolygon(PDM_FRAME);
-        break;
-
-    case 0x0079:   // paintSamePoly
-        nDataSize=ReadAndDrawSamePolygon(PDM_PAINT);
-        break;
-
-    case 0x007a:   // eraseSamePoly
-        nDataSize=ReadAndDrawSamePolygon(PDM_ERASE);
-        break;
-
-    case 0x007b:   // invertSamePoly
-        nDataSize=ReadAndDrawSamePolygon(PDM_INVERT);
-        break;
-
-    case 0x007c:   // fillSamePoly
-        nDataSize=ReadAndDrawSamePolygon(PDM_FILL);
-        break;
-
-    case 0x007d:   // Reserved (0 Bytes)
-    case 0x007e:   // Reserved (0 Bytes)
-    case 0x007f:   // Reserved (0 Bytes)
-        nDataSize=0;
-        break;
-
-    case 0x0080:   // frameRgn
-        nDataSize=ReadAndDrawRgn(PDM_FILL);
-        break;
-
-    case 0x0081:   // paintRgn
-        nDataSize=ReadAndDrawRgn(PDM_PAINT);
-        break;
-
-    case 0x0082:   // eraseRgn
-        nDataSize=ReadAndDrawRgn(PDM_ERASE);
-        break;
-
-    case 0x0083:   // invertRgn
-        nDataSize=ReadAndDrawRgn(PDM_INVERT);
-        break;
-
-    case 0x0084:   // fillRgn
-        nDataSize=ReadAndDrawRgn(PDM_FILL);
-        break;
-
-    case 0x0085:   // Reserved (Region-Size)
-    case 0x0086:   // Reserved (Region-Size)
-    case 0x0087:   // Reserved (Region-Size)
-        *pPict >> nUSHORT; nDataSize=nUSHORT;
-        break;
-
-    case 0x0088:   // frameSameRgn
-        nDataSize=ReadAndDrawSameRgn(PDM_FRAME);
-        break;
-
-    case 0x0089:   // paintSameRgn
-        nDataSize=ReadAndDrawSameRgn(PDM_PAINT);
-        break;
-
-    case 0x008a:   // eraseSameRgn
-        nDataSize=ReadAndDrawSameRgn(PDM_ERASE);
-        break;
-
-    case 0x008b:   // invertSameRgn
-        nDataSize=ReadAndDrawSameRgn(PDM_INVERT);
-        break;
-
-    case 0x008c:   // fillSameRgn
-        nDataSize=ReadAndDrawSameRgn(PDM_FILL);
-        break;
-
-    case 0x008d:   // Reserved (0 Bytes)
-    case 0x008e:   // Reserved (0 Bytes)
-    case 0x008f:   // Reserved (0 Bytes)
-        nDataSize=0;
-        break;
-
-    case 0x0090: { // BitsRect
-        Bitmap aBmp;
-        Rectangle aSrcRect, aDestRect;
-        nDataSize=ReadPixMapEtc(aBmp, FALSE, TRUE, &aSrcRect, &aDestRect, TRUE, FALSE);
-        DrawingMethod(PDM_PAINT);
-        pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
-        break;
-    }
-    case 0x0091: { // BitsRgn
-        Bitmap aBmp;
-        Rectangle aSrcRect, aDestRect;
-        nDataSize=ReadPixMapEtc(aBmp, FALSE, TRUE, &aSrcRect, &aDestRect, TRUE, TRUE);
-        DrawingMethod(PDM_PAINT);
-        pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
-        break;
-    }
-    case 0x0092:   // Reserved (n Bytes)
-    case 0x0093:   // Reserved (n Bytes)
-    case 0x0094:   // Reserved (n Bytes)
-    case 0x0095:   // Reserved (n Bytes)
-    case 0x0096:   // Reserved (n Bytes)
-    case 0x0097:   // Reserved (n Bytes)
-        *pPict >> nUSHORT; nDataSize=2+nUSHORT;
-        break;
-
-    case 0x0098: { // PackBitsRect
-        Bitmap aBmp;
-        Rectangle aSrcRect, aDestRect;
-        nDataSize=ReadPixMapEtc(aBmp, FALSE, TRUE, &aSrcRect, &aDestRect, TRUE, FALSE);
-        DrawingMethod(PDM_PAINT);
-        pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
-        break;
-    }
-    case 0x0099: { // PackBitsRgn
-        Bitmap aBmp;
-        Rectangle aSrcRect, aDestRect;
-        nDataSize=ReadPixMapEtc(aBmp, FALSE, TRUE, &aSrcRect, &aDestRect, TRUE, TRUE);
-        DrawingMethod(PDM_PAINT);
-        pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
-        break;
-    }
-    case 0x009a: { // DirectBitsRect
-        Bitmap aBmp;
-        Rectangle aSrcRect, aDestRect;
-        nDataSize=ReadPixMapEtc(aBmp, TRUE, FALSE, &aSrcRect, &aDestRect, TRUE, FALSE);
-        DrawingMethod(PDM_PAINT);
-        pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
-        break;
-    }
-    case 0x009b: { // DirectBitsRgn
-        Bitmap aBmp;
-        Rectangle aSrcRect, aDestRect;
-        nDataSize=ReadPixMapEtc(aBmp, TRUE, FALSE, &aSrcRect, &aDestRect, TRUE, TRUE);
-        DrawingMethod(PDM_PAINT);
-        pVirDev->DrawBitmap(aDestRect.TopLeft(),aDestRect.GetSize(),aBmp);
-        break;
-    }
-    case 0x009c:   // Reserved (n Bytes)
-    case 0x009d:   // Reserved (n Bytes)
-    case 0x009e:   // Reserved (n Bytes)
-    case 0x009f:   // Reserved (n Bytes)
-        *pPict >> nUSHORT; nDataSize=2+nUSHORT;
-        break;
-
-    case 0x00a0:   // ShortComment
-        nDataSize=2;
-        break;
-
-    case 0x00a1:   // LongComment
-        pPict->SeekRel(2); *pPict >> nUSHORT; nDataSize=4+nUSHORT;
-        break;
-
-    default: // 0x00a2 bis 0xffff (zumeist Reserved)
-        if      (nOpcode<=0x00af) { *pPict >> nUSHORT; nDataSize=2+nUSHORT; }
-        else if (nOpcode<=0x00cf) { nDataSize=0; }
-        else if (nOpcode<=0x00fe) { sal_uInt32 nTemp; *pPict >> nTemp ; nDataSize = nTemp; nDataSize+=4; }
-        else if (nOpcode==0x00ff) { nDataSize=2; } // OpEndPic
-        else if (nOpcode<=0x01ff) { nDataSize=2; }
-        else if (nOpcode<=0x0bfe) { nDataSize=4; }
-        else if (nOpcode<=0x0bff) { nDataSize=22; }
-        else if (nOpcode==0x0c00) { nDataSize=24; } // HeaderOp
-        else if (nOpcode<=0x7eff) { nDataSize=24; }
-        else if (nOpcode<=0x7fff) { nDataSize=254; }
-        else if (nOpcode<=0x80ff) { nDataSize=0; }
-        else                      { sal_uInt32 nTemp; *pPict >> nTemp ; nDataSize = nTemp; nDataSize+=4; }
-    }
-
-    if (nDataSize==0xffffffff) {
-        pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
-        return 0;
-    }
-    return nDataSize;
-}
-
-void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile )
-{
-    USHORT          nOpcode;
-    BYTE            nOneByteOpcode;
-    ULONG           nSize, nPos, nStartPos, nEndPos, nPercent, nLastPercent;
-
-    pPict               = &rStreamPict;
-    nOrigPos            = pPict->Tell();
-    nOrigNumberFormat   = pPict->GetNumberFormatInt();
-
-    aActForeColor       = Color(COL_BLACK);
-    aActBackColor       = Color(COL_WHITE);
-    eActPenPenStyle     = PEN_SOLID;
-    eActPenBrushStyle   = BRUSH_SOLID;
-    eActFillStyle       = BRUSH_SOLID;
-    eActBackStyle       = BRUSH_SOLID;
-    nActPenSize         = 1;
-    eActROP             = ROP_OVERPAINT;
-    eActMethod          = PDM_UNDEFINED;
-    aActOvalSize        = Size(1,1);
-
-    aActFont.SetCharSet( gsl_getSystemTextEncoding() );
-    aActFont.SetFamily(FAMILY_SWISS);
-    aActFont.SetSize(Size(0,12));
-    aActFont.SetAlign(ALIGN_BASELINE);
-
-    aHRes = aVRes = Fraction( 1, 1 );
-
-    pVirDev = new VirtualDevice();
-    pVirDev->EnableOutput(FALSE);
-    rGDIMetaFile.Record(pVirDev);
-
-    pPict->SetNumberFormatInt(NUMBERFORMAT_INT_BIGENDIAN);
-
-    nStartPos=pPict->Tell();
-    nEndPos=pPict->Seek(STREAM_SEEK_TO_END); pPict->Seek(nStartPos);
-    Callback(0); nLastPercent=0;
-
-    ReadHeader();
-
-    aPenPosition=Point(-aBoundingRect.Left(),-aBoundingRect.Top());
-    aTextPosition=aPenPosition;
-
-    nPos=pPict->Tell();
-
-    for (;;) {
-
-        nPercent=(nPos-nStartPos)*100/(nEndPos-nStartPos);
-        if (nLastPercent+4<=nPercent) {
-            if (Callback((USHORT)nPercent)==TRUE) break;
-            nLastPercent=nPercent;
-        }
-
-        if (IsVersion2 )
-            *pPict >> nOpcode;
-        else
-        {
-            *pPict >> nOneByteOpcode;
-            nOpcode=(USHORT)nOneByteOpcode;
-        }
-
-        if (pPict->GetError())
-            break;
-
-        if (pPict->IsEof())
-        {
-            pPict->SetError(SVSTREAM_FILEFORMAT_ERROR);
-            break;
-        }
-
-        if (nOpcode==0x00ff)
-            break;
-
-        nSize=ReadData(nOpcode);
-
-        if ( IsVersion2 )
-        {
-            if ( nSize & 1 )
-                nSize++;
-
-            nPos+=2+nSize;
-        }
-        else
-            nPos+=1+nSize;
-
-        pPict->Seek(nPos);
-    }
-
-    rGDIMetaFile.Stop();
-    delete pVirDev;
-
-    rGDIMetaFile.SetPrefMapMode( MapMode( MAP_INCH, Point(), aHRes, aVRes ) );
-    rGDIMetaFile.SetPrefSize( aBoundingRect.GetSize() );
-
-    pPict->SetNumberFormatInt(nOrigNumberFormat);
-
-    if (pPict->GetError()) pPict->Seek(nOrigPos);
-}
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicImport( SvStream& rIStm, Graphic & rGraphic, FilterConfigItem*, BOOL )
-{
-    GDIMetaFile aMTF;
-    PictReader  aPictReader;
-    BOOL        bRet = FALSE;
-
-    aPictReader.ReadPict( rIStm, aMTF );
-
-    if ( !rIStm.GetError() )
-    {
-        rGraphic = Graphic( aMTF );
-        bRet = TRUE;
-    }
-
-    return bRet;
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/ipict/makefile.mk b/goodies/source/filter.vcl/ipict/makefile.mk
deleted file mode 100644
index 2d84bffe3c36..000000000000
--- a/goodies/source/filter.vcl/ipict/makefile.mk
+++ /dev/null
@@ -1,72 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=ipict
-DEPTARGET=vipict
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/ipict.obj
-
-# ==========================================================================
-
-SHL1TARGET=     ipt$(DLLPOSTFIX)
-SHL1IMPLIB=     ipict
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=       $(SLB)$/ipict.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/ipict.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
-
diff --git a/goodies/source/filter.vcl/ipsd/exports.map b/goodies/source/filter.vcl/ipsd/exports.map
deleted file mode 100644
index b2cda91bec78..000000000000
--- a/goodies/source/filter.vcl/ipsd/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-PSDIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/ipsd/ipsd.cxx b/goodies/source/filter.vcl/ipsd/ipsd.cxx
deleted file mode 100644
index 9b690d1a0592..000000000000
--- a/goodies/source/filter.vcl/ipsd/ipsd.cxx
+++ /dev/null
@@ -1,766 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ipsd.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <svtools/fltcall.hxx>
-
-//============================ PSDReader ==================================
-
-#define PSD_BITMAP          0
-#define PSD_GRAYSCALE       1
-#define PSD_INDEXED         2
-#define PSD_RGB             3
-#define PSD_CMYK            4
-#define PSD_MULTICHANNEL    7
-#define PSD_DUOTONE         8
-#define PSD_LAB             9
-
-typedef struct
-{
-    UINT32  nSignature;
-    UINT16  nVersion;
-    UINT32  nPad1;
-    UINT16  nPad2;
-    UINT16  nChannels;
-    UINT32  nRows;
-    UINT32  nColumns;
-    UINT16  nDepth;
-    UINT16  nMode;
-
-} PSDFileHeader;
-
-class PSDReader {
-
-private:
-
-    SvStream*           mpPSD;          // Die einzulesende PSD-Datei
-    PSDFileHeader*      mpFileHeader;
-
-    sal_uInt32          mnXResFixed;
-    sal_uInt32          mnYResFixed;
-
-    sal_Bool            mbStatus;
-    sal_Bool            mbTransparent;
-
-    Bitmap              maBmp;
-    Bitmap              maMaskBmp;
-    BitmapReadAccess*   mpReadAcc;
-    BitmapWriteAccess*  mpWriteAcc;
-    BitmapWriteAccess*  mpMaskWriteAcc;
-    USHORT              mnDestBitDepth;
-    BOOL                mbCompression;  // RLE decoding
-    BYTE*               mpPalette;
-
-    BOOL                ImplReadBody();
-    BOOL                ImplReadHeader();
-
-public:
-                        PSDReader();
-                        ~PSDReader();
-    BOOL                ReadPSD( SvStream & rPSD, Graphic & rGraphic );
-};
-
-//=================== Methoden von PSDReader ==============================
-
-PSDReader::PSDReader() :
-    mpFileHeader    ( NULL ),
-    mnXResFixed     ( 0 ),
-    mnYResFixed     ( 0 ),
-    mbStatus        ( TRUE ),
-    mbTransparent   ( FALSE ),
-    mpReadAcc       ( NULL ),
-    mpWriteAcc      ( NULL ),
-    mpMaskWriteAcc  ( NULL ),
-    mpPalette       ( NULL )
-{
-}
-
-PSDReader::~PSDReader()
-{
-    delete[] mpPalette;
-    delete mpFileHeader;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PSDReader::ReadPSD( SvStream & rPSD, Graphic & rGraphic )
-{
-    if ( rPSD.GetError() )
-        return FALSE;
-
-    mpPSD = &rPSD;
-    mpPSD->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-
-    // Kopf einlesen:
-
-    if ( ImplReadHeader() == FALSE )
-        return FALSE;
-
-    Size aBitmapSize( mpFileHeader->nColumns, mpFileHeader->nRows );
-    maBmp = Bitmap( aBitmapSize, mnDestBitDepth );
-    if ( ( mpWriteAcc = maBmp.AcquireWriteAccess() ) == NULL )
-        mbStatus = FALSE;
-    if ( ( mpReadAcc = maBmp.AcquireReadAccess() ) == NULL )
-        mbStatus = FALSE;
-    if ( mbTransparent && mbStatus )
-    {
-        maMaskBmp = Bitmap( aBitmapSize, 1 );
-        if ( ( mpMaskWriteAcc = maMaskBmp.AcquireWriteAccess() ) == NULL )
-            mbStatus = FALSE;
-    }
-    if ( mpPalette && mbStatus )
-    {
-        mpWriteAcc->SetPaletteEntryCount( 256 );
-        for ( USHORT i = 0; i < 256; i++ )
-        {
-            mpWriteAcc->SetPaletteColor( i, Color( mpPalette[ i ], mpPalette[ i + 256 ], mpPalette[ i + 512 ] ) );
-        }
-    }
-    // Bitmap-Daten einlesen
-    if ( mbStatus && ImplReadBody() )
-    {
-        if ( mbTransparent )
-            rGraphic = Graphic( BitmapEx( maBmp, maMaskBmp ) );
-        else
-            rGraphic = maBmp;
-
-        if ( mnXResFixed && mnYResFixed )
-        {
-            Point       aEmptyPoint;
-            Fraction    aFractX( 1, mnXResFixed >> 16 );
-            Fraction    aFractY( 1, mnYResFixed >> 16 );
-            MapMode     aMapMode( MAP_INCH, aEmptyPoint, aFractX, aFractY );
-            Size        aPrefSize = OutputDevice::LogicToLogic( aBitmapSize, aMapMode, MAP_100TH_MM );
-            rGraphic.SetPrefSize( aPrefSize );
-            rGraphic.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
-        }
-    }
-    else
-        mbStatus = FALSE;
-    if ( mpWriteAcc )
-        maBmp.ReleaseAccess( mpWriteAcc );
-    if ( mpReadAcc )
-        maBmp.ReleaseAccess( mpReadAcc );
-    if ( mpMaskWriteAcc )
-        maMaskBmp.ReleaseAccess( mpMaskWriteAcc );
-    return mbStatus;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PSDReader::ImplReadHeader()
-{
-    UINT16  nCompression;
-    UINT32  nColorLength, nResourceLength, nLayerMaskLength;
-
-    mpFileHeader = new PSDFileHeader;
-
-    if ( !mpFileHeader )
-        return FALSE;
-
-    *mpPSD >> mpFileHeader->nSignature >> mpFileHeader->nVersion >> mpFileHeader->nPad1 >>
-        mpFileHeader->nPad2 >> mpFileHeader->nChannels >> mpFileHeader->nRows >>
-            mpFileHeader->nColumns >> mpFileHeader->nDepth >> mpFileHeader->nMode;
-
-    if ( ( mpFileHeader->nSignature != 0x38425053 ) || ( mpFileHeader->nVersion != 1 ) )
-        return FALSE;
-
-    if ( mpFileHeader->nRows == 0 || mpFileHeader->nColumns == 0 )
-        return FALSE;
-
-    if ( ( mpFileHeader->nRows > 30000 ) || ( mpFileHeader->nColumns > 30000 ) )
-        return FALSE;
-
-    UINT16 nDepth = mpFileHeader->nDepth;
-    if (!( ( nDepth == 1 ) || ( nDepth == 8 ) || ( nDepth == 16 ) ) )
-        return FALSE;
-
-    mnDestBitDepth = ( nDepth == 16 ) ? 8 : nDepth;
-
-    *mpPSD >> nColorLength;
-    if ( mpFileHeader->nMode == PSD_CMYK )
-    {
-        switch ( mpFileHeader->nChannels )
-        {
-            case 5 :
-                mbTransparent = TRUE;
-            case 4 :
-                mnDestBitDepth = 24;
-            break;
-            default :
-                return FALSE;
-        }
-    }
-    else switch ( mpFileHeader->nChannels )
-    {
-        case 2 :
-            mbTransparent = TRUE;
-        case 1 :
-            break;
-        case 4 :
-            mbTransparent = TRUE;
-        case 3 :
-            mnDestBitDepth = 24;
-            break;
-        default:
-            return FALSE;
-    }
-
-    switch ( mpFileHeader->nMode )
-    {
-        case PSD_BITMAP :
-        {
-            if ( nColorLength || ( nDepth != 1 ) )
-                return FALSE;
-        }
-        break;
-
-        case PSD_INDEXED :
-        {
-            if ( nColorLength != 768 )      // we need the color map
-                return FALSE;
-            mpPalette = new BYTE[ 768 ];
-            if ( mpPalette == NULL )
-                return FALSE;
-            mpPSD->Read( mpPalette, 768 );
-        }
-        break;
-
-        case PSD_DUOTONE :                  // we'll handle the doutone color like a normal grayscale picture
-            mpPSD->SeekRel( nColorLength );
-            nColorLength = 0;
-        case PSD_GRAYSCALE :
-        {
-            if ( nColorLength )
-                return FALSE;
-            mpPalette = new BYTE[ 768 ];
-            if ( mpPalette == NULL )
-                return FALSE;
-            for ( USHORT i = 0; i < 256; i++ )
-            {
-                mpPalette[ i ] = mpPalette[ i + 256 ] = mpPalette[ i + 512 ] = (BYTE)i;
-            }
-        }
-        break;
-
-        case PSD_CMYK :
-        case PSD_RGB :
-        case PSD_MULTICHANNEL :
-        case PSD_LAB :
-        {
-            if ( nColorLength )     // color table is not supported by the other graphic modes
-                return FALSE;
-        }
-        break;
-
-        default:
-            return FALSE;
-    }
-    *mpPSD >> nResourceLength;
-    sal_uInt32 nLayerPos = mpPSD->Tell() + nResourceLength;
-
-    // this is a loop over the resource entries to get the resolution info
-    while( mpPSD->Tell() < nLayerPos )
-    {
-        sal_uInt8 n8;
-        sal_uInt32 nType, nPStringLen, nResEntryLen;
-        sal_uInt16 nUniqueID;
-
-        *mpPSD >> nType >> nUniqueID >> n8;
-        nPStringLen = n8;
-        if ( nType != 0x3842494d )
-            break;
-        if ( ! ( nPStringLen & 1 ) )
-            nPStringLen++;
-        mpPSD->SeekRel( nPStringLen );  // skipping the pstring
-        *mpPSD >> nResEntryLen;
-        if ( nResEntryLen & 1 )
-            nResEntryLen++;             // the resource entries are padded
-        sal_uInt32 nCurrentPos = mpPSD->Tell();
-        if ( ( nResEntryLen + nCurrentPos ) > nLayerPos )   // check if size
-            break;                                          // is possible
-        switch( nUniqueID )
-        {
-            case 0x3ed :    // UID for the resolution info
-            {
-                sal_Int16   nUnit;
-
-                *mpPSD >> mnXResFixed >> nUnit >> nUnit
-                       >> mnYResFixed >> nUnit >> nUnit;
-            }
-            break;
-        }
-        mpPSD->Seek( nCurrentPos + nResEntryLen );          // set the stream to the next
-    }                                                       // resource entry
-    mpPSD->Seek( nLayerPos );
-    *mpPSD >> nLayerMaskLength;
-    mpPSD->SeekRel( nLayerMaskLength );
-
-    *mpPSD >> nCompression;
-    if ( nCompression == 0 )
-    {
-        mbCompression = FALSE;
-    }
-    else if ( nCompression == 1 )
-    {
-        mpPSD->SeekRel( ( mpFileHeader->nRows * mpFileHeader->nChannels ) << 1 );
-        mbCompression = TRUE;
-    }
-    else
-        return FALSE;
-
-    return TRUE;
-}
-
-// ------------------------------------------------------------------------
-
-BOOL PSDReader::ImplReadBody()
-{
-    ULONG       nX, nY;
-    char        nRunCount = 0;
-    signed char nBitCount = -1;
-    BYTE        nDat = 0, nDummy, nRed, nGreen, nBlue;
-    BitmapColor aBitmapColor;
-    nX = nY = 0;
-
-    switch ( mnDestBitDepth )
-    {
-        case 1 :
-        {
-            while ( nY < mpFileHeader->nRows )
-            {
-                if ( nBitCount == -1 )
-                {
-                    if ( mbCompression )    // else nRunCount = 0 -> so we use only single raw packets
-                        *mpPSD >> nRunCount;
-                }
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    if ( nBitCount == -1 )  // bits left in nDat ?
-                    {
-                        *mpPSD >> nDat;
-                        nDat ^= 0xff;
-                        nBitCount = 7;
-                    }
-                    for ( USHORT i = 0; i < ( -nRunCount + 1 ); i++ )
-                    {
-                        mpWriteAcc->SetPixel( nY, nX, (BYTE)nDat >> nBitCount-- );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            nBitCount = -1;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                    {
-                        if ( nBitCount == -1 )  // bits left in nDat ?
-                        {
-                            *mpPSD >> nDat;
-                            nDat ^= 0xff;
-                            nBitCount = 7;
-                        }
-                        mpWriteAcc->SetPixel( nY, nX, (BYTE)nDat >> nBitCount-- );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            nBitCount = -1;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-        break;
-
-        case 8 :
-        {
-            while ( nY < mpFileHeader->nRows )
-            {
-                if ( mbCompression )        // else nRunCount = 0 -> so we use only single raw packets
-                    *mpPSD >> nRunCount;
-
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    *mpPSD >> nDat;
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        *mpPSD >> nDummy;
-                    for ( USHORT i = 0; i < ( -nRunCount + 1 ); i++ )
-                    {
-                        mpWriteAcc->SetPixel( nY, nX, (BYTE)nDat );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                    {
-                        *mpPSD >> nDat;
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            *mpPSD >> nDummy;
-                        mpWriteAcc->SetPixel( nY, nX, (BYTE)nDat );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-        break;
-
-        case 24 :
-        {
-
-            // the psd format is in plain order (RRRR GGGG BBBB) so we have to set each pixel three times
-            // maybe the format is CCCC MMMM YYYY KKKK
-
-            while ( nY < mpFileHeader->nRows )
-            {
-                if ( mbCompression )        // else nRunCount = 0 -> so we use only single raw packets
-                    *mpPSD >> nRunCount;
-
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    *mpPSD >> nRed;
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        *mpPSD >> nDummy;
-                    for ( USHORT i = 0; i < ( -nRunCount + 1 ); i++ )
-                    {
-                        mpWriteAcc->SetPixel( nY, nX, BitmapColor( nRed, (BYTE)0, (BYTE)0 ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                    {
-                        *mpPSD >> nRed;
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            *mpPSD >> nDummy;
-                        mpWriteAcc->SetPixel( nY, nX, BitmapColor( nRed, (BYTE)0, (BYTE)0 ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-            nY = 0;
-            while ( nY < mpFileHeader->nRows )
-            {
-                if ( mbCompression )
-                    *mpPSD >> nRunCount;
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    *mpPSD >> nGreen;
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        *mpPSD >> nDummy;
-                    for ( USHORT i = 0; i < ( -nRunCount + 1 ); i++ )
-                    {
-                        aBitmapColor = mpReadAcc->GetPixel( nY, nX );
-                        mpWriteAcc->SetPixel( nY, nX, BitmapColor( aBitmapColor.GetRed(), nGreen, aBitmapColor.GetBlue() ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                    {
-                        *mpPSD >> nGreen;
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            *mpPSD >> nDummy;
-                        aBitmapColor = mpReadAcc->GetPixel( nY, nX );
-                        mpWriteAcc->SetPixel( nY, nX, BitmapColor( aBitmapColor.GetRed(), nGreen, aBitmapColor.GetBlue() ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-            nY = 0;
-            while ( nY < mpFileHeader->nRows )
-            {
-                if ( mbCompression )
-                    *mpPSD >> nRunCount;
-                if ( nRunCount & 0x80 )     // a run length packet
-                {
-                    *mpPSD >> nBlue;
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        *mpPSD >> nDummy;
-                    for ( USHORT i = 0; i < ( -nRunCount + 1 ); i++ )
-                    {
-                        aBitmapColor = mpReadAcc->GetPixel( nY, nX );
-                        mpWriteAcc->SetPixel( nY, nX, BitmapColor( aBitmapColor.GetRed(), aBitmapColor.GetGreen(), nBlue ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-                else                        // a raw packet
-                {
-                    for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                    {
-                        *mpPSD >> nBlue;
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            *mpPSD >> nDummy;
-                        aBitmapColor = mpReadAcc->GetPixel( nY, nX );
-                        mpWriteAcc->SetPixel( nY, nX, BitmapColor( aBitmapColor.GetRed(), aBitmapColor.GetGreen(), nBlue ) );
-                        if ( ++nX == mpFileHeader->nColumns )
-                        {
-                            nX = 0;
-                            nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                        }
-                    }
-                }
-            }
-            if ( mpFileHeader->nMode == PSD_CMYK )
-            {
-                UINT32  nBlack, nBlackMax = 0;
-                BYTE*   pBlack = new BYTE[ mpFileHeader->nRows * mpFileHeader->nColumns ];
-                nY = 0;
-                while ( nY < mpFileHeader->nRows )
-                {
-                    if ( mbCompression )        // else nRunCount = 0 -> so we use only single raw packets
-                        *mpPSD >> nRunCount;
-
-                    if ( nRunCount & 0x80 )     // a run length packet
-                    {
-                        *mpPSD >> nDat;
-
-                        if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                            *mpPSD >> nDummy;
-
-                        for ( USHORT i = 0; i < ( -nRunCount + 1 ); i++ )
-                        {
-                            nBlack = (BYTE)mpReadAcc->GetPixel( nY, nX ).GetRed() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            nBlack = (BYTE)mpReadAcc->GetPixel( nY, nX ).GetGreen() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            nBlack = (BYTE)mpReadAcc->GetPixel( nY, nX ).GetBlue() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            pBlack[ nX + nY * mpFileHeader->nColumns ] = nDat ^ 0xff;
-                            if ( ++nX == mpFileHeader->nColumns )
-                            {
-                                nX = 0;
-                                nY++;
-                            if ( nY == mpFileHeader->nRows )
-                                break;
-                            }
-                        }
-                    }
-                    else                        // a raw packet
-                    {
-                        for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                        {
-                            *mpPSD >> nDat;
-
-                            if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                                *mpPSD >> nDummy;
-                            nBlack = (BYTE)mpReadAcc->GetPixel( nY, nX ).GetRed() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            nBlack = (BYTE)mpReadAcc->GetPixel( nY, nX ).GetGreen() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            nBlack = (BYTE)mpReadAcc->GetPixel( nY, nX ).GetBlue() + nDat;
-                            if ( nBlack > nBlackMax )
-                                nBlackMax = nBlack;
-                            pBlack[ nX + nY * mpFileHeader->nColumns ] = nDat ^ 0xff;
-                            if ( ++nX == mpFileHeader->nColumns )
-                            {
-                                nX = 0;
-                                nY++;
-                                if ( nY == mpFileHeader->nRows )
-                                    break;
-                            }
-                        }
-                    }
-                }
-
-                for ( nY = 0; nY < mpFileHeader->nRows; nY++ )
-                {
-                    for ( nX = 0; nX < mpFileHeader->nColumns; nX++ )
-                    {
-                        INT32 nDAT = pBlack[ nX + nY * mpFileHeader->nColumns ] * ( nBlackMax - 256 ) / 0x1ff;
-
-                        aBitmapColor = mpReadAcc->GetPixel( nY, nX );
-                        BYTE cR = (BYTE) MinMax( aBitmapColor.GetRed() - nDAT, 0L, 255L );
-                        BYTE cG = (BYTE) MinMax( aBitmapColor.GetGreen() - nDAT, 0L, 255L );
-                        BYTE cB = (BYTE) MinMax( aBitmapColor.GetBlue() - nDAT, 0L, 255L );
-                        mpWriteAcc->SetPixel( nY, nX, BitmapColor( cR, cG, cB ) );
-                    }
-                }
-                delete[] pBlack;
-            }
-        }
-        break;
-    }
-
-    if ( mbTransparent )
-    {
-        // the psd is 24 or 8 bit grafix + alphachannel
-
-        nY = nX = 0;
-        while ( nY < mpFileHeader->nRows )
-        {
-            if ( mbCompression )        // else nRunCount = 0 -> so we use only single raw packets
-                *mpPSD >> nRunCount;
-
-            if ( nRunCount & 0x80 )     // a run length packet
-            {
-                *mpPSD >> nDat;
-                if ( nDat )
-                    nDat = 0;
-                else
-                    nDat = 1;
-                if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                    *mpPSD >> nDummy;
-                for ( USHORT i = 0; i < ( -nRunCount + 1 ); i++ )
-                {
-                    mpMaskWriteAcc->SetPixel( nY, nX, (BYTE)nDat );
-                    if ( ++nX == mpFileHeader->nColumns )
-                    {
-                        nX = 0;
-                        nY++;
-                        if ( nY == mpFileHeader->nRows )
-                            break;
-                    }
-                }
-            }
-            else                        // a raw packet
-            {
-                for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                {
-                    *mpPSD >> nDat;
-                    if ( nDat )
-                        nDat = 0;
-                    else
-                        nDat = 1;
-                    if ( mpFileHeader->nDepth == 16 )   // 16 bit depth is to be skipped
-                        *mpPSD >> nDummy;
-                    mpMaskWriteAcc->SetPixel( nY, nX, (BYTE)nDat );
-                    if ( ++nX == mpFileHeader->nColumns )
-                    {
-                        nX = 0;
-                        nY++;
-                        if ( nY == mpFileHeader->nRows )
-                            break;
-                    }
-                }
-            }
-        }
-    }
-    return TRUE;
-}
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
-{
-    PSDReader aPSDReader;
-
-    return aPSDReader.ReadPSD( rStream, rGraphic );
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
diff --git a/goodies/source/filter.vcl/ipsd/makefile.mk b/goodies/source/filter.vcl/ipsd/makefile.mk
deleted file mode 100644
index cd29c94f8074..000000000000
--- a/goodies/source/filter.vcl/ipsd/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=ipsd
-DEPTARGET=vipsd
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/ipsd.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	ipd$(DLLPOSTFIX)
-SHL1IMPLIB= 	ipsd
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=		$(SLB)$/ipsd.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/ipsd.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/goodies/source/filter.vcl/iras/exports.map b/goodies/source/filter.vcl/iras/exports.map
deleted file mode 100644
index ebd8464837fa..000000000000
--- a/goodies/source/filter.vcl/iras/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-RASIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/iras/iras.cxx b/goodies/source/filter.vcl/iras/iras.cxx
deleted file mode 100644
index 841562b33298..000000000000
--- a/goodies/source/filter.vcl/iras/iras.cxx
+++ /dev/null
@@ -1,386 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: iras.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <svtools/fltcall.hxx>
-
-#define RAS_TYPE_OLD            0x00000000      // supported formats by this filter
-#define RAS_TYPE_STANDARD       0x00000001
-#define RAS_TYPE_BYTE_ENCODED   0x00000002
-#define RAS_TYPE_RGB_FORMAT     0x00000003
-
-#define RAS_COLOR_NO_MAP        0x00000000
-#define RAS_COLOR_RGB_MAP       0x00000001
-#define RAS_COLOR_RAW_MAP       0x00000002
-
-#define SUNRASTER_MAGICNUMBER   0x59a66a95
-
-//============================ RASReader ==================================
-
-class RASReader {
-
-private:
-
-    SvStream*           mpRAS;                  // Die einzulesende RAS-Datei
-
-    BOOL                mbStatus;
-    Bitmap              maBmp;
-    BitmapWriteAccess*  mpAcc;
-    sal_uInt32          mnWidth, mnHeight;      // Bildausmass in Pixeln
-    USHORT              mnDstBitsPerPix;
-    USHORT              mnDstColors;
-    sal_uInt32          mnDepth, mnImageDatSize, mnType;
-    sal_uInt32          mnColorMapType, mnColorMapSize;
-    BYTE                mnRepCount, mnRepVal;   // RLE Decoding
-    BOOL                mbPalette;
-
-    BOOL                ImplReadBody();
-    BOOL                ImplReadHeader();
-    BYTE                ImplGetByte();
-
-public:
-                        RASReader();
-                        ~RASReader();
-    BOOL                ReadRAS( SvStream & rRAS, Graphic & rGraphic );
-};
-
-//=================== Methoden von RASReader ==============================
-
-RASReader::RASReader() :
-    mbStatus    ( TRUE ),
-    mpAcc       ( NULL ),
-    mnRepCount  ( 0 ),
-    mbPalette   ( FALSE )
-{
-}
-
-RASReader::~RASReader()
-{
-}
-
-//----------------------------------------------------------------------------
-
-BOOL RASReader::ReadRAS( SvStream & rRAS, Graphic & rGraphic )
-{
-    UINT32 nMagicNumber;
-
-    if ( rRAS.GetError() )
-        return FALSE;
-
-    mpRAS = &rRAS;
-    mpRAS->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-    *mpRAS >> nMagicNumber;
-    if ( nMagicNumber != SUNRASTER_MAGICNUMBER )
-        return FALSE;
-
-    // Kopf einlesen:
-
-    if ( ( mbStatus = ImplReadHeader() ) == FALSE )
-        return FALSE;
-
-    maBmp = Bitmap( Size( mnWidth, mnHeight ), mnDstBitsPerPix );
-    if ( ( mpAcc = maBmp.AcquireWriteAccess() ) == FALSE )
-        return FALSE;
-
-    if ( mnDstBitsPerPix <= 8 )     // paletten bildchen
-    {
-        if ( mnColorMapType == RAS_COLOR_RAW_MAP )      // RAW Colormap wird geskipped
-        {
-            ULONG nCurPos = mpRAS->Tell();
-            mpRAS->Seek( nCurPos + mnColorMapSize );
-        }
-        else if ( mnColorMapType == RAS_COLOR_RGB_MAP ) // RGB koennen wir auslesen
-        {
-            mnDstColors = (USHORT)( mnColorMapSize / 3 );
-
-            if ( ( 1 << mnDstBitsPerPix ) < mnDstColors )
-                return FALSE;
-
-            if ( ( mnDstColors >= 2 ) && ( ( mnColorMapSize % 3 ) == 0 ) )
-            {
-                mpAcc->SetPaletteEntryCount( mnDstColors );
-                USHORT  i;
-                BYTE    nRed[256], nGreen[256], nBlue[256];
-                for ( i = 0; i < mnDstColors; i++ ) *mpRAS >> nRed[ i ];
-                for ( i = 0; i < mnDstColors; i++ ) *mpRAS >> nGreen[ i ];
-                for ( i = 0; i < mnDstColors; i++ ) *mpRAS >> nBlue[ i ];
-                for ( i = 0; i < mnDstColors; i++ )
-                {
-                    mpAcc->SetPaletteColor( i, BitmapColor( nRed[ i ], nGreen[ i ], nBlue[ i ] ) );
-                }
-                mbPalette = TRUE;
-            }
-            else
-                return FALSE;
-
-        }
-        else if ( mnColorMapType != RAS_COLOR_NO_MAP )  // alles andere ist kein standard
-            return FALSE;
-
-        if ( !mbPalette )
-        {
-            mnDstColors = 1 << mnDstBitsPerPix;
-            mpAcc->SetPaletteEntryCount( mnDstColors );
-            for ( USHORT i = 0; i < mnDstColors; i++ )
-            {
-                ULONG nCount = 255 - ( 255 * i / ( mnDstColors - 1 ) );
-                mpAcc->SetPaletteColor( i, BitmapColor( (BYTE)nCount, (BYTE)nCount, (BYTE)nCount ) );
-            }
-        }
-    }
-    else
-    {
-        if ( mnColorMapType != RAS_COLOR_NO_MAP )   // when graphic has more then 256 colors and a color map we skip
-        {                                           // the colormap
-            ULONG nCurPos = mpRAS->Tell();
-            mpRAS->Seek( nCurPos + mnColorMapSize );
-        }
-    }
-
-    // Bitmap-Daten einlesen
-    mbStatus = ImplReadBody();
-
-    if ( mpAcc )
-    {
-        maBmp.ReleaseAccess( mpAcc ), mpAcc = NULL;
-    }
-    if ( mbStatus )
-        rGraphic = maBmp;
-
-    return mbStatus;
-}
-
-//----------------------------------------------------------------------------
-
-BOOL RASReader::ImplReadHeader()
-{
-    *mpRAS >> mnWidth >> mnHeight >> mnDepth >> mnImageDatSize >>
-        mnType >> mnColorMapType >> mnColorMapSize;
-
-    if ( mnWidth == 0 || mnHeight == 0 )
-        mbStatus = FALSE;
-
-    switch ( mnDepth )
-    {
-        case 24 :
-        case  8 :
-        case  1 :
-            mnDstBitsPerPix = (USHORT)mnDepth;
-            break;
-        case 32 :
-            mnDstBitsPerPix = 24;
-            break;
-
-        default :
-            mbStatus = FALSE;
-    }
-
-    switch ( mnType )
-    {
-        case RAS_TYPE_OLD :
-        case RAS_TYPE_STANDARD :
-        case RAS_TYPE_RGB_FORMAT :
-        case RAS_TYPE_BYTE_ENCODED :            // this type will be supported later
-            break;
-
-        default:
-            mbStatus = FALSE;
-    }
-    return mbStatus;
-}
-
-//----------------------------------------------------------------------------
-
-BOOL RASReader::ImplReadBody()
-{
-    ULONG   x, y;
-    BYTE    nDat = 0;
-    BYTE    nRed, nGreen, nBlue;
-    switch ( mnDstBitsPerPix )
-    {
-        case 1 :
-            for ( y = 0; y < mnHeight; y++ )
-            {
-                for ( x = 0; x < mnWidth; x++ )
-                {
-                    if (!(x & 7))
-                        nDat = ImplGetByte();
-                    mpAcc->SetPixel (
-                        y, x,
-                        sal::static_int_cast< BYTE >(
-                            nDat >> ( ( x & 7 ) ^ 7 )) );
-                }
-                if (!( ( x - 1 ) & 0x8 ) ) ImplGetByte();       // WORD ALIGNMENT ???
-            }
-            break;
-
-        case 8 :
-            for ( y = 0; y < mnHeight; y++ )
-            {
-                for ( x = 0; x < mnWidth; x++ )
-                {
-                    nDat = ImplGetByte();
-                    mpAcc->SetPixel ( y, x, nDat );
-                }
-                if ( x & 1 ) ImplGetByte();                     // WORD ALIGNMENT ???
-            }
-            break;
-
-        case 24 :
-            switch ( mnDepth )
-            {
-
-                case 24 :
-                    for ( y = 0; y < mnHeight; y++ )
-                    {
-                        for ( x = 0; x < mnWidth; x++ )
-                        {
-                            if ( mnType == RAS_TYPE_RGB_FORMAT )
-                            {
-                                nRed = ImplGetByte();
-                                nGreen = ImplGetByte();
-                                nBlue = ImplGetByte();
-                            }
-                            else
-                            {
-                                nBlue = ImplGetByte();
-                                nGreen = ImplGetByte();
-                                nRed = ImplGetByte();
-                            }
-                            mpAcc->SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) );
-                        }
-                        if ( x & 1 ) ImplGetByte();                     // WORD ALIGNMENT ???
-                    }
-                    break;
-
-                case 32 :
-                    for ( y = 0; y < mnHeight; y++ )
-                    {
-                        for ( x = 0; x < mnWidth; x++ )
-                        {
-                            nDat = ImplGetByte();               // pad byte > nil
-                            if ( mnType == RAS_TYPE_RGB_FORMAT )
-                            {
-                                nRed = ImplGetByte();
-                                nGreen = ImplGetByte();
-                                nBlue = ImplGetByte();
-                            }
-                            else
-                            {
-                                nBlue = ImplGetByte();
-                                nGreen = ImplGetByte();
-                                nRed = ImplGetByte();
-                            }
-                            mpAcc->SetPixel ( y, x, BitmapColor( nRed, nGreen, nBlue ) );
-                        }
-                    }
-                    break;
-            }
-            break;
-
-        default:
-            mbStatus = FALSE;
-            break;
-    }
-    return mbStatus;
-}
-
-//----------------------------------------------------------------------------
-
-BYTE RASReader::ImplGetByte()
-{
-    BYTE nRetVal;
-    if ( mnType != RAS_TYPE_BYTE_ENCODED )
-    {
-        *mpRAS >> nRetVal;
-        return nRetVal;
-    }
-    else
-    {
-        if ( mnRepCount )
-        {
-            mnRepCount--;
-            return mnRepVal;
-        }
-        else
-        {
-            *mpRAS >> nRetVal;
-            if ( nRetVal != 0x80 )
-                return nRetVal;
-            *mpRAS >> nRetVal;
-            if ( nRetVal == 0 )
-                return 0x80;
-            mnRepCount = nRetVal    ;
-            *mpRAS >> mnRepVal;
-            return mnRepVal;
-        }
-    }
-}
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
-{
-    RASReader aRASReader;
-
-    return aRASReader.ReadRAS( rStream, rGraphic );
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/goodies/source/filter.vcl/iras/makefile.mk b/goodies/source/filter.vcl/iras/makefile.mk
deleted file mode 100644
index 28b84c8401ef..000000000000
--- a/goodies/source/filter.vcl/iras/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=iras
-DEPTARGET=viras
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/iras.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	ira$(DLLPOSTFIX)
-SHL1IMPLIB= 	iras
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=		$(SLB)$/iras.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/iras.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/goodies/source/filter.vcl/itga/exports.map b/goodies/source/filter.vcl/itga/exports.map
deleted file mode 100644
index cb127f330e5d..000000000000
--- a/goodies/source/filter.vcl/itga/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-TGAIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/itga/itga.cxx b/goodies/source/filter.vcl/itga/itga.cxx
deleted file mode 100644
index 4fcf701b5202..000000000000
--- a/goodies/source/filter.vcl/itga/itga.cxx
+++ /dev/null
@@ -1,761 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: itga.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#include <svtools/fltcall.hxx>
-
-//============================ TGAReader ==================================
-
-struct TGAFileHeader
-{
-    BYTE        nImageIDLength;
-    BYTE        nColorMapType;
-    BYTE        nImageType;
-    UINT16      nColorMapFirstEntryIndex;
-    UINT16      nColorMapLength;
-    BYTE        nColorMapEntrySize;
-    UINT16      nColorMapXOrigin;
-    UINT16      nColorMapYOrigin;
-    UINT16      nImageWidth;
-    UINT16      nImageHeight;
-    BYTE        nPixelDepth;
-    BYTE        nImageDescriptor;
-};
-
-#define SizeOfTGAFileFooter 26
-
-struct TGAFileFooter
-{
-    UINT32      nExtensionFileOffset;
-    UINT32      nDeveloperDirectoryOffset;
-    UINT32      nSignature[4];
-    BYTE        nPadByte;
-    BYTE        nStringTerminator;
-};
-
-#define SizeOfTGAExtension 495
-
-struct TGAExtension
-{
-    UINT16      nExtensionSize;
-    char        sAuthorName[41];
-    char        sAuthorComment[324];
-    char        sDateTimeStamp[12];
-    char        sJobNameID[41];
-    UINT16      nJobTime[3];
-    char        sSoftwareID[41];
-    UINT16      nSoftwareVersionNumber;
-    BYTE        nSoftwareVersionLetter;
-    UINT32      nKeyColor;
-    UINT16      nPixelAspectRatioNumerator;
-    UINT16      nPixelAspectRatioDeNumerator;
-    UINT16      nGammaValueNumerator;
-    UINT16      nGammaValueDeNumerator;
-    UINT32      nColorCorrectionOffset;
-    UINT32      nPostageStampOffset;
-    UINT32      nScanLineOffset;
-    BYTE        nAttributesType;
-};
-
-class TGAReader {
-
-private:
-
-    SvStream*           mpTGA;
-
-    BitmapWriteAccess*  mpAcc;
-    TGAFileHeader*      mpFileHeader;
-    TGAFileFooter*      mpFileFooter;
-    TGAExtension*       mpExtension;
-    UINT32*             mpColorMap;
-
-    BOOL                mbStatus;
-
-    ULONG               mnTGAVersion;       // Enhanced TGA is defined as Version 2.0
-    UINT16              mnDestBitDepth;
-    BOOL                mbIndexing;         // TRUE if source contains indexing color values
-    BOOL                mbEncoding;         // TRUE if source is compressed
-
-    BOOL                ImplReadHeader();
-    BOOL                ImplReadPalette();
-    BOOL                ImplReadBody();
-
-public:
-                        TGAReader();
-                        ~TGAReader();
-    BOOL                ReadTGA( SvStream & rTGA, Graphic & rGraphic );
-};
-
-//=================== Methoden von TGAReader ==============================
-
-TGAReader::TGAReader() :
-    mpAcc           ( NULL ),
-    mpFileHeader    ( NULL ),
-    mpFileFooter    ( NULL ),
-    mpExtension     ( NULL ),
-    mpColorMap      ( NULL ),
-    mbStatus        ( TRUE ),
-    mnTGAVersion    ( 1 ),
-    mbIndexing      ( FALSE ),
-    mbEncoding      ( FALSE )
-{
-}
-
-TGAReader::~TGAReader()
-{
-    delete[] mpColorMap;
-    delete mpFileHeader;
-    delete mpExtension;
-    delete mpFileFooter;
-}
-
-// -------------------------------------------------------------------------------------------
-
-BOOL TGAReader::ReadTGA( SvStream & rTGA, Graphic & rGraphic )
-{
-    if ( rTGA.GetError() )
-        return FALSE;
-
-    mpTGA = &rTGA;
-    mpTGA->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-
-    // Kopf einlesen:
-
-    if ( !mpTGA->GetError() )
-    {
-        mbStatus = ImplReadHeader();
-        if ( mbStatus )
-        {
-            Bitmap              aBitmap;
-
-            aBitmap = Bitmap( Size( mpFileHeader->nImageWidth, mpFileHeader->nImageHeight ), mnDestBitDepth );
-            mpAcc = aBitmap.AcquireWriteAccess();
-            if ( mpAcc )
-            {
-                if ( mbIndexing )
-                    mbStatus = ImplReadPalette();
-                if ( mbStatus )
-                    mbStatus = ImplReadBody();
-            }
-            else
-                mbStatus = FALSE;
-
-            if ( mpAcc )
-                aBitmap.ReleaseAccess ( mpAcc), mpAcc = NULL;
-
-            if ( mbStatus )
-                rGraphic = aBitmap;
-        }
-    }
-    return mbStatus;
-}
-
-// -------------------------------------------------------------------------------------------
-
-BOOL TGAReader::ImplReadHeader()
-{
-    mpFileHeader = new TGAFileHeader;
-    if ( mpFileHeader == NULL )
-        return FALSE;
-
-    *mpTGA >> mpFileHeader->nImageIDLength >> mpFileHeader->nColorMapType >> mpFileHeader->nImageType >>
-        mpFileHeader->nColorMapFirstEntryIndex >> mpFileHeader->nColorMapLength >> mpFileHeader->nColorMapEntrySize >>
-            mpFileHeader->nColorMapXOrigin >> mpFileHeader->nColorMapYOrigin >> mpFileHeader->nImageWidth >>
-                mpFileHeader->nImageHeight >> mpFileHeader->nPixelDepth >> mpFileHeader->nImageDescriptor;
-
-    if ( mpFileHeader->nColorMapType > 1 )
-        return FALSE;
-    if ( mpFileHeader->nColorMapType == 1 )
-        mbIndexing = TRUE;
-
-    // first we want to get the version
-    mpFileFooter = new TGAFileFooter;       // read the TGA-File-Footer to determine whether
-    if ( mpFileFooter )                     // we got an old TGA format or the new one
-    {
-        ULONG nCurStreamPos = mpTGA->Tell();
-        mpTGA->Seek( STREAM_SEEK_TO_END );
-        ULONG nTemp = mpTGA->Tell();
-        mpTGA->Seek( nTemp - SizeOfTGAFileFooter );
-
-        *mpTGA >> mpFileFooter->nExtensionFileOffset >> mpFileFooter->nDeveloperDirectoryOffset >>
-            mpFileFooter->nSignature[0] >> mpFileFooter->nSignature[1] >> mpFileFooter->nSignature[2] >>
-                mpFileFooter->nSignature[3] >> mpFileFooter->nPadByte >> mpFileFooter->nStringTerminator;
-
-        // check for TRUE, VISI, ON-X, FILE in the signatures
-        if ( mpFileFooter->nSignature[ 0 ] == (('T'<<24)|('R'<<16)|('U'<<8)|'E') &&
-             mpFileFooter->nSignature[ 1 ] == (('V'<<24)|('I'<<16)|('S'<<8)|'I') &&
-             mpFileFooter->nSignature[ 2 ] == (('O'<<24)|('N'<<16)|('-'<<8)|'X') &&
-             mpFileFooter->nSignature[ 3 ] == (('F'<<24)|('I'<<16)|('L'<<8)|'E') )
-        {
-            mpExtension = new TGAExtension;
-            if ( mpExtension )
-            {
-                mpTGA->Seek( mpFileFooter->nExtensionFileOffset );
-                *mpTGA >> mpExtension->nExtensionSize;
-                if ( mpExtension->nExtensionSize >= SizeOfTGAExtension )
-                {
-                    mnTGAVersion = 2;
-
-                    mpTGA->Read( mpExtension->sAuthorName, 41 );
-                    mpTGA->Read( mpExtension->sAuthorComment, 324 );
-                    mpTGA->Read( mpExtension->sDateTimeStamp, 12 );
-                    mpTGA->Read( mpExtension->sJobNameID, 12 );
-                    *mpTGA >> mpExtension->sJobNameID[ 0 ] >> mpExtension->sJobNameID[ 1 ] >> mpExtension->sJobNameID[ 2 ];
-                    mpTGA->Read( mpExtension->sSoftwareID, 41 );
-                    *mpTGA >> mpExtension->nSoftwareVersionNumber >> mpExtension->nSoftwareVersionLetter
-                        >> mpExtension->nKeyColor >> mpExtension->nPixelAspectRatioNumerator
-                            >> mpExtension->nPixelAspectRatioDeNumerator >> mpExtension->nGammaValueNumerator
-                                >> mpExtension->nGammaValueDeNumerator >> mpExtension->nColorCorrectionOffset
-                                    >> mpExtension->nPostageStampOffset >> mpExtension->nScanLineOffset
-                                        >> mpExtension->nAttributesType;
-
-                }
-            }
-        }
-        mpTGA->Seek( nCurStreamPos );
-    }
-
-    //  using the TGA file specification this was the correct form but adobe photoshop sets nImageDescriptor
-    //  equal to nPixelDepth
-    //  mnDestBitDepth = mpFileHeader->nPixelDepth - ( mpFileHeader->nImageDescriptor & 0xf );
-    mnDestBitDepth = mpFileHeader->nPixelDepth;
-
-    if ( mnDestBitDepth == 8 )                  // this is a patch for grayscale pictures not including a palette
-        mbIndexing = TRUE;
-
-    if ( mnDestBitDepth > 32 )                  // maybe the pixeldepth is invalid
-        return FALSE;
-    else if ( mnDestBitDepth > 8 )
-        mnDestBitDepth = 24;
-    else if ( mnDestBitDepth > 4 )
-        mnDestBitDepth = 8;
-    else if ( mnDestBitDepth > 2 )
-        mnDestBitDepth = 4;
-
-    if ( !mbIndexing && ( mnDestBitDepth < 15 ) )
-        return FALSE;
-
-    switch ( mpFileHeader->nImageType )
-    {
-        case 9  :                               // encoding for colortype 9, 10, 11
-        case 10 :
-        case 11 :
-            mbEncoding = TRUE;
-            break;
-    };
-
-    if ( mpFileHeader->nImageIDLength )         // skip the Image ID
-        mpTGA->SeekRel( mpFileHeader->nImageIDLength );
-
-    return mbStatus;
-}
-
-// -------------------------------------------------------------------------------------------
-
-BOOL TGAReader::ImplReadBody()
-{
-
-    USHORT  nXCount, nYCount, nRGB16;
-    BYTE    nRed, nGreen, nBlue, nRunCount, nDummy, nDepth;
-
-    // this four variables match the image direction
-    long    nY, nYAdd, nX, nXAdd, nXStart;
-
-    nX = nXStart = nY = 0;
-    nXCount = nYCount = 0;
-    nYAdd = nXAdd = 1;
-
-    if ( mpFileHeader->nImageDescriptor & 0x10 )
-    {
-        nX = nXStart = mpFileHeader->nImageWidth - 1;
-        nXAdd -= 2;
-    }
-
-    if ( !(mpFileHeader->nImageDescriptor & 0x20 ) )
-    {
-        nY = mpFileHeader->nImageHeight - 1;
-        nYAdd -=2;
-    }
-
-//  nDepth = mpFileHeader->nPixelDepth - ( mpFileHeader->nImageDescriptor & 0xf );
-    nDepth = mpFileHeader->nPixelDepth;
-
-    if ( mbEncoding )
-    {
-        if ( mbIndexing )
-        {
-            switch( nDepth )
-            {
-                // 16 bit encoding + indexing
-                case 16 :
-                    while ( nYCount < mpFileHeader->nImageHeight )
-                    {
-                        *mpTGA >> nRunCount;
-                        if ( nRunCount & 0x80 )     // a run length packet
-                        {
-                            *mpTGA >> nRGB16;
-                            if ( nRGB16 >= mpFileHeader->nColorMapLength )
-                                return FALSE;
-                            nRed = (BYTE)( mpColorMap[ nRGB16 ] >> 16 );
-                            nGreen = (BYTE)( mpColorMap[ nRGB16 ] >> 8 );
-                            nBlue = (BYTE)( mpColorMap[ nRGB16 ] );
-                            for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                            {
-                                mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                                nX += nXAdd;
-                                nXCount++;
-                                if ( nXCount == mpFileHeader->nImageWidth )
-                                {
-                                    nX = nXStart;
-                                    nXCount = 0;
-                                    nY += nYAdd;
-                                    nYCount++;
-                                }
-                            }
-                        }
-                        else                        // a raw packet
-                        {
-                            for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                            {
-                                *mpTGA >> nRGB16;
-                                if ( nRGB16 >= mpFileHeader->nColorMapLength )
-                                    return FALSE;
-                                nRed = (BYTE)( mpColorMap[ nRGB16 ] >> 16 );
-                                nGreen = (BYTE)( mpColorMap[ nRGB16 ] >> 8 );
-                                nBlue = (BYTE)( mpColorMap[ nRGB16 ] );
-                                mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                                nX += nXAdd;
-                                nXCount++;
-                                if ( nXCount == mpFileHeader->nImageWidth )
-                                {
-                                    nX = nXStart;
-                                    nXCount = 0;
-                                    nY += nYAdd;
-                                    nYCount++;
-                                }
-                            }
-                        }
-                    }
-                    break;
-
-                // 8 bit encoding + indexing
-                case 8 :
-                    while ( nYCount < mpFileHeader->nImageHeight )
-                    {
-                        *mpTGA >> nRunCount;
-                        if ( nRunCount & 0x80 )     // a run length packet
-                        {
-                            *mpTGA >> nDummy;
-                            if ( nDummy >= mpFileHeader->nColorMapLength )
-                                return FALSE;
-                            for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                            {
-                                mpAcc->SetPixel( nY, nX, (BYTE)nDummy );
-                                nX += nXAdd;
-                                nXCount++;
-                                if ( nXCount == mpFileHeader->nImageWidth )
-                                {
-                                    nX = nXStart;
-                                    nXCount = 0;
-                                    nY += nYAdd;
-                                    nYCount++;
-                                }
-                            }
-                        }
-                        else                        // a raw packet
-                        {
-                            for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                            {
-
-                                *mpTGA >> nDummy;
-                                if ( nDummy >= mpFileHeader->nColorMapLength )
-                                    return FALSE;
-                                mpAcc->SetPixel( nY, nX, (BYTE)nDummy );
-                                nX += nXAdd;
-                                nXCount++;
-                                if ( nXCount == mpFileHeader->nImageWidth )
-                                {
-                                    nX = nXStart;
-                                    nXCount = 0;
-                                    nY += nYAdd;
-                                    nYCount++;
-                                }
-                            }
-                        }
-                    }
-                    break;
-                default:
-                    return FALSE;
-            }
-        }
-        else
-        {
-            switch( nDepth )
-            {
-                // 32 bit transparent true color encoding
-                case 32 :
-                    {
-                        while ( nYCount < mpFileHeader->nImageHeight )
-                        {
-                            *mpTGA >> nRunCount;
-                            if ( nRunCount & 0x80 )     // a run length packet
-                            {
-                                *mpTGA >> nBlue >> nGreen >> nRed >> nDummy;
-                                for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                                {
-                                    mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                                    nX += nXAdd;
-                                    nXCount++;
-                                    if ( nXCount == mpFileHeader->nImageWidth )
-                                    {
-                                        nX = nXStart;
-                                        nXCount = 0;
-                                        nY += nYAdd;
-                                        nYCount++;
-                                    }
-                                }
-                            }
-                            else                        // a raw packet
-                            {
-                                for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                                {
-                                    *mpTGA >> nBlue >> nGreen >> nRed >> nDummy;
-                                    mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                                    nX += nXAdd;
-                                    nXCount++;
-                                    if ( nXCount == mpFileHeader->nImageWidth )
-                                    {
-                                        nX = nXStart;
-                                        nXCount = 0;
-                                        nY += nYAdd;
-                                        nYCount++;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    break;
-
-                // 24 bit true color encoding
-                case 24 :
-                    while ( nYCount < mpFileHeader->nImageHeight )
-                    {
-                        *mpTGA >> nRunCount;
-                        if ( nRunCount & 0x80 )     // a run length packet
-                        {
-                            *mpTGA >> nBlue >> nGreen >> nRed;
-                            for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                            {
-                                mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                                nX += nXAdd;
-                                nXCount++;
-                                if ( nXCount == mpFileHeader->nImageWidth )
-                                {
-                                    nX = nXStart;
-                                    nXCount = 0;
-                                    nY += nYAdd;
-                                    nYCount++;
-                                }
-                            }
-                        }
-                        else                        // a raw packet
-                        {
-                            for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                            {
-                                *mpTGA >> nBlue >> nGreen >> nRed;
-                                mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                                nX += nXAdd;
-                                nXCount++;
-                                if ( nXCount == mpFileHeader->nImageWidth )
-                                {
-                                    nX = nXStart;
-                                    nXCount = 0;
-                                    nY += nYAdd;
-                                    nYCount++;
-                                }
-                            }
-                        }
-                    }
-                    break;
-
-                // 16 bit true color encoding
-                case 16 :
-                    while ( nYCount < mpFileHeader->nImageHeight )
-                    {
-                        *mpTGA >> nRunCount;
-                        if ( nRunCount & 0x80 )     // a run length packet
-                        {
-                            *mpTGA >> nRGB16;
-                            nRed = (BYTE)( nRGB16 >> 7 ) & 0xf8;
-                            nGreen = (BYTE)( nRGB16 >> 2 ) & 0xf8;
-                            nBlue = (BYTE)( nRGB16 << 3 ) & 0xf8;
-                            for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                            {
-                                mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                                nX += nXAdd;
-                                nXCount++;
-                                if ( nXCount == mpFileHeader->nImageWidth )
-                                {
-                                    nX = nXStart;
-                                    nXCount = 0;
-                                    nY += nYAdd;
-                                    nYCount++;
-                                }
-                            }
-                        }
-                        else                        // a raw packet
-                        {
-                            for ( USHORT i = 0; i < ( ( nRunCount & 0x7f ) + 1 ); i++ )
-                            {
-                                *mpTGA >> nRGB16;
-                                nRed = (BYTE)( nRGB16 >> 7 ) & 0xf8;
-                                nGreen = (BYTE)( nRGB16 >> 2 ) & 0xf8;
-                                nBlue = (BYTE)( nRGB16 << 3 ) & 0xf8;
-                                mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                                nX += nXAdd;
-                                nXCount++;
-                                if ( nXCount == mpFileHeader->nImageWidth )
-                                {
-                                    nX = nXStart;
-                                    nXCount = 0;
-                                    nY += nYAdd;
-                                    nYCount++;
-                                }
-                            }
-                        }
-                    }
-                    break;
-
-                default:
-                    return FALSE;
-            }
-        }
-    }
-    else
-    {
-        for ( nYCount = 0; nYCount < mpFileHeader->nImageHeight; nYCount++, nY += nYAdd )
-        {
-            nX = nXStart;
-            nXCount = 0;
-
-            if ( mbIndexing )
-            {
-                switch( nDepth )
-                {
-                    // 16 bit indexing
-                    case 16 :
-                        for (;nXCount < mpFileHeader->nImageWidth; nXCount++, nX += nXAdd )
-                        {
-                            *mpTGA >> nRGB16;
-                            if ( nRGB16 >= mpFileHeader->nColorMapLength )
-                                return FALSE;
-                            nRed = (BYTE)( mpColorMap[ nRGB16 ] >> 16 );
-                            nGreen = (BYTE)( mpColorMap[ nRGB16 ] >> 8 );
-                            nBlue = (BYTE)( mpColorMap[ nRGB16 ] );
-                            mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                        }
-                        break;
-
-                    // 8 bit indexing
-                    case 8 :
-                        for (;nXCount < mpFileHeader->nImageWidth; nXCount++, nX += nXAdd )
-                        {
-                            *mpTGA >> nDummy;
-                            if ( nDummy >= mpFileHeader->nColorMapLength )
-                                return FALSE;
-                            mpAcc->SetPixel( nY, nX, (BYTE)nDummy );
-                        }
-                        break;
-                    default:
-                        return FALSE;
-                }
-            }
-            else
-            {
-                switch( nDepth )
-                {
-                    // 32 bit true color
-                    case 32 :
-                        {
-                            for (;nXCount < mpFileHeader->nImageWidth; nXCount++, nX += nXAdd )
-                            {
-                                *mpTGA >> nBlue >> nGreen >> nRed >> nDummy;
-                                mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                            }
-                        }
-                        break;
-
-                    // 24 bit true color
-                    case 24 :
-                        for (;nXCount < mpFileHeader->nImageWidth; nXCount++, nX += nXAdd )
-                        {
-                            *mpTGA >> nBlue >> nGreen >> nRed;
-                            mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                        }
-                        break;
-
-                    // 16 bit true color
-                    case 16 :
-                        for (;nXCount < mpFileHeader->nImageWidth; nXCount++, nX += nXAdd )
-                        {
-                            *mpTGA >> nRGB16;
-                            nRed = (BYTE)( nRGB16 >> 7 ) & 0xf8;
-                            nGreen = (BYTE)( nRGB16 >> 2 ) & 0xf8;
-                            nBlue = (BYTE)( nRGB16 << 3 ) & 0xf8;
-                            mpAcc->SetPixel( nY, nX, BitmapColor( nRed, nGreen, nBlue ) );
-                        }
-                        break;
-                    default:
-                        return FALSE;
-                }
-            }
-        }
-    }
-    return mbStatus;
-}
-
-// -------------------------------------------------------------------------------------------
-
-BOOL TGAReader::ImplReadPalette()
-{
-    if ( mbIndexing )                           // read the colormap
-    {
-        USHORT nColors = mpFileHeader->nColorMapLength;
-
-        if ( !nColors )                             // colors == 0 ? -> we will build a grayscale palette
-        {
-            if ( mpFileHeader->nPixelDepth != 8 )
-                return FALSE;
-            nColors = 256;
-            mpFileHeader->nColorMapLength = 256;
-            mpFileHeader->nColorMapEntrySize = 0x3f;    // patch for the following switch routine
-        }
-        mpColorMap = new UINT32[ nColors ];     // we will always index dwords
-        if ( mpColorMap == FALSE )
-            return FALSE;                       // out of memory %&!$&/!"�$
-
-        switch( mpFileHeader->nColorMapEntrySize )
-        {
-            case 0x3f :
-                {
-                    for ( ULONG i = 0; i < nColors; i++ )
-                    {
-                        mpColorMap[ i ] = ( i << 16 ) + ( i << 8 ) + i;
-                    }
-                }
-                break;
-
-            case 32 :
-                mpTGA->Read( mpColorMap, 4 * nColors );
-                break;
-
-            case 24 :
-                {
-                    for ( ULONG i = 0; i < nColors; i++ )
-                    {
-                        mpTGA->Read( &mpColorMap[ i ], 3 );
-                    }
-                }
-                break;
-
-            case 15 :
-            case 16 :
-                {
-                    for ( ULONG i = 0; i < nColors; i++ )
-                    {
-                        UINT16 nTemp;
-                        *mpTGA >> nTemp;
-                        mpColorMap[ i ] = ( ( nTemp & 0x7c00 ) << 9 ) + ( ( nTemp & 0x01e0 ) << 6 ) +
-                            ( ( nTemp & 0x1f ) << 3 );
-                    }
-                }
-                break;
-
-            default :
-                return FALSE;
-        }
-        if ( mnDestBitDepth <= 8 )
-        {
-            USHORT nDestColors = ( 1 << mnDestBitDepth );
-            if ( nColors > nDestColors )
-                return FALSE;
-
-            mpAcc->SetPaletteEntryCount( nColors );
-            for ( USHORT i = 0; i < nColors; i++ )
-            {
-                mpAcc->SetPaletteColor( i, Color( (BYTE)( mpColorMap[ i ] >> 16 ),
-                    (BYTE)( mpColorMap[ i ] >> 8 ), (BYTE)(mpColorMap[ i ] ) ) );
-            }
-        }
-    }
-
-    return mbStatus;
-}
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
-{
-    TGAReader aTGAReader;
-
-    return aTGAReader.ReadTGA( rStream, rGraphic );
-}
-
-//================== ein bischen Muell fuer Windows ==========================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
diff --git a/goodies/source/filter.vcl/itga/makefile.mk b/goodies/source/filter.vcl/itga/makefile.mk
deleted file mode 100644
index a9dfe2e77643..000000000000
--- a/goodies/source/filter.vcl/itga/makefile.mk
+++ /dev/null
@@ -1,71 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=itga
-DEPTARGET=vitga
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :	settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =	$(SLO)$/itga.obj
-
-# ==========================================================================
-
-SHL1TARGET= 	itg$(DLLPOSTFIX)
-SHL1IMPLIB= 	itga
-SHL1STDLIBS=	$(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=		$(SLB)$/itga.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=		$(SLO)$/itga.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :	target.mk
diff --git a/goodies/source/filter.vcl/itiff/ccidecom.cxx b/goodies/source/filter.vcl/itiff/ccidecom.cxx
deleted file mode 100644
index 5330ab26838e..000000000000
--- a/goodies/source/filter.vcl/itiff/ccidecom.cxx
+++ /dev/null
@@ -1,1115 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ccidecom.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-
-#include "ccidecom.hxx"
-
-//=============================== Huffman-Tabellen ========================
-
-//---------------------------- White-Run ------------------------------
-
-#define CCIWhiteTableSize 105
-
-const CCIHuffmanTableEntry CCIWhiteTable[CCIWhiteTableSize]={
-    {    0, 0x0035,  8 },
-    {    1, 0x0007,  6 },
-    {    2, 0x0007,  4 },
-    {    3, 0x0008,  4 },
-    {    4, 0x000b,  4 },
-    {    5, 0x000c,  4 },
-    {    6, 0x000e,  4 },
-    {    7, 0x000f,  4 },
-    {    8, 0x0013,  5 },
-    {    9, 0x0014,  5 },
-    {   10, 0x0007,  5 },
-    {   11, 0x0008,  5 },
-    {   12, 0x0008,  6 },
-    {   13, 0x0003,  6 },
-    {   14, 0x0034,  6 },
-    {   15, 0x0035,  6 },
-    {   16, 0x002a,  6 },
-    {   17, 0x002b,  6 },
-    {   18, 0x0027,  7 },
-    {   19, 0x000c,  7 },
-    {   20, 0x0008,  7 },
-    {   21, 0x0017,  7 },
-    {   22, 0x0003,  7 },
-    {   23, 0x0004,  7 },
-    {   24, 0x0028,  7 },
-    {   25, 0x002b,  7 },
-    {   26, 0x0013,  7 },
-    {   27, 0x0024,  7 },
-    {   28, 0x0018,  7 },
-    {   29, 0x0002,  8 },
-    {   30, 0x0003,  8 },
-    {   31, 0x001a,  8 },
-    {   32, 0x001b,  8 },
-    {   33, 0x0012,  8 },
-    {   34, 0x0013,  8 },
-    {   35, 0x0014,  8 },
-    {   36, 0x0015,  8 },
-    {   37, 0x0016,  8 },
-    {   38, 0x0017,  8 },
-    {   39, 0x0028,  8 },
-    {   40, 0x0029,  8 },
-    {   41, 0x002a,  8 },
-    {   42, 0x002b,  8 },
-    {   43, 0x002c,  8 },
-    {   44, 0x002d,  8 },
-    {   45, 0x0004,  8 },
-    {   46, 0x0005,  8 },
-    {   47, 0x000a,  8 },
-    {   48, 0x000b,  8 },
-    {   49, 0x0052,  8 },
-    {   50, 0x0053,  8 },
-    {   51, 0x0054,  8 },
-    {   52, 0x0055,  8 },
-    {   53, 0x0024,  8 },
-    {   54, 0x0025,  8 },
-    {   55, 0x0058,  8 },
-    {   56, 0x0059,  8 },
-    {   57, 0x005a,  8 },
-    {   58, 0x005b,  8 },
-    {   59, 0x004a,  8 },
-    {   60, 0x004b,  8 },
-    {   61, 0x0032,  8 },
-    {   62, 0x0033,  8 },
-    {   63, 0x0034,  8 },
-    {   64, 0x001b,  5 },
-    {  128, 0x0012,  5 },
-    {  192, 0x0017,  6 },
-    {  256, 0x0037,  7 },
-    {  320, 0x0036,  8 },
-    {  384, 0x0037,  8 },
-    {  448, 0x0064,  8 },
-    {  512, 0x0065,  8 },
-    {  576, 0x0068,  8 },
-    {  640, 0x0067,  8 },
-    {  704, 0x00cc,  9 },
-    {  768, 0x00cd,  9 },
-    {  832, 0x00d2,  9 },
-    {  896, 0x00d3,  9 },
-    {  960, 0x00d4,  9 },
-    { 1024, 0x00d5,  9 },
-    { 1088, 0x00d6,  9 },
-    { 1152, 0x00d7,  9 },
-    { 1216, 0x00d8,  9 },
-    { 1280, 0x00d9,  9 },
-    { 1344, 0x00da,  9 },
-    { 1408, 0x00db,  9 },
-    { 1472, 0x0098,  9 },
-    { 1536, 0x0099,  9 },
-    { 1600, 0x009a,  9 },
-    { 1664, 0x0018,  6 },
-    { 1728, 0x009b,  9 },
-    { 1792, 0x0008, 11 },
-    { 1856, 0x000c, 11 },
-    { 1920, 0x000d, 11 },
-    { 1984, 0x0012, 12 },
-    { 2048, 0x0013, 12 },
-    { 2112, 0x0014, 12 },
-    { 2176, 0x0015, 12 },
-    { 2240, 0x0016, 12 },
-    { 2304, 0x0017, 12 },
-    { 2368, 0x001c, 12 },
-    { 2432, 0x001d, 12 },
-    { 2496, 0x001e, 12 },
-    { 2560, 0x001f, 12 },
-    { 9999, 0x0001, 12 }    //  EOL
-};
-
-//---------------------------- Black-Run ------------------------------
-
-#define CCIBlackTableSize 105
-
-const CCIHuffmanTableEntry CCIBlackTable[CCIBlackTableSize]={
-    {    0, 0x0037, 10 },
-    {    1, 0x0002,  3 },
-    {    2, 0x0003,  2 },
-    {    3, 0x0002,  2 },
-    {    4, 0x0003,  3 },
-    {    5, 0x0003,  4 },
-    {    6, 0x0002,  4 },
-    {    7, 0x0003,  5 },
-    {    8, 0x0005,  6 },
-    {    9, 0x0004,  6 },
-    {   10, 0x0004,  7 },
-    {   11, 0x0005,  7 },
-    {   12, 0x0007,  7 },
-    {   13, 0x0004,  8 },
-    {   14, 0x0007,  8 },
-    {   15, 0x0018,  9 },
-    {   16, 0x0017, 10 },
-    {   17, 0x0018, 10 },
-    {   18, 0x0008, 10 },
-    {   19, 0x0067, 11 },
-    {   20, 0x0068, 11 },
-    {   21, 0x006c, 11 },
-    {   22, 0x0037, 11 },
-    {   23, 0x0028, 11 },
-    {   24, 0x0017, 11 },
-    {   25, 0x0018, 11 },
-    {   26, 0x00ca, 12 },
-    {   27, 0x00cb, 12 },
-    {   28, 0x00cc, 12 },
-    {   29, 0x00cd, 12 },
-    {   30, 0x0068, 12 },
-    {   31, 0x0069, 12 },
-    {   32, 0x006a, 12 },
-    {   33, 0x006b, 12 },
-    {   34, 0x00d2, 12 },
-    {   35, 0x00d3, 12 },
-    {   36, 0x00d4, 12 },
-    {   37, 0x00d5, 12 },
-    {   38, 0x00d6, 12 },
-    {   39, 0x00d7, 12 },
-    {   40, 0x006c, 12 },
-    {   41, 0x006d, 12 },
-    {   42, 0x00da, 12 },
-    {   43, 0x00db, 12 },
-    {   44, 0x0054, 12 },
-    {   45, 0x0055, 12 },
-    {   46, 0x0056, 12 },
-    {   47, 0x0057, 12 },
-    {   48, 0x0064, 12 },
-    {   49, 0x0065, 12 },
-    {   50, 0x0052, 12 },
-    {   51, 0x0053, 12 },
-    {   52, 0x0024, 12 },
-    {   53, 0x0037, 12 },
-    {   54, 0x0038, 12 },
-    {   55, 0x0027, 12 },
-    {   56, 0x0028, 12 },
-    {   57, 0x0058, 12 },
-    {   58, 0x0059, 12 },
-    {   59, 0x002b, 12 },
-    {   60, 0x002c, 12 },
-    {   61, 0x005a, 12 },
-    {   62, 0x0066, 12 },
-    {   63, 0x0067, 12 },
-    {   64, 0x000f, 10 },
-    {  128, 0x00c8, 12 },
-    {  192, 0x00c9, 12 },
-    {  256, 0x005b, 12 },
-    {  320, 0x0033, 12 },
-    {  384, 0x0034, 12 },
-    {  448, 0x0035, 12 },
-    {  512, 0x006c, 13 },
-    {  576, 0x006d, 13 },
-    {  640, 0x004a, 13 },
-    {  704, 0x004b, 13 },
-    {  768, 0x004c, 13 },
-    {  832, 0x004d, 13 },
-    {  896, 0x0072, 13 },
-    {  960, 0x0073, 13 },
-    { 1024, 0x0074, 13 },
-    { 1088, 0x0075, 13 },
-    { 1152, 0x0076, 13 },
-    { 1216, 0x0077, 13 },
-    { 1280, 0x0052, 13 },
-    { 1344, 0x0053, 13 },
-    { 1408, 0x0054, 13 },
-    { 1472, 0x0055, 13 },
-    { 1536, 0x005a, 13 },
-    { 1600, 0x005b, 13 },
-    { 1664, 0x0064, 13 },
-    { 1728, 0x0065, 13 },
-    { 1792, 0x0008, 11 },
-    { 1856, 0x000c, 11 },
-    { 1920, 0x000d, 11 },
-    { 1984, 0x0012, 12 },
-    { 2048, 0x0013, 12 },
-    { 2112, 0x0014, 12 },
-    { 2176, 0x0015, 12 },
-    { 2240, 0x0016, 12 },
-    { 2304, 0x0017, 12 },
-    { 2368, 0x001c, 12 },
-    { 2432, 0x001d, 12 },
-    { 2496, 0x001e, 12 },
-    { 2560, 0x001f, 12 },
-    { 9999, 0x0001, 12 }    //  EOL
-};
-
-
-//---------------------------- 2D-Mode --------------------------------
-
-#define CCI2DMODE_UNCOMP   0
-#define CCI2DMODE_PASS     1
-#define CCI2DMODE_HORZ     2
-#define CCI2DMODE_VERT_L3  3
-#define CCI2DMODE_VERT_L2  4
-#define CCI2DMODE_VERT_L1  5
-#define CCI2DMODE_VERT_0   6
-#define CCI2DMODE_VERT_R1  7
-#define CCI2DMODE_VERT_R2  8
-#define CCI2DMODE_VERT_R3  9
-
-#define CCI2DModeTableSize 10
-
-const CCIHuffmanTableEntry CCI2DModeTable[CCI2DModeTableSize]={
-    { CCI2DMODE_UNCOMP , 0x000f, 10 },
-    { CCI2DMODE_PASS   , 0x0001,  4 },
-    { CCI2DMODE_HORZ   , 0x0001,  3 },
-    { CCI2DMODE_VERT_L3, 0x0002,  7 },
-    { CCI2DMODE_VERT_L2, 0x0002,  6 },
-    { CCI2DMODE_VERT_L1, 0x0002,  3 },
-    { CCI2DMODE_VERT_0 , 0x0001,  1 },
-    { CCI2DMODE_VERT_R1, 0x0003,  3 },
-    { CCI2DMODE_VERT_R2, 0x0003,  6 },
-    { CCI2DMODE_VERT_R3, 0x0003,  7 }
-};
-
-
-//-------------------------- 2D-Uncompressed-Mode ----------------------
-
-#define CCIUNCOMP_0White_1Black  0
-#define CCIUNCOMP_1White_1Black  1
-#define CCIUNCOMP_2White_1Black  2
-#define CCIUNCOMP_3White_1Black  3
-#define CCIUNCOMP_4White_1Black  4
-#define CCIUNCOMP_5White         5
-#define CCIUNCOMP_0White_End     6
-#define CCIUNCOMP_1White_End     7
-#define CCIUNCOMP_2White_End     8
-#define CCIUNCOMP_3White_End     9
-#define CCIUNCOMP_4White_End    10
-
-#define CCIUncompTableSize 11
-
-const CCIHuffmanTableEntry CCIUncompTable[CCIUncompTableSize]={
-    { CCIUNCOMP_0White_1Black, 0x0001,  1 },
-    { CCIUNCOMP_1White_1Black, 0x0001,  2 },
-    { CCIUNCOMP_2White_1Black, 0x0001,  3 },
-    { CCIUNCOMP_3White_1Black, 0x0001,  4 },
-    { CCIUNCOMP_4White_1Black, 0x0001,  5 },
-    { CCIUNCOMP_5White       , 0x0001,  6 },
-    { CCIUNCOMP_0White_End   , 0x0001,  7 },
-    { CCIUNCOMP_1White_End   , 0x0001,  8 },
-    { CCIUNCOMP_2White_End   , 0x0001,  9 },
-    { CCIUNCOMP_3White_End   , 0x0001, 10 },
-    { CCIUNCOMP_4White_End   , 0x0001, 11 }
-};
-
-
-//================== Sicherheitskopie der Huffman-Tabellen ================
-// Um sicher zugehen, dass die Huffman-Tabellen keine Fehler enthalten,
-// wurden sie zweimal von unterschiedlichen Quellen eingegeben (Uff) und
-// verglichen.
-// Da sich aber im Laufe der Pflege des Source-Codes mal ein Fehler
-// einschleichen koennte (z.B. versehentlicher druck einer Taste im Editor)
-// werden die Tablellen hier weiterhin zweimal aufgefuehrt und zur Laufzeit
-// verglichen. (Wenn der Vergleich fehlschlaegt, liefert CCIDecompressor
-// immer einen Fehler). Das Ganze mag etwas wahnsinnig erscheinen, aber ein Fehler
-// in den Tabellen waere sonst sehr sehr schwer zu erkennen, zumal es
-// unwahrscheinlich ist, dass eine oder mehere Beispieldateien alle Codes
-// durchlaufen.
-
-const CCIHuffmanTableEntry CCIWhiteTableSave[CCIWhiteTableSize]={
-    {    0, 0x0035,  8 },
-    {    1, 0x0007,  6 },
-    {    2, 0x0007,  4 },
-    {    3, 0x0008,  4 },
-    {    4, 0x000b,  4 },
-    {    5, 0x000c,  4 },
-    {    6, 0x000e,  4 },
-    {    7, 0x000f,  4 },
-    {    8, 0x0013,  5 },
-    {    9, 0x0014,  5 },
-    {   10, 0x0007,  5 },
-    {   11, 0x0008,  5 },
-    {   12, 0x0008,  6 },
-    {   13, 0x0003,  6 },
-    {   14, 0x0034,  6 },
-    {   15, 0x0035,  6 },
-    {   16, 0x002a,  6 },
-    {   17, 0x002b,  6 },
-    {   18, 0x0027,  7 },
-    {   19, 0x000c,  7 },
-    {   20, 0x0008,  7 },
-    {   21, 0x0017,  7 },
-    {   22, 0x0003,  7 },
-    {   23, 0x0004,  7 },
-    {   24, 0x0028,  7 },
-    {   25, 0x002b,  7 },
-    {   26, 0x0013,  7 },
-    {   27, 0x0024,  7 },
-    {   28, 0x0018,  7 },
-    {   29, 0x0002,  8 },
-    {   30, 0x0003,  8 },
-    {   31, 0x001a,  8 },
-    {   32, 0x001b,  8 },
-    {   33, 0x0012,  8 },
-    {   34, 0x0013,  8 },
-    {   35, 0x0014,  8 },
-    {   36, 0x0015,  8 },
-    {   37, 0x0016,  8 },
-    {   38, 0x0017,  8 },
-    {   39, 0x0028,  8 },
-    {   40, 0x0029,  8 },
-    {   41, 0x002a,  8 },
-    {   42, 0x002b,  8 },
-    {   43, 0x002c,  8 },
-    {   44, 0x002d,  8 },
-    {   45, 0x0004,  8 },
-    {   46, 0x0005,  8 },
-    {   47, 0x000a,  8 },
-    {   48, 0x000b,  8 },
-    {   49, 0x0052,  8 },
-    {   50, 0x0053,  8 },
-    {   51, 0x0054,  8 },
-    {   52, 0x0055,  8 },
-    {   53, 0x0024,  8 },
-    {   54, 0x0025,  8 },
-    {   55, 0x0058,  8 },
-    {   56, 0x0059,  8 },
-    {   57, 0x005a,  8 },
-    {   58, 0x005b,  8 },
-    {   59, 0x004a,  8 },
-    {   60, 0x004b,  8 },
-    {   61, 0x0032,  8 },
-    {   62, 0x0033,  8 },
-    {   63, 0x0034,  8 },
-    {   64, 0x001b,  5 },
-    {  128, 0x0012,  5 },
-    {  192, 0x0017,  6 },
-    {  256, 0x0037,  7 },
-    {  320, 0x0036,  8 },
-    {  384, 0x0037,  8 },
-    {  448, 0x0064,  8 },
-    {  512, 0x0065,  8 },
-    {  576, 0x0068,  8 },
-    {  640, 0x0067,  8 },
-    {  704, 0x00cc,  9 },
-    {  768, 0x00cd,  9 },
-    {  832, 0x00d2,  9 },
-    {  896, 0x00d3,  9 },
-    {  960, 0x00d4,  9 },
-    { 1024, 0x00d5,  9 },
-    { 1088, 0x00d6,  9 },
-    { 1152, 0x00d7,  9 },
-    { 1216, 0x00d8,  9 },
-    { 1280, 0x00d9,  9 },
-    { 1344, 0x00da,  9 },
-    { 1408, 0x00db,  9 },
-    { 1472, 0x0098,  9 },
-    { 1536, 0x0099,  9 },
-    { 1600, 0x009a,  9 },
-    { 1664, 0x0018,  6 },
-    { 1728, 0x009b,  9 },
-    { 1792, 0x0008, 11 },
-    { 1856, 0x000c, 11 },
-    { 1920, 0x000d, 11 },
-    { 1984, 0x0012, 12 },
-    { 2048, 0x0013, 12 },
-    { 2112, 0x0014, 12 },
-    { 2176, 0x0015, 12 },
-    { 2240, 0x0016, 12 },
-    { 2304, 0x0017, 12 },
-    { 2368, 0x001c, 12 },
-    { 2432, 0x001d, 12 },
-    { 2496, 0x001e, 12 },
-    { 2560, 0x001f, 12 },
-    { 9999, 0x0001, 12 }    //  EOL
-};
-
-const CCIHuffmanTableEntry CCIBlackTableSave[CCIBlackTableSize]={
-    {    0, 0x0037, 10 },
-    {    1, 0x0002,  3 },
-    {    2, 0x0003,  2 },
-    {    3, 0x0002,  2 },
-    {    4, 0x0003,  3 },
-    {    5, 0x0003,  4 },
-    {    6, 0x0002,  4 },
-    {    7, 0x0003,  5 },
-    {    8, 0x0005,  6 },
-    {    9, 0x0004,  6 },
-    {   10, 0x0004,  7 },
-    {   11, 0x0005,  7 },
-    {   12, 0x0007,  7 },
-    {   13, 0x0004,  8 },
-    {   14, 0x0007,  8 },
-    {   15, 0x0018,  9 },
-    {   16, 0x0017, 10 },
-    {   17, 0x0018, 10 },
-    {   18, 0x0008, 10 },
-    {   19, 0x0067, 11 },
-    {   20, 0x0068, 11 },
-    {   21, 0x006c, 11 },
-    {   22, 0x0037, 11 },
-    {   23, 0x0028, 11 },
-    {   24, 0x0017, 11 },
-    {   25, 0x0018, 11 },
-    {   26, 0x00ca, 12 },
-    {   27, 0x00cb, 12 },
-    {   28, 0x00cc, 12 },
-    {   29, 0x00cd, 12 },
-    {   30, 0x0068, 12 },
-    {   31, 0x0069, 12 },
-    {   32, 0x006a, 12 },
-    {   33, 0x006b, 12 },
-    {   34, 0x00d2, 12 },
-    {   35, 0x00d3, 12 },
-    {   36, 0x00d4, 12 },
-    {   37, 0x00d5, 12 },
-    {   38, 0x00d6, 12 },
-    {   39, 0x00d7, 12 },
-    {   40, 0x006c, 12 },
-    {   41, 0x006d, 12 },
-    {   42, 0x00da, 12 },
-    {   43, 0x00db, 12 },
-    {   44, 0x0054, 12 },
-    {   45, 0x0055, 12 },
-    {   46, 0x0056, 12 },
-    {   47, 0x0057, 12 },
-    {   48, 0x0064, 12 },
-    {   49, 0x0065, 12 },
-    {   50, 0x0052, 12 },
-    {   51, 0x0053, 12 },
-    {   52, 0x0024, 12 },
-    {   53, 0x0037, 12 },
-    {   54, 0x0038, 12 },
-    {   55, 0x0027, 12 },
-    {   56, 0x0028, 12 },
-    {   57, 0x0058, 12 },
-    {   58, 0x0059, 12 },
-    {   59, 0x002b, 12 },
-    {   60, 0x002c, 12 },
-    {   61, 0x005a, 12 },
-    {   62, 0x0066, 12 },
-    {   63, 0x0067, 12 },
-    {   64, 0x000f, 10 },
-    {  128, 0x00c8, 12 },
-    {  192, 0x00c9, 12 },
-    {  256, 0x005b, 12 },
-    {  320, 0x0033, 12 },
-    {  384, 0x0034, 12 },
-    {  448, 0x0035, 12 },
-    {  512, 0x006c, 13 },
-    {  576, 0x006d, 13 },
-    {  640, 0x004a, 13 },
-    {  704, 0x004b, 13 },
-    {  768, 0x004c, 13 },
-    {  832, 0x004d, 13 },
-    {  896, 0x0072, 13 },
-    {  960, 0x0073, 13 },
-    { 1024, 0x0074, 13 },
-    { 1088, 0x0075, 13 },
-    { 1152, 0x0076, 13 },
-    { 1216, 0x0077, 13 },
-    { 1280, 0x0052, 13 },
-    { 1344, 0x0053, 13 },
-    { 1408, 0x0054, 13 },
-    { 1472, 0x0055, 13 },
-    { 1536, 0x005a, 13 },
-    { 1600, 0x005b, 13 },
-    { 1664, 0x0064, 13 },
-    { 1728, 0x0065, 13 },
-    { 1792, 0x0008, 11 },
-    { 1856, 0x000c, 11 },
-    { 1920, 0x000d, 11 },
-    { 1984, 0x0012, 12 },
-    { 2048, 0x0013, 12 },
-    { 2112, 0x0014, 12 },
-    { 2176, 0x0015, 12 },
-    { 2240, 0x0016, 12 },
-    { 2304, 0x0017, 12 },
-    { 2368, 0x001c, 12 },
-    { 2432, 0x001d, 12 },
-    { 2496, 0x001e, 12 },
-    { 2560, 0x001f, 12 },
-    { 9999, 0x0001, 12 }    //  EOL
-};
-
-
-const CCIHuffmanTableEntry CCI2DModeTableSave[CCI2DModeTableSize]={
-    { CCI2DMODE_UNCOMP , 0x000f, 10 },
-    { CCI2DMODE_PASS   , 0x0001,  4 },
-    { CCI2DMODE_HORZ   , 0x0001,  3 },
-    { CCI2DMODE_VERT_L3, 0x0002,  7 },
-    { CCI2DMODE_VERT_L2, 0x0002,  6 },
-    { CCI2DMODE_VERT_L1, 0x0002,  3 },
-    { CCI2DMODE_VERT_0 , 0x0001,  1 },
-    { CCI2DMODE_VERT_R1, 0x0003,  3 },
-    { CCI2DMODE_VERT_R2, 0x0003,  6 },
-    { CCI2DMODE_VERT_R3, 0x0003,  7 }
-};
-
-
-const CCIHuffmanTableEntry CCIUncompTableSave[CCIUncompTableSize]={
-    { CCIUNCOMP_0White_1Black, 0x0001,  1 },
-    { CCIUNCOMP_1White_1Black, 0x0001,  2 },
-    { CCIUNCOMP_2White_1Black, 0x0001,  3 },
-    { CCIUNCOMP_3White_1Black, 0x0001,  4 },
-    { CCIUNCOMP_4White_1Black, 0x0001,  5 },
-    { CCIUNCOMP_5White       , 0x0001,  6 },
-    { CCIUNCOMP_0White_End   , 0x0001,  7 },
-    { CCIUNCOMP_1White_End   , 0x0001,  8 },
-    { CCIUNCOMP_2White_End   , 0x0001,  9 },
-    { CCIUNCOMP_3White_End   , 0x0001, 10 },
-    { CCIUNCOMP_4White_End   , 0x0001, 11 }
-};
-
-//=========================================================================
-
-
-CCIDecompressor::CCIDecompressor( ULONG nOpts, UINT32 nImageWidth ) :
-    bTableBad   ( FALSE ),
-    bStatus     ( FALSE ),
-    pByteSwap   ( NULL ),
-    nWidth      ( nImageWidth ),
-    nOptions    ( nOpts ),
-    pLastLine   ( NULL )
-{
-    if ( nOpts & CCI_OPTION_INVERSEBITORDER )
-    {
-        pByteSwap = new BYTE[ 256 ];
-        for ( int i = 0; i < 256; i++ )
-        {
-            pByteSwap[ i ] = sal::static_int_cast< BYTE >(
-                ( i << 7 ) | ( ( i & 2 ) << 5 ) | ( ( i & 4 ) << 3 ) | ( ( i & 8 ) << 1 ) |
-                ( ( i & 16 ) >> 1 ) | ( ( i & 32 ) >> 3 ) | ( ( i & 64 ) >> 5 ) | ( ( i & 128 ) >> 7 ));
-        }
-    }
-
-    pWhiteLookUp =new CCILookUpTableEntry[1<<13];
-    pBlackLookUp =new CCILookUpTableEntry[1<<13];
-    p2DModeLookUp=new CCILookUpTableEntry[1<<10];
-    pUncompLookUp=new CCILookUpTableEntry[1<<11];
-
-    MakeLookUp(CCIWhiteTable,CCIWhiteTableSave,pWhiteLookUp,CCIWhiteTableSize,13);
-    MakeLookUp(CCIBlackTable,CCIBlackTableSave,pBlackLookUp,CCIBlackTableSize,13);
-    MakeLookUp(CCI2DModeTable,CCI2DModeTableSave,p2DModeLookUp,CCI2DModeTableSize,10);
-    MakeLookUp(CCIUncompTable,CCIUncompTableSave,pUncompLookUp,CCIUncompTableSize,11);
-}
-
-
-CCIDecompressor::~CCIDecompressor()
-{
-    delete[] pByteSwap;
-    delete[] pLastLine;
-    delete[] pWhiteLookUp;
-    delete[] pBlackLookUp;
-    delete[] p2DModeLookUp;
-    delete[] pUncompLookUp;
-}
-
-
-void CCIDecompressor::StartDecompression( SvStream & rIStream )
-{
-    pIStream = &rIStream;
-    nInputBitsBufSize = 0;
-    bFirstEOL = TRUE;
-    bStatus = TRUE;
-    nEOLCount = 0;
-
-    if ( bTableBad == TRUE )
-        return;
-}
-
-
-BOOL CCIDecompressor::DecompressScanline( BYTE * pTarget, ULONG nTargetBits )
-{
-    USHORT i;
-    BYTE * pSrc,* pDst;
-    BOOL b2D;
-
-    if ( nEOLCount >= 5 )   // RTC( Return To Controller )
-        return TRUE;
-
-    if ( bStatus == FALSE )
-        return FALSE;
-
-    // Wenn EOL-Codes vorhanden sind, steht der EOL-Code auch vor der ersten Zeile.
-    // (und ich dachte EOL heisst 'End Of Line'...)
-    // Daher lesen wir den EOL-Code immer vor jeder Zeile als erstes ein:
-    if ( nOptions & CCI_OPTION_EOL )
-    {
-        if ( bFirstEOL )
-        {
-            UINT32 nCurPos = pIStream->Tell();
-            UINT16 nOldInputBitsBufSize = nInputBitsBufSize;
-            UINT32 nOldInputBitsBuf = nInputBitsBuf;
-            if ( ReadEOL( 32 ) == FALSE )
-            {
-                nInputBitsBufSize = nOldInputBitsBufSize;
-                nInputBitsBuf = nOldInputBitsBuf;
-                pIStream->Seek( nCurPos );
-                nOptions &=~ CCI_OPTION_EOL;                // CCITT Group 3 - Compression Type 2
-            }
-            bFirstEOL = FALSE;
-        }
-        else
-        {
-            if ( ReadEOL( nTargetBits ) == FALSE )
-            {
-                return bStatus;
-            }
-        }
-    }
-
-    if ( nEOLCount >= 5 )   // RTC( Return To Controller )
-        return TRUE;
-
-    // ggf. eine weisse vorherige Zeile herstellen fuer 2D:
-    if ( nOptions & CCI_OPTION_2D )
-    {
-        if ( pLastLine == NULL || nLastLineSize != ( ( nTargetBits + 7 ) >> 3 ) )
-        {
-            if ( pLastLine == NULL )
-                delete[] pLastLine;
-            nLastLineSize = ( nTargetBits + 7 ) >> 3;
-            pLastLine = new BYTE[ nLastLineSize ];
-            pDst = pLastLine;
-            for ( i = 0; i < nLastLineSize; i++ ) *( pDst++ ) = 0x00;
-        }
-    }
-    // ggf. Zeilen-Anfang auf naechste Byte-Grenze runden:
-    if ( nOptions & CCI_OPTION_BYTEALIGNROW )
-        nInputBitsBufSize &= 0xfff8;
-
-    // Ist es eine 2D-Zeile ?:
-    if ( nOptions & CCI_OPTION_2D )
-    {
-        if ( nOptions & CCI_OPTION_EOL )
-            b2D = Read2DTag();
-        else
-            b2D = TRUE;
-    }
-    else
-        b2D = FALSE;
-
-    // Zeile einlesen:
-    if ( b2D )
-        Read2DScanlineData( pTarget, (USHORT)nTargetBits );
-    else
-        Read1DScanlineData( pTarget, (USHORT)nTargetBits );
-
-    // Wenn wir im 2D-Modus sind, muessen wir uns die Zeile merken:
-    if ( nOptions & CCI_OPTION_2D && bStatus == TRUE )
-    {
-        pSrc = pTarget;
-        pDst = pLastLine;
-        for ( i = 0; i < nLastLineSize; i++ ) *(pDst++)=*(pSrc++);
-    }
-
-    if ( pIStream->GetError() )
-        bStatus = FALSE;
-
-    return bStatus;
-}
-
-
-void CCIDecompressor::MakeLookUp(const CCIHuffmanTableEntry * pHufTab,
-                                 const CCIHuffmanTableEntry * pHufTabSave,
-                                 CCILookUpTableEntry * pLookUp,
-                                 USHORT nHuffmanTableSize,
-                                 USHORT nMaxCodeBits)
-{
-    USHORT i,j,nMinCode,nMaxCode,nLookUpSize,nMask;
-
-    if (bTableBad==TRUE) return;
-
-    nLookUpSize=1<<nMaxCodeBits;
-
-    nMask=0xffff>>(16-nMaxCodeBits);
-
-    for (i=0; i<nLookUpSize; i++) pLookUp[i].nCodeBits=0;
-    for (i=0; i<nHuffmanTableSize; i++) {
-        if ( pHufTab[i].nValue!=pHufTabSave[i].nValue ||
-             pHufTab[i].nCode!=pHufTabSave[i].nCode ||
-             pHufTab[i].nCodeBits!=pHufTabSave[i].nCodeBits ||
-             pHufTab[i].nCodeBits==0 ||
-             pHufTab[i].nCodeBits>nMaxCodeBits )
-        {
-            bTableBad=TRUE;
-            return;
-        }
-        nMinCode = nMask & (pHufTab[i].nCode << (nMaxCodeBits-pHufTab[i].nCodeBits));
-        nMaxCode = nMinCode | (nMask >> pHufTab[i].nCodeBits);
-        for (j=nMinCode; j<=nMaxCode; j++) {
-            if (pLookUp[j].nCodeBits!=0) {
-                bTableBad=TRUE;
-                return;
-            }
-            pLookUp[j].nValue=pHufTab[i].nValue;
-            pLookUp[j].nCodeBits=pHufTab[i].nCodeBits;
-        }
-    }
-}
-
-
-BOOL CCIDecompressor::ReadEOL( UINT32 /*nMaxFillBits*/ )
-{
-    USHORT  nCode;
-    BYTE    nByte;
-
-    // if (nOptions&CCI_OPTION_BYTEALIGNEOL) nMaxFillBits=7; else nMaxFillBits=0;
-    // Buuuh: Entweder wird die Option in itiff.cxx nicht richtig gesetzt (-> Fehler in Doku)
-    // oder es gibt tatsaechlich gemeine Export-Filter, die immer ein Align machen.
-    // Ausserdem wurden Dateien gefunden, in denen mehr als die maximal 7 noetigen
-    // Fuellbits vor dem EOL-Code stehen. Daher akzeptieren wir nun grundsaetzlich
-    // bis zu 32-Bloedsinn-Bits vor dem EOL-Code:
-    // und ich habe eine Datei gefunden in der bis zu ??? Bloedsinn Bits stehen, zudem ist dort die Bit Reihenfolge verdreht (SJ);
-
-    UINT32 nMaxPos = pIStream->Tell();
-    nMaxPos += nWidth >> 3;
-
-    for ( ;; )
-    {
-        while ( nInputBitsBufSize < 12 )
-        {
-            *pIStream >> nByte;
-            if ( pIStream->IsEof() )
-                return FALSE;
-            if ( pIStream->Tell() > nMaxPos )
-                return FALSE;
-
-            if ( nOptions & CCI_OPTION_INVERSEBITORDER )
-                nByte = pByteSwap[ nByte ];
-            nInputBitsBuf=(nInputBitsBuf<<8) | (ULONG)nByte;
-            nInputBitsBufSize += 8;
-        }
-        nCode = (USHORT)( ( nInputBitsBuf >> ( nInputBitsBufSize - 12 ) ) & 0x0fff );
-        if ( nCode == 0x0001 )
-        {
-            nEOLCount++;
-            nInputBitsBufSize -= 12;
-            break;
-        }
-        else
-            nInputBitsBufSize--;
-    }
-    return TRUE;
-}
-
-
-BOOL CCIDecompressor::Read2DTag()
-{
-    BYTE nByte;
-
-    // Ein Bit einlesen und TRUE liefern, wenn es 0 ist, sonst FALSE
-    if (nInputBitsBufSize==0) {
-        *pIStream >> nByte;
-        if ( nOptions & CCI_OPTION_INVERSEBITORDER )
-            nByte = pByteSwap[ nByte ];
-        nInputBitsBuf=(ULONG)nByte;
-        nInputBitsBufSize=8;
-    }
-    nInputBitsBufSize--;
-    if ( ((nInputBitsBuf>>nInputBitsBufSize)&0x0001) ) return FALSE;
-    else return TRUE;
-}
-
-
-BYTE CCIDecompressor::ReadBlackOrWhite()
-{
-    BYTE nByte;
-
-    // Ein Bit einlesen und 0x00 liefern, wenn es 0 ist, sonst 0xff
-    if (nInputBitsBufSize==0) {
-        *pIStream >> nByte;
-        if ( nOptions & CCI_OPTION_INVERSEBITORDER )
-            nByte = pByteSwap[ nByte ];
-        nInputBitsBuf=(ULONG)nByte;
-        nInputBitsBufSize=8;
-    }
-    nInputBitsBufSize--;
-    if ( ((nInputBitsBuf>>nInputBitsBufSize)&0x0001) ) return 0xff;
-    else return 0x00;
-}
-
-
-USHORT CCIDecompressor::ReadCodeAndDecode(const CCILookUpTableEntry * pLookUp,
-                                          USHORT nMaxCodeBits)
-{
-    USHORT nCode,nCodeBits;
-    BYTE nByte;
-
-    // Einen Huffman-Code einlesen und dekodieren:
-    while (nInputBitsBufSize<nMaxCodeBits) {
-        *pIStream >> nByte;
-        if ( nOptions  & CCI_OPTION_INVERSEBITORDER )
-            nByte = pByteSwap[ nByte ];
-        nInputBitsBuf=(nInputBitsBuf<<8) | (ULONG)nByte;
-        nInputBitsBufSize+=8;
-    }
-    nCode=(USHORT)((nInputBitsBuf>>(nInputBitsBufSize-nMaxCodeBits))
-                   &(0xffff>>(16-nMaxCodeBits)));
-    nCodeBits=pLookUp[nCode].nCodeBits;
-    if (nCodeBits==0) bStatus=FALSE;
-    nInputBitsBufSize = nInputBitsBufSize - nCodeBits;
-    return pLookUp[nCode].nValue;
-}
-
-
-void CCIDecompressor::FillBits(BYTE * pTarget, USHORT nTargetBits,
-                               USHORT nBitPos, USHORT nNumBits,
-                               BYTE nBlackOrWhite)
-{
-    if ( nBitPos >= nTargetBits )
-        return;
-    if ( nBitPos + nNumBits > nTargetBits )
-        nNumBits = nTargetBits - nBitPos;
-
-    pTarget+=nBitPos>>3;
-    nBitPos&=7;
-
-    if (nBlackOrWhite==0x00) *pTarget &= 0xff << (8-nBitPos);
-    else                     *pTarget |= 0xff >> nBitPos;
-    if (nNumBits>8-nBitPos) {
-        nNumBits-=8-nBitPos;
-        while (nNumBits>=8) {
-            *(++pTarget)=nBlackOrWhite;
-            nNumBits-=8;
-        }
-        if (nNumBits>0) *(++pTarget)=nBlackOrWhite;
-    }
-}
-
-
-USHORT CCIDecompressor::CountBits(const BYTE * pData, USHORT nDataSizeBits,
-                                  USHORT nBitPos, BYTE nBlackOrWhite)
-{
-    USHORT nPos,nLo;
-    BYTE nData;
-
-    // Hier wird die Anzahl der zusammenhaengenden Bits gezaehlt, die
-    // ab Position nBitPos in pTarget alle die Farbe nBlackOrWhite
-    // (0xff oder 0x00) haben.
-
-    nPos=nBitPos;
-    for (;;) {
-        if (nPos>=nDataSizeBits) {
-            nPos=nDataSizeBits;
-            break;
-        }
-        nData=pData[nPos>>3];
-        nLo=nPos & 7;
-        if ( nLo==0 && nData==nBlackOrWhite) nPos+=8;
-        else {
-            if ( ((nData^nBlackOrWhite) & (0x80 >> nLo))!=0) break;
-            nPos++;
-        }
-    }
-    if (nPos<=nBitPos) return 0;
-    else return nPos-nBitPos;
-}
-
-
-void CCIDecompressor::Read1DScanlineData(BYTE * pTarget, USHORT nTargetBits)
-{
-    USHORT nCode,nCodeBits,nDataBits,nTgtFreeByteBits;
-    BYTE nByte;
-    BYTE nBlackOrWhite; // ist 0xff fuer Black oder 0x00 fuer White
-    BOOL bTerminatingCode;
-
-    // Der erste Code ist immer eine "White-Code":
-    nBlackOrWhite=0x00;
-
-    // Anzahl der Bits, die im Byte *pTarget noch nicht geschrieben sind:
-    nTgtFreeByteBits=8;
-
-    // Schleife ueber Codes aus dem Eingabe-Stream:
-    do {
-
-        // die naechsten 13 Bits nach nCode holen, aber noch nicht
-        // aus dem Eingabe-Buffer loeschen:
-        while (nInputBitsBufSize<13) {
-            *pIStream >> nByte;
-            if ( nOptions & CCI_OPTION_INVERSEBITORDER )
-                nByte = pByteSwap[ nByte ];
-            nInputBitsBuf=(nInputBitsBuf<<8) | (ULONG)nByte;
-            nInputBitsBufSize+=8;
-        }
-        nCode=(USHORT)((nInputBitsBuf>>(nInputBitsBufSize-13))&0x1fff);
-
-        // Anzahl der DatenBits und Anzahl der CodeBits ermitteln:
-        if (nBlackOrWhite) {
-            nCodeBits=pBlackLookUp[nCode].nCodeBits;
-            nDataBits=pBlackLookUp[nCode].nValue;
-        }
-        else {
-            nCodeBits=pWhiteLookUp[nCode].nCodeBits;
-            nDataBits=pWhiteLookUp[nCode].nValue;
-        }
-        // Ist es ein Ungueltiger Code ?
-        if ( nDataBits == 9999 )
-        {
-            return;
-        }
-        if ( nCodeBits == 0 )
-        {
-            return;             // das koennen sich jetzt um FuellBits handeln
-        }
-        nEOLCount = 0;
-        // Zuviele Daten ?
-        if (nDataBits>nTargetBits) {
-            // Ja, koennte ein Folge-Fehler durch ungueltigen Code sein,
-            // daher irdenwie weitermachen:
-            nDataBits=nTargetBits;
-        }
-
-        // Ist es ein 'Terminating-Code' ?
-        if (nDataBits<64) bTerminatingCode=TRUE; else bTerminatingCode=FALSE;
-
-        // Die gelesenen Bits aus dem Eingabe-Buffer entfernen:
-        nInputBitsBufSize = nInputBitsBufSize - nCodeBits;
-
-        // Die Anzahl Daten-Bits in die Scanline schreiben:
-        if (nDataBits>0) {
-            nTargetBits = nTargetBits - nDataBits;
-            if (nBlackOrWhite==0x00) *pTarget &= 0xff << nTgtFreeByteBits;
-            else                     *pTarget |= 0xff >> (8-nTgtFreeByteBits);
-            if (nDataBits<=nTgtFreeByteBits) {
-                if (nDataBits==nTgtFreeByteBits) {
-                    pTarget++;
-                    nTgtFreeByteBits=8;
-                }
-                else nTgtFreeByteBits = nTgtFreeByteBits - nDataBits;
-            }
-            else {
-                nDataBits = nDataBits - nTgtFreeByteBits;
-                pTarget++;
-                nTgtFreeByteBits=8;
-                while (nDataBits>=8) {
-                    *(pTarget++)=nBlackOrWhite;
-                    nDataBits-=8;
-                }
-                if (nDataBits>0) {
-                    *pTarget=nBlackOrWhite;
-                    nTgtFreeByteBits = nTgtFreeByteBits - nDataBits;
-                }
-            }
-        }
-
-        // ggf. Umschaltung Black <-> White:
-        if (bTerminatingCode==TRUE) nBlackOrWhite=~nBlackOrWhite;
-
-    } while (nTargetBits>0 || bTerminatingCode==FALSE);
-}
-
-
-
-void CCIDecompressor::Read2DScanlineData(BYTE * pTarget, USHORT nTargetBits)
-{
-    USHORT n2DMode,nBitPos,nUncomp,nRun,nRun2,nt;
-    BYTE nBlackOrWhite;
-
-    nBlackOrWhite=0x00;
-    nBitPos=0;
-
-    while (nBitPos<nTargetBits && bStatus==TRUE) {
-
-        n2DMode=ReadCodeAndDecode(p2DModeLookUp,10);
-        if (bStatus==FALSE) return;
-
-        if (n2DMode==CCI2DMODE_UNCOMP) {
-            for (;;) {
-                nUncomp=ReadCodeAndDecode(pUncompLookUp,11);
-                if ( nUncomp <= CCIUNCOMP_4White_1Black ) {
-                    nRun=nUncomp-CCIUNCOMP_0White_1Black;
-                    FillBits(pTarget,nTargetBits,nBitPos,nRun,0x00);
-                    nBitPos = nBitPos + nRun;
-                    FillBits(pTarget,nTargetBits,nBitPos,1,0xff);
-                    nBitPos++;
-                }
-                else if ( nUncomp == CCIUNCOMP_5White ) {
-                    FillBits(pTarget,nTargetBits,nBitPos,5,0x00);
-                    nBitPos = nBitPos + 5;
-                }
-                else {
-                    nRun=nUncomp-CCIUNCOMP_0White_End;
-                    FillBits(pTarget,nTargetBits,nBitPos,nRun,0x00);
-                    nBitPos = nBitPos + nRun;
-                    nBlackOrWhite=ReadBlackOrWhite();
-                    break;
-                }
-            }
-        }
-
-        else if (n2DMode==CCI2DMODE_PASS) {
-            if (nBitPos==0 && nBlackOrWhite==0x00 && CountBits(pLastLine,nTargetBits,0,0xff)!=0) nRun=0;
-            else {
-                nRun=CountBits(pLastLine,nTargetBits,nBitPos,~nBlackOrWhite);
-                nRun = nRun + CountBits(pLastLine,nTargetBits,nBitPos+nRun,nBlackOrWhite);
-            }
-            nRun = nRun + CountBits(pLastLine,nTargetBits,nBitPos+nRun,~nBlackOrWhite);
-            FillBits(pTarget,nTargetBits,nBitPos,nRun,nBlackOrWhite);
-            nBitPos = nBitPos + nRun;
-        }
-
-        else if (n2DMode==CCI2DMODE_HORZ) {
-            if (nBlackOrWhite==0x00) {
-                nRun=0;
-                do {
-                    nt=ReadCodeAndDecode(pWhiteLookUp,13);
-                    nRun = nRun + nt;
-                } while (nt>=64);
-                nRun2=0;
-                do {
-                    nt=ReadCodeAndDecode(pBlackLookUp,13);
-                    nRun2 = nRun2 + nt;
-                } while (nt>=64);
-            }
-            else {
-                nRun=0;
-                do {
-                    nt=ReadCodeAndDecode(pBlackLookUp,13);
-                    nRun = nRun + nt;
-                } while (nt>=64);
-                nRun2=0;
-                do {
-                    nt=ReadCodeAndDecode(pWhiteLookUp,13);
-                    nRun2 = nRun2 + nt;
-                } while (nt>=64);
-            }
-            FillBits(pTarget,nTargetBits,nBitPos,nRun,nBlackOrWhite);
-            nBitPos = nBitPos + nRun;
-            FillBits(pTarget,nTargetBits,nBitPos,nRun2,~nBlackOrWhite);
-            nBitPos = nBitPos + nRun2;
-        }
-
-        else { // Es ist einer der Modi CCI2DMODE_VERT_...
-            if (nBitPos==0 && nBlackOrWhite==0x00 && CountBits(pLastLine,nTargetBits,0,0xff)!=0) nRun=0;
-            else {
-                nRun=CountBits(pLastLine,nTargetBits,nBitPos,~nBlackOrWhite);
-                nRun = nRun + CountBits(pLastLine,nTargetBits,nBitPos+nRun,nBlackOrWhite);
-            }
-            nRun+=n2DMode-CCI2DMODE_VERT_0;
-            FillBits(pTarget,nTargetBits,nBitPos,nRun,nBlackOrWhite);
-            nBitPos = nBitPos + nRun;
-            nBlackOrWhite=~nBlackOrWhite;
-        }
-    }
-}
-
-
diff --git a/goodies/source/filter.vcl/itiff/ccidecom.hxx b/goodies/source/filter.vcl/itiff/ccidecom.hxx
deleted file mode 100644
index a6a5512f0ddb..000000000000
--- a/goodies/source/filter.vcl/itiff/ccidecom.hxx
+++ /dev/null
@@ -1,128 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: ccidecom.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _CCIDECOM_HXX
-#define _CCIDECOM_HXX
-
-#include <tools/stream.hxx>
-
-
-#define CCI_OPTION_2D               1       // 2D-Komprimierung (statt 1D)
-#define CCI_OPTION_EOL              2       // EOL-Codes am Ende jeder Zeile vorhanden
-#define CCI_OPTION_BYTEALIGNEOL     4       // Fuellbits vor jedem EOL-Code, so dass
-                                            // Ende von EOL auf Bytes aligend
-#define CCI_OPTION_BYTEALIGNROW     8       // Rows beginnen immer auf Byte-Grenze
-#define CCI_OPTION_INVERSEBITORDER  16
-
-// Eintrag in eine Huffman-Tabelle:
-struct CCIHuffmanTableEntry {
-    USHORT nValue;    // Der Daten-Wert.
-    USHORT nCode;     // Der Code durch den der Daten-Wert repraesentiert wird.
-    USHORT nCodeBits; // Laenge des Codes in Bits.
-};
-
-
-// Eintrag in eine Hash-Tabelle zur schnellen Dekodierung
-struct CCILookUpTableEntry {
-    USHORT nValue;
-    USHORT nCodeBits;
-};
-
-
-class CCIDecompressor {
-
-public:
-
-    CCIDecompressor( ULONG nOptions, UINT32 nImageWidth );
-    ~CCIDecompressor();
-
-    void StartDecompression( SvStream & rIStream );
-
-    BOOL DecompressScanline(BYTE * pTarget, ULONG nTargetBits );
-
-private:
-
-    void MakeLookUp(const CCIHuffmanTableEntry * pHufTab,
-                    const CCIHuffmanTableEntry * pHufTabSave,
-                    CCILookUpTableEntry * pLookUp,
-                    USHORT nHuffmanTableSize,
-                    USHORT nMaxCodeBits);
-
-    BOOL ReadEOL( UINT32 nMaxFillBits );
-
-    BOOL Read2DTag();
-
-    BYTE ReadBlackOrWhite();
-
-    USHORT ReadCodeAndDecode(const CCILookUpTableEntry * pLookUp,
-                             USHORT nMaxCodeBits);
-
-    void FillBits(BYTE * pTarget, USHORT nTargetBits,
-                  USHORT nBitPos, USHORT nNumBits,
-                  BYTE nBlackOrWhite);
-
-    USHORT CountBits(const BYTE * pData, USHORT nDataSizeBits,
-                     USHORT nBitPos, BYTE nBlackOrWhite);
-
-    void Read1DScanlineData(BYTE * pTarget, USHORT nTargetBits);
-
-    void Read2DScanlineData(BYTE * pTarget, USHORT nTargetBits);
-
-    BOOL bTableBad;
-
-    BOOL bStatus;
-
-    BYTE* pByteSwap;
-
-    SvStream * pIStream;
-
-    UINT32 nEOLCount;
-
-    UINT32 nWidth;
-
-    ULONG nOptions;
-
-    BOOL bFirstEOL;
-
-    CCILookUpTableEntry * pWhiteLookUp;
-    CCILookUpTableEntry * pBlackLookUp;
-    CCILookUpTableEntry * p2DModeLookUp;
-    CCILookUpTableEntry * pUncompLookUp;
-
-    ULONG nInputBitsBuf;
-    USHORT nInputBitsBufSize;
-
-    BYTE * pLastLine;
-    ULONG nLastLineSize;
-};
-
-
-#endif
-
diff --git a/goodies/source/filter.vcl/itiff/exports.map b/goodies/source/filter.vcl/itiff/exports.map
deleted file mode 100644
index 983df223406e..000000000000
--- a/goodies/source/filter.vcl/itiff/exports.map
+++ /dev/null
@@ -1,7 +0,0 @@
-TIFIMPORTER_1_0 {
-        global:
-                GraphicImport;
-
-        local:
-                *;
-};
diff --git a/goodies/source/filter.vcl/itiff/itiff.cxx b/goodies/source/filter.vcl/itiff/itiff.cxx
deleted file mode 100644
index 0db2ace9373c..000000000000
--- a/goodies/source/filter.vcl/itiff/itiff.cxx
+++ /dev/null
@@ -1,1345 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: itiff.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_goodies.hxx"
-#include <vcl/graph.hxx>
-#include <vcl/bmpacc.hxx>
-#ifndef _SV_FLTCALL_HXX
-#include <svtools/fltcall.hxx>
-#endif
-#include <vcl/animate.hxx>
-#include "lzwdecom.hxx"
-#include "ccidecom.hxx"
-
-#define OOODEBUG(str,Num) //(InfoBox(NULL,String(str)+String(" ")+String(Num)).Execute();
-
-namespace {
-
-template< typename T > T BYTESWAP(T nByte) {
-    return ( nByte << 7 ) | ( ( nByte & 2 ) << 5 ) | ( ( nByte & 4 ) << 3 ) |
-        ( ( nByte & 8 ) << 1 ) | ( ( nByte & 16 ) >> 1 ) |
-        ( ( nByte & 32 ) >> 3 ) | ( ( nByte & 64 ) >> 5 ) |
-        ( ( nByte & 128 ) >> 7 );
-}
-
-}
-
-//============================ TIFFReader ==================================
-
-class TIFFReader
-{
-
-private:
-
-    BOOL                bStatus;                    // Ob bisher kein Fehler auftrat
-    Animation           aAnimation;
-    ULONG               nLastPercent;
-
-    SvStream*           pTIFF;                      // Die einzulesende TIFF-Datei
-    Bitmap              aBitmap;
-    BitmapWriteAccess*  pAcc;
-    USHORT              nDstBitsPerPixel;
-
-    ULONG               nOrigPos;                   // Anfaengliche Position in pTIFF
-    UINT16              nOrigNumberFormat;          // Anfaengliches Nummern-Format von pTIFF
-
-
-    UINT16              nDataType;
-    // Daten, die aus dem TIFF-Tags entnommen werden:
-    BOOL                bByteSwap;                  // TRUE wenn bits 0..7 -> 7..0 invertiert werden sollen ( FILLORDER = 2 );
-    BYTE                nByte1;                     // 'I', wenn Format LittleEndian
-
-    ULONG               nNewSubFile;                //
-    ULONG               nSubFile;                   //
-    ULONG               nImageWidth;                // Bildbreite in Pixel
-    ULONG               nImageLength;               // Bildhoehe in Pixel
-    ULONG               nBitsPerSample;             // Bits pro Pixel pro Ebene
-    ULONG               nCompression;               // Art der Kompriemierung
-    ULONG               nPhotometricInterpretation; //
-    ULONG               nThresholding;              //
-    ULONG               nCellWidth;                 //
-    ULONG               nCellLength;                //
-    ULONG               nFillOrder;                 //
-    ULONG*              pStripOffsets;              // Feld von Offsets zu den Bitmap-Daten-"Strips"
-    ULONG               nNumStripOffsets;           // Groesse obigen Feldes
-    ULONG               nOrientation;               //
-    ULONG               nSamplesPerPixel;           // Anzahl der Ebenen
-    ULONG               nRowsPerStrip;              // Wenn nicht komprimiert: Zahl der Zeilen pro Strip
-    ULONG*              pStripByteCounts;           // Wenn komprimiert (bestimmte Art): Groesse der Strips
-    ULONG               nNumStripByteCounts;        // Anzahl der Eintraege in obiges Feld
-    ULONG               nMinSampleValue;            //
-    ULONG               nMaxSampleValue;            //
-    double              fXResolution;               // X-Aufloesung oder 0.0
-    double              fYResolution;               // Y-Aufloesung oder 0.0
-    ULONG               nPlanarConfiguration;       //
-    ULONG               nGroup3Options;             //
-    ULONG               nGroup4Options;             //
-    ULONG               nResolutionUnit;            // Einheit von fX/YResolution: 1=unbekannt, 2(default)=Zoll, 3=cm
-    ULONG               nPredictor;                 //
-    ULONG*              pColorMap;                  // Farb-Palette
-    ULONG               nNumColors;                 // Anzahl Farben in der Farbpalette
-
-    ULONG               nPlanes;                    // Anzahl der Ebenen in der Tiff-Datei
-    ULONG               nStripsPerPlane;            // Anzahl der Strips pro Ebene
-    ULONG               nBytesPerRow;               // Bytes pro Zeile pro Ebene in der Tiff-Datei ( unkomprimiert )
-    BYTE*               pMap[ 4 ];                  // Temporaere Scanline
-
-
-    void    MayCallback( ULONG nPercent );
-
-    ULONG   DataTypeSize();
-    ULONG   ReadIntData();
-    double  ReadDoubleData();
-
-    void    ReadHeader();
-    void    ReadTagData( USHORT nTagType, sal_uInt32 nDataLen );
-
-    BOOL    ReadMap( ULONG nMinPercent, ULONG nMaxPercent );
-        // Liesst/dekomprimert die Bitmap-Daten, und fuellt pMap
-
-    ULONG   GetBits( const BYTE * pSrc, ULONG nBitsPos, ULONG nBitsCount );
-        // Holt nBitsCount Bits aus pSrc[..] an der Bit-Position nBitsPos
-
-    void    MakePalCol( void );
-        // Erzeugt die Bitmap aus der temporaeren Bitmap pMap
-        // und loescht dabei pMap teilweise
-    BOOL    ConvertScanline( ULONG nY );
-        // Konvertiert eine Scanline in das Windows-BMP-Format
-
-public:
-
-    TIFFReader() {}
-    ~TIFFReader() {}
-
-    BOOL ReadTIFF( SvStream & rTIFF, Graphic & rGraphic );
-};
-
-//=================== Methoden von TIFFReader ==============================
-
-void TIFFReader::MayCallback( ULONG /*nPercent*/ )
-{
-/*
-    if ( nPercent >= nLastPercent + 3 )
-    {
-        nLastPercent=nPercent;
-        if ( pCallback != NULL && nPercent <= 100 && bStatus == TRUE )
-        {
-            if (((*pCallback)(pCallerData,(USHORT)nPercent)) == TRUE )
-                bStatus = FALSE;
-        }
-    }
-*/
-}
-
-// ---------------------------------------------------------------------------------
-
-ULONG TIFFReader::DataTypeSize()
-{
-    ULONG nSize;
-    switch ( nDataType )
-    {
-        case 1 :            // BYTE
-        case 2 :            // ACSII
-        case 6 :            // SIGNED Byte
-        case 7 :            // UNDEFINED
-            nSize = 1;
-            break;
-        case 3 :            // UINT16
-        case 8 :            // INT16
-            nSize = 2;
-            break;
-        case 4 :            // UINT32
-        case 9 :            // INT32
-        case 11 :           // FLOAT
-            nSize = 4;
-            break;
-        case 5 :            // RATIONAL
-        case 10 :           // SIGNED RATINAL
-        case 12 :           // DOUBLE
-            nSize = 8;
-            break;
-        default:
-            pTIFF->SetError(SVSTREAM_FILEFORMAT_ERROR);
-            nSize=1;
-    }
-    return nSize;
-}
-
-// ---------------------------------------------------------------------------------
-
-ULONG TIFFReader::ReadIntData()
-{
-    double  nDOUBLE;
-    float   nFLOAT;
-    UINT32  nUINT32a, nUINT32b;
-    INT32   nINT32;
-    UINT16  nUINT16;
-    INT16   nINT16;
-    BYTE    nBYTE;
-    char    nCHAR;
-
-    switch( nDataType )
-    {
-        case 0 :    //??
-        case 1 :
-        case 2 :
-        case 7 :
-            *pTIFF >> nBYTE;
-            nUINT32a = (ULONG)nBYTE;
-        break;
-        case 3 :
-             *pTIFF >> nUINT16;
-             nUINT32a = (ULONG)nUINT16;
-        break;
-        case 9 :
-        case 4 :
-            *pTIFF >> nUINT32a;
-        break;
-        case  5 :
-            *pTIFF >> nUINT32a >> nUINT32b;
-            if ( nUINT32b != 0 )
-                nUINT32a /= nUINT32b;
-        break;
-        case 6 :
-            *pTIFF >> nCHAR;
-            nUINT32a = (INT32)nCHAR;
-        break;
-        case 8 :
-            *pTIFF >> nINT16;
-            nUINT32a = (INT32)nINT16;
-        break;
-        case 10 :
-            *pTIFF >> nUINT32a >> nINT32;
-            if ( nINT32 != 0 )
-                nUINT32a /= nINT32;
-        break;
-        case 11 :
-            *pTIFF >> nFLOAT;
-            nUINT32a = (INT32)nFLOAT;
-        break;
-        case 12 :
-            *pTIFF >> nDOUBLE;
-            nUINT32a = (INT32)nDOUBLE;
-        break;
-        default:
-            *pTIFF >> nUINT32a;
-        break;
-    }
-    return nUINT32a;
-}
-
-// ---------------------------------------------------------------------------------
-
-double TIFFReader::ReadDoubleData()
-{
-    sal_uInt32 nulong;
-    double  nd;
-
-    if ( nDataType == 5 )
-    {
-        *pTIFF >> nulong;
-        nd = (double)nulong;
-        *pTIFF >> nulong;
-        if ( nulong != 0 )
-            nd /= (double)nulong;
-    }
-    else
-        nd = (double)ReadIntData();
-    return nd;
-}
-
-// ---------------------------------------------------------------------------------
-
-void TIFFReader::ReadTagData( USHORT nTagType, sal_uInt32 nDataLen)
-{
-    if ( bStatus == FALSE )
-        return;
-
-    switch ( nTagType )
-    {
-        case 0x00fe:   // New Sub File
-            nNewSubFile = ReadIntData();
-            OOODEBUG("NewSubFile",nNewSubFile);
-            break;
-
-        case 0x00ff:   // Sub File
-            nSubFile = ReadIntData();
-            OOODEBUG("SubFile",nSubFile);
-            break;
-
-        case 0x0100:   // Image Width
-            nImageWidth = ReadIntData();
-            OOODEBUG("ImageWidth",nImageWidth);
-            break;
-
-        case 0x0101:   // Image Length
-            nImageLength = ReadIntData();
-            OOODEBUG("ImageLength",nImageLength);
-            break;
-
-        case 0x0102:   // Bits Per Sample
-            nBitsPerSample = ReadIntData();
-            OOODEBUG("BitsPerSample",nBitsPerSample);
-            break;
-
-        case 0x0103:   // Compression
-            nCompression = ReadIntData();
-            OOODEBUG("Compression",nCompression);
-            break;
-
-        case 0x0106:   // Photometric Interpreation
-            nPhotometricInterpretation = ReadIntData();
-            OOODEBUG("PhotometricInterpretation",nPhotometricInterpretation);
-            break;
-
-        case 0x0107:   // Thresholding
-            nThresholding = ReadIntData();
-            OOODEBUG("Thresholding",nThresholding);
-            break;
-
-        case 0x0108:   // Cell Width
-            nCellWidth = ReadIntData();
-            break;
-
-        case 0x0109:   // Cell Length
-            nCellLength = ReadIntData();
-            break;
-
-        case 0x010a:   // Fill Order
-            nFillOrder = ReadIntData();
-            OOODEBUG("FillOrder",nFillOrder);
-            break;
-
-        case 0x0111: { // Strip Offset(s)
-            ULONG nOldNumSO, i, * pOldSO;
-            pOldSO = pStripOffsets;
-            if ( pOldSO == NULL )
-                nNumStripOffsets = 0;
-            nOldNumSO = nNumStripOffsets;
-            nDataLen += nOldNumSO;
-            if ( ( nDataLen > nOldNumSO ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
-            {
-                nNumStripOffsets = nDataLen;
-                try
-                {
-                    pStripOffsets = new ULONG[ nNumStripOffsets ];
-                }
-                    catch (std::bad_alloc)
-                {
-                    pStripOffsets = NULL;
-                    nNumStripOffsets = 0;
-                }
-                if ( pStripOffsets )
-                {
-                    for ( i = 0; i < nOldNumSO; i++ )
-                        pStripOffsets[ i ] = pOldSO[ i ] + nOrigPos;
-                    for ( i = nOldNumSO; i < nNumStripOffsets; i++ )
-                        pStripOffsets[ i ] = ReadIntData() + nOrigPos;
-                }
-                delete[] pOldSO;
-            }
-            OOODEBUG("StripOffsets (Anzahl:)",nDataLen);
-            break;
-        }
-        case 0x0112:   // Orientation
-            nOrientation = ReadIntData();
-            OOODEBUG("Orientation",nOrientation);
-            break;
-
-        case 0x0115:   // Samples Per Pixel
-            nSamplesPerPixel = ReadIntData();
-            OOODEBUG("SamplesPerPixel",nSamplesPerPixel);
-            break;
-
-        case 0x0116:   // Rows Per Strip
-            nRowsPerStrip = ReadIntData();
-            OOODEBUG("RowsPerStrip",nRowsPerStrip);
-            break;
-
-        case 0x0117: { // Strip Byte Counts
-            ULONG nOldNumSBC, i, * pOldSBC;
-            pOldSBC = pStripByteCounts;
-            if ( pOldSBC == NULL )
-                nNumStripByteCounts = 0; // Sicherheitshalber
-            nOldNumSBC = nNumStripByteCounts;
-            nDataLen += nOldNumSBC;
-            if ( ( nDataLen > nOldNumSBC ) && ( nDataLen < SAL_MAX_UINT32 / sizeof( sal_uInt32 ) ) )
-            {
-                nNumStripByteCounts = nDataLen;
-                try
-                {
-                    pStripByteCounts = new ULONG[ nNumStripByteCounts ];
-                }
-                    catch (std::bad_alloc)
-                {
-                    pStripByteCounts = NULL;
-                    nNumStripByteCounts = 0;
-                }
-                if ( pStripByteCounts )
-                {
-                    for ( i = 0; i < nOldNumSBC; i++ )
-                        pStripByteCounts[ i ] = pOldSBC[ i ];
-                    for ( i = nOldNumSBC; i < nNumStripByteCounts; i++)
-                        pStripByteCounts[ i ] = ReadIntData();
-                }
-                delete[] pOldSBC;
-            }
-            OOODEBUG("StripByteCounts (Anzahl:)",nDataLen);
-            break;
-        }
-        case 0x0118:   // Min Sample Value
-            nMinSampleValue = ReadIntData();
-            OOODEBUG("MinSampleValue",nMinSampleValue);
-            break;
-
-        case 0x0119:   // Max Sample Value
-            nMaxSampleValue = ReadIntData();
-            OOODEBUG("MaxSampleValue",nMaxSampleValue);
-            break;
-
-        case 0x011a:   // X Resolution
-            fXResolution = ReadDoubleData();
-            break;
-
-        case 0x011b:   // Y Resolution
-            fYResolution = ReadDoubleData();
-            break;
-
-        case 0x011c:   // Planar Configuration
-            nPlanarConfiguration = ReadIntData();
-            OOODEBUG("PlanarConfiguration",nPlanarConfiguration);
-            break;
-
-        case 0x0124:   // Group 3 Options
-            nGroup3Options = ReadIntData();
-            OOODEBUG("Group3Options",nGroup3Options);
-            break;
-
-        case 0x0125:   // Group 4 Options
-            nGroup4Options = ReadIntData();
-            OOODEBUG("Group4Options",nGroup4Options);
-            break;
-
-        case 0x0128:   // Resolution Unit
-            nResolutionUnit = ReadIntData();
-            break;
-
-        case 0x013d:   // Predictor
-            nPredictor = ReadIntData();
-            OOODEBUG("Predictor",nPredictor);
-            break;
-
-        case 0x0140: { // Color Map
-            USHORT nVal;
-            ULONG i;
-            nNumColors= ( 1 << nBitsPerSample );
-            if ( nDataType == 3 && nNumColors <= 256)
-            {
-                pColorMap = new ULONG[ 256 ];
-                for ( i = 0; i < nNumColors; i++ )
-                    pColorMap[ i ] = 0;
-                for ( i = 0; i < nNumColors; i++ )
-                {
-                    *pTIFF >> nVal;
-                    pColorMap[ i ] |= ( ( (ULONG)nVal ) << 8 ) & 0x00ff0000;
-                }
-                for ( i = 0; i < nNumColors; i++ )
-                {
-                    *pTIFF >> nVal;
-                    pColorMap[ i ] |= ( (ULONG)nVal ) & 0x0000ff00;
-                }
-                for ( i = 0; i < nNumColors; i++ )
-                {
-                    *pTIFF >> nVal;
-                    pColorMap[ i ] |= ( ( (ULONG)nVal ) >> 8 ) & 0x000000ff;
-                }
-            }
-            else
-                bStatus = FALSE;
-            OOODEBUG("ColorMap (Anzahl Farben:)", nNumColors);
-            break;
-        }
-    }
-
-    if ( pTIFF->GetError() )
-        bStatus = FALSE;
-}
-
-// ---------------------------------------------------------------------------------
-
-BOOL TIFFReader::ReadMap( ULONG nMinPercent, ULONG nMaxPercent )
-{
-    if ( nCompression == 1 || nCompression == 32771 )
-    {
-        ULONG ny, np, nStrip, nStripBytesPerRow;
-
-        if ( nCompression == 1 )
-            nStripBytesPerRow = nBytesPerRow;
-        else
-            nStripBytesPerRow = ( nBytesPerRow + 1 ) & 0xfffffffe;
-        for ( ny = 0; ny < nImageLength; ny++ )
-        {
-            for ( np = 0; np < nPlanes; np++ )
-            {
-                nStrip = ny / nRowsPerStrip + np * nStripsPerPlane;
-                if ( nStrip >= nNumStripOffsets )
-                    return FALSE;
-                pTIFF->Seek( pStripOffsets[ nStrip ] + ( ny % nRowsPerStrip ) * nStripBytesPerRow );
-                pTIFF->Read( pMap[ np ], nBytesPerRow );
-                if ( pTIFF->GetError() )
-                    return FALSE;
-                MayCallback( nMinPercent + ( nMaxPercent - nMinPercent ) * ( np * nImageLength + ny) / ( nImageLength * nPlanes ) );
-            }
-            if ( !ConvertScanline( ny ) )
-                return FALSE;
-        }
-    }
-    else if ( nCompression == 2 || nCompression == 3 || nCompression == 4 )
-    {
-        ULONG ny, np, nStrip, nOptions;
-        if ( nCompression == 2 )
-        {
-            nOptions = CCI_OPTION_BYTEALIGNROW;
-        }
-        else if ( nCompression == 3 )
-        {
-            nOptions = CCI_OPTION_EOL;
-            if ( nGroup3Options & 0x00000001 )
-                nOptions |= CCI_OPTION_2D;
-            if ( nGroup3Options & 0x00000004 )
-                nOptions |= CCI_OPTION_BYTEALIGNEOL;
-            if ( nGroup3Options & 0xfffffffa )
-                return FALSE;
-        }
-        else
-        {   // nCompression==4
-            nOptions = CCI_OPTION_2D;
-            if ( nGroup4Options & 0xffffffff )
-                return FALSE;
-        }
-        if ( nFillOrder == 2 )
-        {
-            nOptions |= CCI_OPTION_INVERSEBITORDER;
-            bByteSwap = FALSE;
-        }
-        nStrip = 0;
-        if ( nStrip >= nNumStripOffsets )
-            return FALSE;
-        pTIFF->Seek(pStripOffsets[nStrip]);
-
-        CCIDecompressor aCCIDecom( nOptions, nImageWidth );
-
-        aCCIDecom.StartDecompression( *pTIFF );
-
-        for ( ny = 0; ny < nImageLength; ny++ )
-        {
-            for ( np = 0; np < nPlanes; np++ )
-            {
-                if ( ny / nRowsPerStrip + np * nStripsPerPlane > nStrip )
-                {
-                    nStrip=ny/nRowsPerStrip+np*nStripsPerPlane;
-                    if ( nStrip >= nNumStripOffsets )
-                        return FALSE;
-                    pTIFF->Seek( pStripOffsets[ nStrip ] );
-                    aCCIDecom.StartDecompression( *pTIFF );
-                }
-                if ( aCCIDecom.DecompressScanline( pMap[ np ], nImageWidth * nBitsPerSample * nSamplesPerPixel / nPlanes ) == FALSE )
-                    return FALSE;
-                if ( pTIFF->GetError() )
-                    return FALSE;
-                MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes));
-            }
-            if ( !ConvertScanline( ny ) )
-                return FALSE;
-        }
-    }
-    else if ( nCompression == 5 )
-    {
-        LZWDecompressor aLZWDecom;
-        ULONG ny, np, nStrip;
-        nStrip=0;
-        if ( nStrip >= nNumStripOffsets )
-            return FALSE;
-        pTIFF->Seek(pStripOffsets[nStrip]);
-        aLZWDecom.StartDecompression(*pTIFF);
-        for ( ny = 0; ny < nImageLength; ny++ )
-        {
-            for ( np = 0; np < nPlanes; np++ )
-            {
-                if ( ny / nRowsPerStrip + np * nStripsPerPlane > nStrip )
-                {
-                    nStrip = ny / nRowsPerStrip + np * nStripsPerPlane;
-                    if ( nStrip >= nNumStripOffsets )
-                        return FALSE;
-                    pTIFF->Seek(pStripOffsets[nStrip]);
-                    aLZWDecom.StartDecompression(*pTIFF);
-                }
-                if ( ( aLZWDecom.Decompress( pMap[ np ], nBytesPerRow ) != nBytesPerRow ) || pTIFF->GetError() )
-                    return FALSE;
-                MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes));
-            }
-            if ( !ConvertScanline( ny ) )
-                return FALSE;
-        }
-    }
-    else if ( nCompression == 32773 )
-    {
-        ULONG nStrip,nRecCount,nRowBytesLeft,ny,np,i;
-        BYTE * pdst, nRecHeader, nRecData;
-        nStrip = 0;
-        if ( nStrip >= nNumStripOffsets )
-            return FALSE;
-        pTIFF->Seek(pStripOffsets[nStrip]);
-        for ( ny = 0; ny < nImageLength; ny++ )
-        {
-            for ( np = 0; np < nPlanes; np++ )
-            {
-                if ( ny / nRowsPerStrip + np * nStripsPerPlane > nStrip )
-                {
-                    nStrip=ny/nRowsPerStrip+np*nStripsPerPlane;
-                    if ( nStrip >= nNumStripOffsets )
-                        return FALSE;
-                    pTIFF->Seek(pStripOffsets[nStrip]);
-                }
-                nRowBytesLeft = nBytesPerRow;
-                pdst=pMap[ np ];
-                do
-                {
-                    *pTIFF >> nRecHeader;
-                    if ((nRecHeader&0x80)==0)
-                    {
-                        nRecCount=0x00000001+((ULONG)nRecHeader);
-                        if ( nRecCount > nRowBytesLeft )
-                            return FALSE;
-                        pTIFF->Read(pdst,nRecCount);
-                        pdst+=nRecCount;
-                        nRowBytesLeft-=nRecCount;
-                    }
-                    else if ( nRecHeader != 0x80 )
-                    {
-                        nRecCount = 0x000000101 - ( (ULONG)nRecHeader );
-                        if ( nRecCount > nRowBytesLeft )
-                        {
-                            nRecCount = nRowBytesLeft;
-
-//                          bStatus = FALSE;
-//                          return;
-
-                        }
-                        *pTIFF >> nRecData;
-                        for ( i = 0; i < nRecCount; i++ )
-                            *(pdst++) = nRecData;
-                        nRowBytesLeft -= nRecCount;
-                    }
-                } while ( nRowBytesLeft != 0 );
-                if ( pTIFF->GetError() )
-                    return FALSE;
-                MayCallback(nMinPercent+(nMaxPercent-nMinPercent)*(np*nImageLength+ny)/(nImageLength*nPlanes));
-            }
-            if ( !ConvertScanline( ny ) )
-                return FALSE;
-        }
-    }
-    else
-        return FALSE;
-    return TRUE;
-}
-
-ULONG TIFFReader::GetBits( const BYTE * pSrc, ULONG nBitsPos, ULONG nBitsCount )
-{
-    ULONG nRes;
-    if ( bByteSwap )
-    {
-        pSrc += ( nBitsPos >> 3 );
-        nBitsPos &= 7;
-        BYTE nDat = *pSrc;
-        nRes = (ULONG)( BYTESWAP( nDat ) & ( 0xff >> nBitsPos ) );
-
-        if ( nBitsCount <= 8 - nBitsPos )
-        {
-            nRes >>= ( 8 - nBitsPos - nBitsCount );
-        }
-        else
-        {
-            pSrc++;
-            nBitsCount -= 8 - nBitsPos;
-            while ( nBitsCount >= 8 )
-            {
-                nDat = *(pSrc++);
-                nRes = ( nRes << 8 ) | ((ULONG)BYTESWAP( nDat ) );
-                nBitsCount -= 8;
-            }
-            if ( nBitsCount > 0 )
-            {
-                nDat = *pSrc;
-                nRes = ( nRes << nBitsCount ) | (((ULONG)BYTESWAP(nDat))>>(8-nBitsCount));
-            }
-        }
-    }
-    else
-    {
-        pSrc += ( nBitsPos >> 3 );
-        nBitsPos &= 7;
-        nRes = (ULONG)((*pSrc)&(0xff>>nBitsPos));
-        if ( nBitsCount <= 8 - nBitsPos )
-        {
-            nRes >>= ( 8 - nBitsPos - nBitsCount );
-        }
-        else
-        {
-            pSrc++;
-            nBitsCount -= 8 - nBitsPos;
-            while ( nBitsCount >= 8 )
-            {
-                nRes = ( nRes << 8 ) | ((ULONG)*(pSrc++));
-                nBitsCount -= 8;
-            }
-            if ( nBitsCount > 0 )
-                nRes = ( nRes << nBitsCount ) | (((ULONG)*pSrc)>>(8-nBitsCount));
-        }
-    }
-    return nRes;
-}
-
-// ---------------------------------------------------------------------------------
-
-BOOL TIFFReader::ConvertScanline( ULONG nY )
-{
-    UINT32  nRed, nGreen, nBlue, ns, nx, nVal, nByteCount;
-    BYTE    nByteVal;
-
-    if ( nDstBitsPerPixel == 24 )
-    {
-        if ( nBitsPerSample == 8 && nSamplesPerPixel >= 3 &&
-             nPlanes == 1 && nPhotometricInterpretation == 2 )
-        {
-            BYTE*   pt = pMap[ 0 ];
-
-            // sind die Werte als Differenz abgelegt?
-            if ( 2 == nPredictor )
-            {
-                BYTE  nLRed = 0;
-                BYTE  nLGreen = 0;
-                BYTE  nLBlue = 0;
-                for ( nx = 0; nx < nImageWidth; nx++, pt += nSamplesPerPixel )
-                {
-                    nLRed = nLRed + pt[ 0 ];
-                    nLGreen = nLGreen + pt[ 1 ];
-                    nLBlue = nLBlue + pt[ 2 ];
-                    pAcc->SetPixel( nY, nx, Color( nLRed, nLGreen, nLBlue ) );
-                }
-            }
-            else
-            {
-                for ( nx = 0; nx < nImageWidth; nx++, pt += nSamplesPerPixel )
-                {
-                    pAcc->SetPixel( nY, nx, Color( pt[0], pt[1], pt[2] ) );
-                }
-            }
-        }
-        else if ( nPhotometricInterpretation == 2 && nSamplesPerPixel >= 3 )
-        {
-            ULONG nMinMax = nMinSampleValue * 255 / ( nMaxSampleValue - nMinSampleValue );
-            for ( nx = 0; nx < nImageWidth; nx++ )
-            {
-                if ( nPlanes < 3 )
-                {
-                    nRed = GetBits( pMap[ 0 ], ( nx * nSamplesPerPixel + 0 ) * nBitsPerSample, nBitsPerSample );
-                    nGreen = GetBits( pMap[ 1 ], ( nx * nSamplesPerPixel + 1 ) * nBitsPerSample, nBitsPerSample );
-                    nBlue = GetBits( pMap[ 2 ], ( nx * nSamplesPerPixel + 2 ) * nBitsPerSample, nBitsPerSample );
-                }
-                else
-                {
-                    nRed = GetBits( pMap[ 0 ], nx * nBitsPerSample, nBitsPerSample );
-                    nGreen = GetBits( pMap[ 1 ], nx * nBitsPerSample, nBitsPerSample );
-                    nBlue = GetBits( pMap[ 2 ], nx * nBitsPerSample, nBitsPerSample );
-                }
-                pAcc->SetPixel( nY, nx, Color( (BYTE)( nRed - nMinMax ), (BYTE)( nGreen - nMinMax ), (BYTE)(nBlue - nMinMax) ) );
-            }
-        }
-        else if ( nPhotometricInterpretation == 5 && nSamplesPerPixel == 3 )
-        {
-            ULONG nMinMax =  nMinSampleValue * 255 / ( nMaxSampleValue - nMinSampleValue );
-            for ( nx = 0; nx < nImageWidth; nx++ )
-            {
-                if ( nPlanes < 3 )
-                {
-                    nRed = GetBits( pMap[ 0 ],( nx * nSamplesPerPixel + 0 ) * nBitsPerSample, nBitsPerSample );
-                    nGreen = GetBits( pMap[ 0 ],( nx * nSamplesPerPixel + 1 ) * nBitsPerSample, nBitsPerSample );
-                    nBlue = GetBits( pMap[ 0 ],( nx * nSamplesPerPixel + 2 ) * nBitsPerSample, nBitsPerSample );
-                }
-                else
-                {
-                    nRed = GetBits( pMap[ 0 ], nx * nBitsPerSample, nBitsPerSample );
-                    nGreen = GetBits( pMap[ 1 ], nx * nBitsPerSample, nBitsPerSample );
-                    nBlue = GetBits( pMap[ 2 ], nx * nBitsPerSample, nBitsPerSample );
-                }
-                nRed = 255 - (BYTE)( nRed - nMinMax );
-                nGreen = 255 - (BYTE)( nGreen - nMinMax );
-                nBlue = 255 - (BYTE)( nBlue - nMinMax );
-                pAcc->SetPixel( nY, nx, Color( (BYTE) nRed, (BYTE) nGreen, (BYTE) nBlue ) );
-            }
-        }
-        else if( nPhotometricInterpretation == 5 && nSamplesPerPixel == 4 )
-        {
-            BYTE    nSamp[ 4 ];
-            BYTE    nSampLast[ 4 ] = { 0, 0, 0, 0 };
-            long    nBlack;
-
-            for( nx = 0; nx < nImageWidth; nx++ )
-            {
-                // sind die Werte als Differenz abgelegt?
-                if( 2 == nPredictor )
-                {
-                    for( ns = 0; ns < 4; ns++ )
-                    {
-                        if( nPlanes < 3 )
-                            nSampLast[ ns ] = nSampLast[ ns ] + (BYTE) GetBits( pMap[ 0 ], ( nx * nSamplesPerPixel + ns ) * nBitsPerSample, nBitsPerSample );
-                        else
-                            nSampLast[ ns ] = nSampLast[ ns ] + (BYTE) GetBits( pMap[ ns ], nx * nBitsPerSample, nBitsPerSample );
-                        nSamp[ ns ] = nSampLast[ ns ];
-                    }
-                }
-                else
-                {
-                    for( ns = 0; ns < 4; ns++ )
-                    {
-                        if( nPlanes < 3 )
-                            nSamp[ ns ] = (BYTE) GetBits( pMap[ 0 ], ( nx * nSamplesPerPixel + ns ) * nBitsPerSample, nBitsPerSample );
-                        else
-                            nSamp[ ns ]= (BYTE) GetBits( pMap[ ns ], nx * nBitsPerSample, nBitsPerSample );
-                    }
-                }
-                nBlack = nSamp[ 3 ];
-                nRed = (BYTE) Max( 0L, 255L - ( ( (long) nSamp[ 0 ] + nBlack - ( ( (long) nMinSampleValue ) << 1 ) ) *
-                            255L/(long)(nMaxSampleValue-nMinSampleValue) ) );
-                nGreen = (BYTE) Max( 0L, 255L - ( ( (long) nSamp[ 1 ] + nBlack - ( ( (long) nMinSampleValue ) << 1 ) ) *
-                            255L/(long)(nMaxSampleValue-nMinSampleValue) ) );
-                nBlue = (BYTE) Max( 0L, 255L - ( ( (long) nSamp[ 2 ] + nBlack - ( ( (long) nMinSampleValue ) << 1 ) ) *
-                            255L/(long)(nMaxSampleValue-nMinSampleValue) ) );
-                pAcc->SetPixel( nY, nx, Color ( (BYTE)nRed, (BYTE)nGreen, (BYTE)nBlue ) );
-
-            }
-        }
-    }
-    else if ( nSamplesPerPixel == 1 && ( nPhotometricInterpretation <= 1 || nPhotometricInterpretation == 3 ) )
-    {
-        ULONG nMinMax = ( ( 1 << nDstBitsPerPixel ) - 1 ) / ( nMaxSampleValue - nMinSampleValue );
-        BYTE* pt = pMap[ 0 ];
-        BYTE nShift;
-
-        switch ( nDstBitsPerPixel )
-        {
-            case 8 :
-            {
-                BYTE nLast;
-                if ( bByteSwap )
-                {
-                    if ( nPredictor == 2 )
-                    {
-                        nLast = BYTESWAP( (BYTE)*pt++ );
-                        for ( nx = 0; nx < nImageWidth; nx++ )
-                        {
-                            pAcc->SetPixel( nY, nx, nLast );
-                            nLast = nLast + *pt++;
-                        }
-                    }
-                    else
-                    {
-                        for ( nx = 0; nx < nImageWidth; nx++ )
-                        {
-                            nLast = *pt++;
-                            pAcc->SetPixel( nY, nx, (BYTE)( ( (BYTESWAP((ULONG)nLast ) - nMinSampleValue ) * nMinMax ) ) );
-                        }
-                    }
-                }
-                else
-                {
-                    if ( nPredictor == 2 )
-                    {
-                        nLast = *pt++;
-                        for ( nx = 0; nx < nImageWidth; nx++ )
-                        {
-                            pAcc->SetPixel( nY, nx, nLast );
-                            nLast = nLast + *pt++;
-                        }
-                    }
-                    else
-                    {
-                        for ( nx = 0; nx < nImageWidth; nx++ )
-                        {
-                            pAcc->SetPixel( nY, nx, (BYTE)( ( (ULONG)*pt++ - nMinSampleValue ) * nMinMax ) );
-
-                        }
-                    }
-                }
-            }
-            break;
-
-            case 7 :
-            case 6 :
-            case 5 :
-            case 4 :
-            case 3 :
-            case 2 :
-            {
-                for ( nx = 0; nx < nImageWidth; nx++ )
-                {
-                    nVal = ( GetBits( pt, nx * nBitsPerSample, nBitsPerSample ) - nMinSampleValue ) * nMinMax;
-                    pAcc->SetPixel( nY, nx, (BYTE)nVal );
-                }
-            }
-            break;
-
-            case 1 :
-            {
-                if ( bByteSwap )
-                {
-                    nx = 0;
-                    nByteCount = ( nImageWidth >> 3 ) + 1;
-                    while ( --nByteCount )
-                    {
-                        nByteVal = *pt++;
-                        pAcc->SetPixel( nY, nx++, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, nx++, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, nx++, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, nx++, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, nx++, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, nx++, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, nx++, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, nx++, nByteVal );
-                    }
-                    if ( nImageWidth & 7 )
-                    {
-                        nByteVal = *pt++;
-                        while ( nx < nImageWidth )
-                        {
-                            pAcc->SetPixel( nY, nx++, nByteVal & 1 );
-                            nByteVal >>= 1;
-                        }
-                    }
-                }
-                else
-                {
-                    nx = 7;
-                    nByteCount = ( nImageWidth >> 3 ) + 1;
-                    while ( --nByteCount )
-                    {
-                        nByteVal = *pt++;
-                        pAcc->SetPixel( nY, nx, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, --nx, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, --nx, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, --nx, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, --nx, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, --nx, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, --nx, nByteVal & 1 );
-                        nByteVal >>= 1;
-                        pAcc->SetPixel( nY, --nx, nByteVal );
-                        nx += 15;
-                    }
-                    if ( nImageWidth & 7 )
-                    {
-                        nx -= 7;
-                        nByteVal = *pt++;
-                        nShift = 7;
-                        while ( nx < nImageWidth )
-                        {
-                            pAcc->SetPixel( nY, nx++, ( nByteVal >> nShift ) & 1);
-                        }
-                    }
-                }
-            }
-            break;
-
-            default :
-                return FALSE;
-        }
-    }
-    else if ( ( nSamplesPerPixel == 2 ) && ( nBitsPerSample == 8 ) &&
-        ( nPlanarConfiguration == 1 ) && ( pColorMap == 0 ) )               // grayscale
-    {
-        ULONG nMinMax = ( ( 1 << 8 /*nDstBitsPerPixel*/ ) - 1 ) / ( nMaxSampleValue - nMinSampleValue );
-        BYTE*   pt = pMap[ 0 ];
-        if ( nByte1 == 'I' )
-            pt++;
-        for ( nx = 0; nx < nImageWidth; nx++, pt += 2 )
-        {
-            pAcc->SetPixel( nY, nx, (BYTE)( ( (ULONG)*pt - nMinSampleValue ) * nMinMax ) );
-        }
-    }
-    else
-        return FALSE;
-    return TRUE;
-}
-
-// ---------------------------------------------------------------------------------
-
-void TIFFReader::MakePalCol( void )
-{
-    if ( nDstBitsPerPixel <= 8 )
-    {
-        ULONG i, nVal, n0RGB;
-        if  ( pColorMap == NULL )
-            pColorMap = new ULONG[ 256 ];
-        if ( nPhotometricInterpretation <= 1 )
-        {
-            nNumColors = 1 << nBitsPerSample;
-            if ( nNumColors > 256 )
-                nNumColors = 256;
-            pAcc->SetPaletteEntryCount( (USHORT)nNumColors );
-            for ( i = 0; i < nNumColors; i++ )
-            {
-                nVal = ( i * 255 / ( nNumColors - 1 ) ) & 0xff;
-                n0RGB = nVal | ( nVal << 8 ) | ( nVal << 16 );
-                if ( nPhotometricInterpretation == 1 )
-                    pColorMap[ i ] = n0RGB;
-                else
-                    pColorMap[ nNumColors - i - 1 ] = n0RGB;
-            }
-        }
-        for ( i = 0; i < nNumColors; i++ )
-        {
-            pAcc->SetPaletteColor( (USHORT)i, BitmapColor( (BYTE)( pColorMap[ i ] >> 16 ),
-                (BYTE)( pColorMap[ i ] >> 8 ), (BYTE)pColorMap[ i ] ) );
-        }
-    }
-
-    if ( fXResolution > 1.0 && fYResolution > 1.0 && ( nResolutionUnit == 2 || nResolutionUnit == 3 ) )
-    {
-        ULONG nRX,nRY;
-        if (nResolutionUnit==2)
-        {
-            nRX=(ULONG)(fXResolution+0.5);
-            nRY=(ULONG)(fYResolution+0.5);
-        }
-        else
-        {
-            nRX=(ULONG)(fXResolution*2.54+0.5);
-            nRY=(ULONG)(fYResolution*2.54+0.5);
-        }
-        MapMode aMapMode(MAP_INCH,Point(0,0),Fraction(1,nRX),Fraction(1,nRY));
-        aBitmap.SetPrefMapMode(aMapMode);
-        aBitmap.SetPrefSize(Size(nImageWidth,nImageLength));
-    }
-}
-
-// ---------------------------------------------------------------------------------
-
-void TIFFReader::ReadHeader()
-{
-    BYTE nbyte1, nbyte2;
-    USHORT nushort;
-
-    *pTIFF >> nbyte1;
-    if ( nbyte1 == 'I' )
-        pTIFF->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN );
-    else
-        pTIFF->SetNumberFormatInt( NUMBERFORMAT_INT_BIGENDIAN );
-
-    *pTIFF >> nbyte2 >> nushort;
-    if ( nbyte1 != nbyte2 || ( nbyte1 != 'I' && nbyte1 != 'M' ) || nushort != 0x002a )
-        bStatus = FALSE;
-}
-
-// ---------------------------------------------------------------------------------
-
-BOOL TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic )
-{
-    USHORT  i, nNumTags, nTagType;
-    ULONG   nMaxPos;
-    ULONG   nPos;
-    sal_uInt32 nFirstIfd, nDataLen;
-
-    bStatus = TRUE;
-    nLastPercent = 0;
-
-    pTIFF = &rTIFF;
-    nMaxPos = nOrigPos = pTIFF->Tell();
-    nOrigNumberFormat = pTIFF->GetNumberFormatInt();
-
-    MayCallback( 0 );
-
-    // Kopf einlesen:
-    ReadHeader();
-
-    // Ersten IFD einlesen:
-    *pTIFF >> nFirstIfd;
-
-    if( !nFirstIfd || pTIFF->GetError() )
-        bStatus = FALSE;
-
-    if ( bStatus )
-    {
-        sal_uInt32 nOffset = nFirstIfd;
-
-        // calculate length of TIFF file
-        do
-        {
-            pTIFF->Seek( nOrigPos + nOffset );
-
-            if( pTIFF->GetError() )
-            {
-                pTIFF->ResetError();
-                break;
-            };
-            nMaxPos = Max( pTIFF->Tell(), nMaxPos );
-
-            *pTIFF >> nNumTags;
-
-            // Schleife ueber Tags:
-            for( i = 0; i < nNumTags; i++ )
-            {
-                *pTIFF >> nTagType >> nDataType >> nDataLen >> nOffset;
-
-                if( DataTypeSize() * nDataLen > 4 )
-                    nMaxPos = Max( nOrigPos + nOffset + DataTypeSize() * nDataLen, nMaxPos );
-            }
-            *pTIFF >> nOffset;
-            if ( pTIFF->IsEof() )
-                nOffset = 0;
-
-            nMaxPos = Max( pTIFF->Tell(), nMaxPos );
-            if ( !nOffset )
-                nMaxPos = Max( pTIFF->Tell(), nMaxPos );
-        }
-        while( nOffset );
-
-        for ( UINT32 nNextIfd = nFirstIfd; nNextIfd && bStatus; )
-        {
-            pTIFF->Seek( nOrigPos + nNextIfd );
-            {
-                bByteSwap = FALSE;
-
-                nNewSubFile = 0;
-                nSubFile = 0;
-                nImageWidth = 0;
-                nImageLength = 0;
-                nBitsPerSample = 1;                         // Defaultwert laut Doku
-                nCompression = 1;
-                nPhotometricInterpretation = 0;
-                nThresholding = 1;                          // Defaultwert laut Doku
-                nCellWidth = 1;
-                nCellLength = 1;
-                nFillOrder = 1;                             // Defaultwert laut Doku
-                nNumStripOffsets = 0;
-                nOrientation = 1;
-                nSamplesPerPixel = 1;                       // Defaultwert laut Doku
-                nRowsPerStrip = 0xffffffff;                 // Defaultwert laut Doku
-                nNumStripByteCounts = 0;
-                nMinSampleValue = 0;                        // Defaultwert laut Doku
-                nMaxSampleValue = 0;
-                fXResolution = 0.0;
-                fYResolution = 0.0;
-                nPlanarConfiguration = 1;
-                nGroup3Options = 0;                         // Defaultwert laut Doku
-                nGroup4Options = 0;                         // Defaultwert laut Doku
-                nResolutionUnit = 2;                        // Defaultwert laut Doku
-                nPredictor = 1;
-                nNumColors = 0;
-
-                pAcc = NULL;
-                pColorMap = NULL;
-                pStripOffsets = NULL;
-                pStripByteCounts = NULL;
-                pMap[ 0 ] = pMap[ 1 ] = pMap[ 2 ] = pMap[ 3 ] = NULL;
-
-                *pTIFF >> nNumTags;
-                nPos = pTIFF->Tell();
-
-                // Schleife ueber Tags:
-                for( i = 0; i < nNumTags; i++ )
-                {
-                    *pTIFF >> nTagType >> nDataType >> nDataLen;
-
-                    if( DataTypeSize() * nDataLen > 4 )
-                    {
-                        *pTIFF >> nOffset;
-                        pTIFF->Seek( nOrigPos + nOffset );
-                    }
-                    ReadTagData( nTagType, nDataLen );
-                    nPos += 12; pTIFF->Seek( nPos );
-
-                    if ( pTIFF->GetError() )
-                        bStatus = FALSE;
-
-                    if ( bStatus == FALSE )
-                        break;
-                }
-                *pTIFF >> nNextIfd;
-                if ( pTIFF->IsEof() )
-                    nNextIfd = 0;
-            }
-            if ( bStatus )
-            {
-                if ( nMaxSampleValue == 0 )
-                    nMaxSampleValue = ( 1 << nBitsPerSample ) - 1;
-
-                if ( nPhotometricInterpretation == 2 || nPhotometricInterpretation == 5 || nPhotometricInterpretation == 6 )
-                    nDstBitsPerPixel = 24;
-                else if ( nBitsPerSample*nSamplesPerPixel <= 1 )
-                    nDstBitsPerPixel = 1;
-                else if ( nBitsPerSample*nSamplesPerPixel <= 4 )
-                    nDstBitsPerPixel = 4;
-                else
-                    nDstBitsPerPixel = 8;
-
-                aBitmap = Bitmap( Size( nImageWidth, nImageLength ), nDstBitsPerPixel );
-                pAcc = aBitmap.AcquireWriteAccess();
-                if ( pAcc )
-                {
-                    if ( nPlanarConfiguration == 1 )
-                        nPlanes = 1;
-                    else
-                        nPlanes = nSamplesPerPixel;
-
-                    if ( ( nFillOrder == 2 ) && ( nCompression != 5 ) )     // im LZW Mode werden die bits schon invertiert
-                        bByteSwap = TRUE;
-
-                    nStripsPerPlane = ( nImageLength - 1 ) / nRowsPerStrip + 1;
-                    nBytesPerRow = ( nImageWidth * nSamplesPerPixel / nPlanes * nBitsPerSample + 7 ) >> 3;
-
-                    for ( ULONG j = 0; j < 4; j++ )
-                    {
-                        try
-                        {
-                            pMap[ j ] = new BYTE[ nBytesPerRow ];
-                        }
-                            catch (std::bad_alloc)
-                        {
-                            pMap[ j ] = NULL;
-                            bStatus = FALSE;
-                            break;
-                        }
-                    }
-
-                    if ( bStatus && ReadMap( 10, 60 ) )
-                    {
-                        nMaxPos = Max( pTIFF->Tell(), nMaxPos );
-                        MakePalCol();
-                        nMaxPos = Max( pTIFF->Tell(), nMaxPos );
-                    }
-                    else
-                        bStatus = FALSE;
-
-                    if( pAcc )
-                    {
-                        aBitmap.ReleaseAccess( pAcc );
-                        if ( bStatus )
-                        {
-                            AnimationBitmap aAnimationBitmap( aBitmap, Point( 0, 0 ), aBitmap.GetSizePixel(),
-                                                              ANIMATION_TIMEOUT_ON_CLICK, DISPOSE_BACK );
-
-                            aAnimation.Insert( aAnimationBitmap );
-                        }
-                    }
-                    // Aufraeumen:
-                    for ( i = 0; i < 4; i++ )
-                        delete[] pMap[ i ];
-
-                    delete[] pColorMap;
-                    delete[] pStripOffsets;
-                    delete[] pStripByteCounts;
-                }
-            }
-        }
-    }
-
-    // seek to end of TIFF if succeeded
-    pTIFF->SetNumberFormatInt( nOrigNumberFormat );
-    pTIFF->Seek( bStatus ? nMaxPos : nOrigPos );
-
-    if ( aAnimation.Count() )
-    {
-        if ( aAnimation.Count() == 1 )
-            rGraphic = aAnimation.GetBitmapEx();
-        else
-            rGraphic = aAnimation;  //aBitmap;
-
-        return TRUE;
-    }
-    else
-        return FALSE;
-}
-
-
-//================== GraphicImport - die exportierte Funktion ================
-
-extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
-{
-    TIFFReader aTIFFReader;
-
-    if ( aTIFFReader.ReadTIFF( rStream, rGraphic ) == FALSE )
-        return FALSE;
-
-    return TRUE;
-}
-
-//============================= fuer Windows ==================================
-#ifndef GCC
-#endif
-
-#ifdef WIN
-
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
-
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
-{
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
-
-    return TRUE;
-}
-
-extern "C" int CALLBACK WEP( int )
-{
-    return 1;
-}
-
-#endif
-
-
diff --git a/goodies/source/filter.vcl/itiff/lzwdecom.cxx b/goodies/source/filter.vcl/itiff/lzwdecom.cxx
deleted file mode 100644
index 673b634ae4e7..000000000000
--- a/goodies/source/filter.vcl/itiff/lzwdecom.cxx
+++ /dev/null
@@ -1,195 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: lzwdecom.cxx,v $
- * $Revision: 1.7 $
- *
- * 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_goodies.hxx"
-
-#include "lzwdecom.hxx"
-
-LZWDecompressor::LZWDecompressor()
-{
-    USHORT i;
-
-    pTable=new LZWTableEntry[4096];
-    pOutBuf=new BYTE[4096];
-    for (i=0; i<4096; i++)
-    {
-        pTable[i].nPrevCode=0;
-        pTable[i].nDataCount=1;
-        pTable[i].nData=(BYTE)i;
-    }
-    pIStream=NULL;
-    bFirst = TRUE;
-    nOldCode = 0;
-}
-
-
-LZWDecompressor::~LZWDecompressor()
-{
-    delete[] pOutBuf;
-    delete[] pTable;
-}
-
-
-void LZWDecompressor::StartDecompression(SvStream & rIStream)
-{
-    pIStream=&rIStream;
-
-    nTableSize=258;
-
-    bEOIFound=FALSE;
-
-    nOutBufDataLen=0;
-
-    *pIStream >> nInputBitsBuf;
-
-    nInputBitsBufSize=8;
-
-    if ( bFirst )
-    {
-        bInvert = nInputBitsBuf == 1;
-        bFirst = FALSE;
-    }
-
-    if ( bInvert )
-        nInputBitsBuf = ( ( nInputBitsBuf & 1 ) << 7 ) | ( ( nInputBitsBuf & 2 ) << 5 ) | ( ( nInputBitsBuf & 4 ) << 3 ) | ( ( nInputBitsBuf & 8 ) << 1 ) | ( ( nInputBitsBuf & 16 ) >> 1 ) | ( ( nInputBitsBuf & 32 ) >> 3 ) | ( ( nInputBitsBuf & 64 ) >> 5 ) | ( (nInputBitsBuf & 128 ) >> 7 );
-}
-
-
-ULONG LZWDecompressor::Decompress(BYTE * pTarget, ULONG nMaxCount)
-{
-    ULONG nCount;
-
-    if (pIStream==NULL) return 0;
-
-    nCount=0;
-    for (;;) {
-
-        if (pIStream->GetError()) break;
-
-        if (((ULONG)nOutBufDataLen)>=nMaxCount) {
-            nOutBufDataLen = nOutBufDataLen - (USHORT)nMaxCount;
-            nCount+=nMaxCount;
-            while (nMaxCount>0) {
-                *(pTarget++)=*(pOutBufData++);
-                nMaxCount--;
-            }
-            break;
-        }
-
-        nMaxCount-=(ULONG)nOutBufDataLen;
-        nCount+=nOutBufDataLen;
-        while (nOutBufDataLen>0) {
-            *(pTarget++)=*(pOutBufData++);
-            nOutBufDataLen--;
-        }
-
-        if (bEOIFound==TRUE) break;
-
-        DecompressSome();
-
-    }
-
-    return nCount;
-}
-
-
-USHORT LZWDecompressor::GetNextCode()
-{
-    USHORT nBits,nCode;
-
-    if      (nTableSize<511)  nBits=9;
-    else if (nTableSize<1023) nBits=10;
-    else if (nTableSize<2047) nBits=11;
-    else                      nBits=12;
-
-    nCode=0;
-    do {
-        if (nInputBitsBufSize<=nBits)
-        {
-            nCode=(nCode<<nInputBitsBufSize) | nInputBitsBuf;
-            nBits = nBits - nInputBitsBufSize;
-            *pIStream >> nInputBitsBuf;
-            if ( bInvert )
-                nInputBitsBuf = ( ( nInputBitsBuf & 1 ) << 7 ) | ( ( nInputBitsBuf & 2 ) << 5 ) | ( ( nInputBitsBuf & 4 ) << 3 ) | ( ( nInputBitsBuf & 8 ) << 1 ) | ( ( nInputBitsBuf & 16 ) >> 1 ) | ( ( nInputBitsBuf & 32 ) >> 3 ) | ( ( nInputBitsBuf & 64 ) >> 5 ) | ( (nInputBitsBuf & 128 ) >> 7 );
-            nInputBitsBufSize=8;
-        }
-        else
-        {
-            nCode=(nCode<<nBits) | (nInputBitsBuf>>(nInputBitsBufSize-nBits));
-            nInputBitsBufSize = nInputBitsBufSize - nBits;
-            nInputBitsBuf&=0x00ff>>(8-nInputBitsBufSize);
-            nBits=0;
-        }
-    } while (nBits>0);
-
-    return nCode;
-}
-
-
-void LZWDecompressor::AddToTable(USHORT nPrevCode, USHORT nCodeFirstData)
-{
-    while (pTable[nCodeFirstData].nDataCount>1)
-        nCodeFirstData=pTable[nCodeFirstData].nPrevCode;
-
-    pTable[nTableSize].nPrevCode=nPrevCode;
-    pTable[nTableSize].nDataCount=pTable[nPrevCode].nDataCount+1;
-    pTable[nTableSize].nData=pTable[nCodeFirstData].nData;
-
-    nTableSize++;
-}
-
-
-void LZWDecompressor::DecompressSome()
-{
-    USHORT i,nCode;
-
-    nCode=GetNextCode();
-    if (nCode==256) {
-        nTableSize=258;
-        nCode=GetNextCode();
-        if (nCode==257) { bEOIFound=TRUE; return; }
-    }
-    else if (nCode<nTableSize) AddToTable(nOldCode,nCode);
-    else if (nCode==nTableSize) AddToTable(nOldCode,nOldCode);
-    else { bEOIFound=TRUE; return; }
-
-    nOldCode=nCode;
-
-    nOutBufDataLen=pTable[nCode].nDataCount;
-    pOutBufData=pOutBuf+nOutBufDataLen;
-    for (i=0; i<nOutBufDataLen; i++) {
-        *(--pOutBufData)=pTable[nCode].nData;
-        nCode=pTable[nCode].nPrevCode;
-    }
-}
-
-
-
diff --git a/goodies/source/filter.vcl/itiff/lzwdecom.hxx b/goodies/source/filter.vcl/itiff/lzwdecom.hxx
deleted file mode 100644
index 0c5c6e6e7d63..000000000000
--- a/goodies/source/filter.vcl/itiff/lzwdecom.hxx
+++ /dev/null
@@ -1,82 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: lzwdecom.hxx,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.
- *
- ************************************************************************/
-
-#ifndef _LZWDECOM_HXX
-#define _LZWDECOM_HXX
-
-#include <tools/stream.hxx>
-
-struct LZWTableEntry {
-    USHORT nPrevCode;
-    USHORT nDataCount;
-    BYTE nData;
-};
-
-class LZWDecompressor {
-
-public:
-
-    LZWDecompressor();
-    ~LZWDecompressor();
-
-    void StartDecompression(SvStream & rIStream);
-
-    ULONG Decompress(BYTE * pTarget, ULONG nMaxCount);
-        // Liefert die Anzahl der geschriebenen Bytes, wenn < nMaxCount,
-        // sind keine weiteren Daten zu entpacken, oder es ist ein
-        // Fehler aufgetreten.
-
-private:
-
-    USHORT GetNextCode();
-    void AddToTable(USHORT nPrevCode, USHORT nCodeFirstData);
-    void DecompressSome();
-
-    SvStream * pIStream;
-
-    LZWTableEntry * pTable;
-    USHORT nTableSize;
-
-    BOOL bEOIFound, bInvert, bFirst;
-
-    USHORT nOldCode;
-
-    BYTE * pOutBuf;
-    BYTE * pOutBufData;
-    USHORT nOutBufDataLen;
-
-    BYTE nInputBitsBuf;
-    USHORT nInputBitsBufSize;
-};
-
-
-#endif
-
-
diff --git a/goodies/source/filter.vcl/itiff/makefile.mk b/goodies/source/filter.vcl/itiff/makefile.mk
deleted file mode 100644
index 78405a563659..000000000000
--- a/goodies/source/filter.vcl/itiff/makefile.mk
+++ /dev/null
@@ -1,75 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.13 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..
-
-PRJNAME=goodies
-TARGET=itiff
-DEPTARGET=vitiff
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ----------------------------------------------------------
-
-.IF "$(editdebug)"!="" || "$(EDITDEBUG)"!=""
-CDEFS+= -DEDITDEBUG
-.ENDIF
-.IF "$(L10N_framework)"==""
-SLOFILES =  $(SLO)$/itiff.obj    \
-            $(SLO)$/lzwdecom.obj \
-            $(SLO)$/ccidecom.obj
-
-EXCEPTIONSNOOPTFILES=	$(SLO)$/itiff.obj
-
-# ==========================================================================
-
-SHL1TARGET=     iti$(DLLPOSTFIX)
-SHL1IMPLIB=     itiff
-SHL1STDLIBS=    $(VCLLIB) $(TOOLSLIB) $(SALLIB)
-SHL1LIBS=       $(SLB)$/itiff.lib # $(LB)$/rtftoken.lib
-
-.IF "$(GUI)" != "UNX"
-.IF "$(COM)" != "GCC"
-SHL1OBJS=       $(SLO)$/itiff.obj
-.ENDIF
-.ENDIF
-
-SHL1VERSIONMAP=exports.map
-SHL1DEF=        $(MISC)$/$(SHL1TARGET).def
-
-DEF1NAME=$(SHL1TARGET)
-.ENDIF
-
-# ==========================================================================
-
-.INCLUDE :  target.mk
diff --git a/goodies/source/graphic/makefile.mk b/goodies/source/graphic/makefile.mk
deleted file mode 100644
index 63b1e641f675..000000000000
--- a/goodies/source/graphic/makefile.mk
+++ /dev/null
@@ -1,61 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=goodies
-TARGET=graphic
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(GUI)"=="WIN"
-LINKFLAGS=$(LINKFLAGS) /PACKC:32768
-.ENDIF
-
-# --- Files --------------------------------------------------------
-
-CXXFILES=							\
-            grfattr.cxx				\
-            grfmgr.cxx				\
-            grfmgr2.cxx				\
-            grfcache.cxx			
-
-SLOFILES=							\
-            $(SLO)$/grfattr.obj		\
-            $(SLO)$/grfmgr.obj		\
-            $(SLO)$/grfmgr2.obj		\
-            $(SLO)$/grfcache.obj	
-
-# --- Target -------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/goodies/source/inv/expl.cxx b/goodies/source/inv/expl.cxx
deleted file mode 100644
index 1cb94c07ddaf..000000000000
--- a/goodies/source/inv/expl.cxx
+++ /dev/null
@@ -1,140 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: expl.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#include "expl.hxx"
-#include "shapes.hxx"
-#include "invader.hrc"
-#include <vcl/outdev.hxx>
-
-Explosion::Explosion(ResMgr* pRes) :
-            ExplListe(0,1),
-            pExpl1(0L),
-            pExpl2(0L),
-            pExpl3(0L)
-{
-    pExpl1 = ImplLoadImage( EXPLOS1, pRes );
-    pExpl2 = ImplLoadImage( EXPLOS2, pRes );
-    pExpl3 = ImplLoadImage( EXPLOS3, pRes );
-}
-
-Explosion::~Explosion()
-{
-    delete pExpl1;
-    delete pExpl2;
-    delete pExpl3;
-}
-
-void Explosion::Paint(OutputDevice& rDev)
-{
-    unsigned long i;
-    for( i = 0; i < Count(); i++ )
-    {
-        switch(GetMode(i))
-        {
-            case EXPL1:
-                rDev.DrawImage(GetPoint(i),*pExpl1);
-                SetMode(i,EXPL2);
-                break;
-            case EXPL2:
-                rDev.DrawImage(GetPoint(i),*pExpl2);
-                SetMode(i,EXPL3);
-                break;
-            case EXPL3:
-                rDev.DrawImage(GetPoint(i),*pExpl3);
-                SetMode(i,EXPL4);
-                break;
-            case EXPL4:
-                rDev.DrawImage(GetPoint(i),*pExpl2);
-                SetMode(i,EXPL5);
-                break;
-            case EXPL5:
-                rDev.DrawImage(GetPoint(i),*pExpl3);
-                SetMode(i,EXPL6);
-                break;
-            case EXPL6:
-                rDev.DrawImage(GetPoint(i),*pExpl2);
-                SetMode(i,EXPL7);
-                break;
-            case EXPL7:
-                rDev.DrawImage(GetPoint(i),*pExpl1);
-                SetMode(i,EXPLNONE);
-                break;
-            case EXPLNONE:
-                SetMode(i,EXPLDEL);
-                break;
-            case EXPL8:
-                break;
-            case EXPLDEL:
-                break;
-        }
-    }
-
-//  RemoveExpl();
-}
-
-BOOL Explosion::RemoveExpl()
-{
-    Expl_Impl* pWork;
-
-    for(long i=Count()-1; i >= 0; i--)
-    {
-        if(GetMode(i) == EXPLDEL)
-        {
-            pWork = GetObject(i);
-            Remove(pWork);
-            delete pWork;
-        }
-    }
-
-    if(Count())
-        return FALSE;
-    else
-        return TRUE;
-}
-
-void Explosion::ClearAll()
-{
-    unsigned long i;
-    for( i = 0;  i < Count(); i++ )
-        delete GetObject(i);
-
-    Clear();
-}
-
-void Explosion::InsertExpl(Point& rPoint)
-{
-    Expl_Impl* pWork = new Expl_Impl();
-
-    pWork->aPos     = rPoint;
-    pWork->eMode    = EXPL1;
-    Insert(pWork);
-}
diff --git a/goodies/source/inv/expl.hxx b/goodies/source/inv/expl.hxx
deleted file mode 100644
index c8da24f76de0..000000000000
--- a/goodies/source/inv/expl.hxx
+++ /dev/null
@@ -1,71 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: expl.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 _EXPL_HXX
-#define _EXPL_HXX
-
-
-#include <vcl/image.hxx>
-#include <vcl/outdev.hxx>
-#include <tools/list.hxx>
-#include <tools/gen.hxx>
-
-enum ExplMode { EXPL1, EXPL2, EXPL3, EXPL4, EXPL5, EXPL6, EXPL7, EXPL8,
-                EXPLNONE, EXPLDEL };
-
-struct Expl_Impl
-{
-    Point           aPos;
-    ExplMode        eMode;
-};
-
-DECLARE_LIST(ExplListe, Expl_Impl*)
-
-class Explosion : public ExplListe
-{
-    private:
-        Image*      pExpl1;
-        Image*      pExpl2;
-        Image*      pExpl3;
-
-    public:
-                    Explosion(ResMgr* pRes);
-                    ~Explosion();
-
-        void        Paint(OutputDevice& rDev);
-        ExplMode    GetMode(long nWert) { return GetObject(nWert)->eMode; }
-        Point&      GetPoint(long nWert) { return GetObject(nWert)->aPos; }
-        void        SetMode(long nWert, enum ExplMode nMode)
-                        { GetObject(nWert)->eMode = nMode; }
-        BOOL        RemoveExpl();
-        void        ClearAll();
-        void        InsertExpl(Point& rPoint);
-};
-
-#endif
diff --git a/goodies/source/inv/gegner.src b/goodies/source/inv/gegner.src
deleted file mode 100644
index 528a9e1fd80b..000000000000
--- a/goodies/source/inv/gegner.src
+++ /dev/null
@@ -1,163 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: gegner.src,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.
- *
- ************************************************************************/
-#include "invader.hrc"
-
-Bitmap MONSTER1 {
-        File = "monster1.bmp";
-};
-
-Bitmap MONSTER2 {
-        File = "monster2.bmp";
-};
-
-Bitmap MONSTER3 {
-        File = "monster3.bmp";
-};
-
-Bitmap MONSTER4 {
-        File = "monster4.bmp";
-};
-
-Bitmap MONSTER1B {
-        File = "monstb1.bmp";
-};
-
-Bitmap MONSTER2B {
-        File = "monstb2.bmp";
-};
-
-Bitmap MONSTER3B {
-        File = "monstb3.bmp";
-};
-
-Bitmap MONSTER4B {
-        File = "monstb4.bmp";
-};
-
-Bitmap MONSTER5 {
-        File = "uvisibl1.bmp";
-};
-
-Bitmap MONSTER5A {
-        File = "uvisibl2.bmp";
-};
-
-Bitmap MONSTER5B {
-        File = "uvisibl3.bmp";
-};
-
-Bitmap FIGHTER1 {
-        File = "fighter1.bmp";
-};
-
-Bitmap FIGHTERR {
-        File = "fighterr.bmp";
-};
-
-Bitmap FIGHTERL {
-        File = "fighterl.bmp";
-};
-
-Bitmap MUNITION1 {
-        File = "monitio1.bmp";
-};
-
-Bitmap MUNITION2 {
-        File = "monitio2.bmp";
-};
-
-Bitmap EXPLOS1 {
-        File = "explos1.bmp";
-};
-
-Bitmap EXPLOS2 {
-        File = "explos2.bmp";
-};
-
-Bitmap EXPLOS3 {
-        File = "explos3.bmp";
-};
-
-Bitmap BOMBE {
-        File = "bombe.bmp";
-};
-
-Bitmap WALL1 {
-        File = "wall1.bmp";
-};
-
-Bitmap WALL2 {
-        File = "wall2.bmp";
-};
-
-Bitmap WALL3 {
-        File = "wall3.bmp";
-};
-
-Bitmap WALL4 {
-        File = "wall4.bmp";
-};
-
-Bitmap WALL5 {
-        File = "wall5.bmp";
-};
-
-Bitmap WALL6 {
-        File = "wall6.bmp";
-};
-
-Bitmap WALL7 {
-        File = "wall7.bmp";
-};
-
-Bitmap WALL8 {
-        File = "wall8.bmp";
-};
-
-Bitmap WALL9 {
-        File = "wall9.bmp";
-};
-
-Bitmap WALL10 {
-        File = "wall10.bmp";
-};
-
-Bitmap HEROS {
-        File = "helden.bmp";
-};
-
-Bitmap STARWARS {
-        File = "swars.bmp";
-};
-
-Bitmap WELCOME2 {
-        File = "wlcome2.bmp";
-};
-
diff --git a/goodies/source/inv/invader.cxx b/goodies/source/inv/invader.cxx
deleted file mode 100644
index 0aed6e76848f..000000000000
--- a/goodies/source/inv/invader.cxx
+++ /dev/null
@@ -1,624 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: invader.cxx,v $
- * $Revision: 1.12 $
- *
- * 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_goodies.hxx"
-#include "invader.hxx"
-#include "monst.hxx"
-#include "shapes.hxx"
-#include "expl.hxx"
-#include "invader.hrc"
-#include "strings.hrc"
-#include "score.hxx"
-#include <svl/solar.hrc>
-#include <cppuhelper/servicefactory.hxx>
-#include <comphelper/processfactory.hxx>
-#include <vcl/msgbox.hxx>
-#include <vcl/virdev.hxx>
-
-MyWindow::MyWindow(Window* pParent, ResMgr *pResMgr ) :
-            FloatingWindow(pParent, WB_3DLOOK | WB_CLOSEABLE | WB_MOVEABLE ),
-            pRes(pResMgr),
-            ProgStatus(FALSE),
-            bEndLevel(TRUE),
-            bFightDest(FALSE),
-            bTimeHigh(TRUE),
-            bPause(FALSE),
-            bAuseModus(FALSE),
-            bWaitDlg(FALSE),
-            StartPhase(1),
-            nLevel(1),
-            nScore(0L),
-            nHighScore(0L),
-            nFighter(3),
-            nTimeOut(TIMEHIGH),
-            nAuseCount(0),
-            pBitWelcome2(0L),
-            pBitHeros(0L),
-            pBitStarWars(0L),
-            pGegner(0L),
-            pFighter(0L),
-            pMunition(0L),
-            pExplosion(0L),
-            pBombe(0L),
-            pWall(0L),
-            pScoreWindow(0L),
-            pVirtualDevice(0L),
-            pPauseWindow(0L),
-            pBox(0L),
-            nDirection(0L),
-            bMouseMooving(FALSE)
-{
-    pBitWelcome2 = ImplLoadImage( WELCOME2, GetResMgr() );
-    pBitHeros = ImplLoadImage( HEROS, GetResMgr() );
-    pBitStarWars = ImplLoadImage( STARWARS, GetResMgr() );
-    pBombe = new Bombe(GetResMgr());
-    pMunition = new Munition(GetResMgr());
-    pExplosion = new Explosion(GetResMgr());
-    pWall = new Wall(GetResMgr());
-    pScoreWindow = new ScoreWindow(this,WB_BORDER, GetResMgr());
-    pPauseWindow = new Window(this, 0);
-
-    SetOutputSizePixel(Size(WINWIDTH,WINHEIGHT));
-    SetText(String(ResId(STR_APP_TITLE,*GetResMgr())));
-
-    pPauseWindow->SetPosSizePixel(Point(100,190),Size(500,50));
-    pPauseWindow->SetBackground();
-
-    pScoreWindow->SetPosSizePixel(Point(0,0),Size(WINWIDTH,22));
-    Size aSize(WINWIDTH,WINHEIGHT);
-    pFighter = new Fighter(aSize, GetResMgr());
-    pGegner  = new Gegner(pFighter, pBombe, GetResMgr());
-
-    pVirtualDevice = new VirtualDevice(*this);
-    pVirtualDevice->SetOutputSizePixel(Size( WINWIDTH, WINHEIGHT ));
-
-    SetBackground();
-
-    aPaintTimer = Timer();
-    aPaintTimer.SetTimeoutHdl(LINK(this, MyWindow, PaintTimer));
-    aPaintTimer.SetTimeout(nTimeOut);
-    aPaintTimer.Stop();
-
-    aWaitDlgTimer = Timer();
-    aWaitDlgTimer.SetTimeoutHdl(LINK(this, MyWindow, StartDlgTimer));
-    aWaitDlgTimer.SetTimeout(10);
-    aWaitDlgTimer.Stop();
-
-    aPointer = GetPointer();
-
-    Show();
-
-}
-
-MyWindow::~MyWindow()
-{
-    aPaintTimer.Stop();
-    delete pVirtualDevice;
-    delete pGegner;
-    delete pFighter;
-    delete pMunition;
-    delete pExplosion;
-    delete pBombe;
-    delete pWall;
-    delete pBitHeros;
-    delete pBitStarWars;
-    delete pBitWelcome2;
-    delete pScoreWindow;
-    delete pPauseWindow;
-}
-
-void MyWindow::Paint(const Rectangle&)
-{
-    if(bWaitDlg)
-        return;
-
-    Size aVSize = pVirtualDevice->GetOutputSizePixel();
-
-    if (!ProgStatus)
-    {
-        if (StartPhase < 3)
-        {
-            pScoreWindow->Hide();
-            bMouseMooving = FALSE;
-
-            if( StartPhase == 1 )
-            {
-                const Font aOldFont( GetFont() );
-                Font aFont( aOldFont );
-
-                SetFillColor( COL_BLACK );
-                DrawRect(Rectangle(Point(0,0),Point(640,480)));
-
-                DrawImage(Point(55,78), *pBitStarWars);
-                DrawImage(Point(53,207), *pBitHeros);
-                DrawImage(Point(470,400), *(pFighter->pFight1));
-                DrawImage(Point(460,290), *(pMunition->pMunition1));
-                DrawImage(Point(480,320), *(pMunition->pMunition1));
-                DrawImage(Point(470,250), *(pMunition->pMunition1));
-
-                aFont.SetColor(COL_WHITE);
-                aFont.SetFillColor(COL_BLACK);
-                SetFont( aFont );
-
-                DrawText(Point(175,170),String(ResId(STR_CHOOSEHERO, *GetResMgr())));
-                DrawText(Point(98,208),String(ResId(STR_NAME1, *GetResMgr())));
-                DrawText(Point(98,252),String(ResId(STR_NAME2, *GetResMgr())));
-                DrawText(Point(98,296),String(ResId(STR_NAME3, *GetResMgr())));
-                DrawText(Point(98,340),String(ResId(STR_NAME4, *GetResMgr())));
-                DrawText(Point(98,384),String(ResId(STR_NAME5, *GetResMgr())));
-
-                SetFont( aOldFont );
-            }
-            else if(StartPhase == 2)
-            {
-                SetFillColor( COL_WHITE );
-                DrawRect(Rectangle(Point(0,0),Point(640,480)));
-                DrawImage(Point(19,147), *pBitWelcome2 );
-            }
-        }
-    }
-    else if(!bPause)
-    {
-        aPaintTimer.Start();
-
-        Point aPoint(0,20);
-
-        pVirtualDevice->SetFillColor( COL_WHITE );
-        pVirtualDevice->SetLineColor();
-        pVirtualDevice->DrawRect(Rectangle(Point(0,0), Point(aVSize.Width(),aVSize.Height())));
-
-        if(!bStartLevel)
-        {
-            if ((bMouseMooving)&&(nDirection > pFighter->GetPoint().X()+32))
-            {
-                pFighter->Move(1);
-                pFighter->Move(1);
-                pGegner->SetAuseMode(FALSE);
-                nAuseCount = 0;
-            }
-            else if ((bMouseMooving)&&(nDirection < pFighter->GetPoint().X()))
-            {
-                pFighter->Move(-1);
-                pFighter->Move(-1);
-                pGegner->SetAuseMode(FALSE);
-                nAuseCount = 0;
-            }
-            nAuseCount++;
-            if(nAuseCount > AUSEMODE)
-                pGegner->SetAuseMode(TRUE);
-            pWall->Paint(*pVirtualDevice);
-            pGegner->DrawGegner(pVirtualDevice,&aPoint);
-            pFighter->Paint(*pVirtualDevice);
-            pMunition->Paint(*pVirtualDevice);
-            pBombe->Paint(*pVirtualDevice);
-            pExplosion->Paint(*pVirtualDevice);
-        }
-        else
-        {
-            bMouseMooving = FALSE;
-            Font aOldFont = pVirtualDevice->GetFont();
-            Font aFont = aOldFont;
-            switch(nStartLevel)
-            {
-                case 0:
-                    aFont.SetColor(COL_RED);
-                    break;
-                case 1:
-                    aFont.SetColor(COL_YELLOW);
-                    break;
-                case 2:
-                    aFont.SetColor(COL_GREEN);
-                    break;
-            }
-            pVirtualDevice->SetFont(*&aFont);
-            String aString = String(ResId(STR_LEVELSTART, *GetResMgr()));
-            aString += ' ';
-            aString += String::CreateFromInt32(nLevel);
-            if(nStartLevel < 3)
-                pVirtualDevice->DrawText(Point(LEVELTEXTX,LEVELTEXTY),aString);
-            nStartLevel++;
-            if(nStartLevel > 3)
-            {
-                bStartLevel = FALSE;
-                bEndLevel    = FALSE;
-                bFightDest    = FALSE;
-                aPaintTimer.SetTimeout(nTimeOut);
-            }
-            pVirtualDevice->SetFont(*&aOldFont);
-
-        }
-
-        DrawOutDev( Point( 0, 22), aVSize, Point( 0, 22), aVSize, *pVirtualDevice);
-
-        if(!bStartLevel)
-            Kollision();
-    }
-    else pPauseWindow->DrawText(Point(20,20),String(ResId(STR_PAUSE, *GetResMgr())));
-}
-
-void MyWindow::KeyInput( const KeyEvent& rKEvent)
-{
-    if(bEndLevel || bFightDest)
-    {
-        rKEvent.GetKeyCode().GetCode();
-            FloatingWindow::KeyInput(rKEvent);
-
-        return;
-    }
-
-    bMouseMooving = FALSE;
-    switch(rKEvent.GetKeyCode().GetCode())
-    {
-        case KEY_LEFT:
-            pFighter->Move(-1);
-            nAuseCount = 0;
-                pGegner->SetAuseMode(FALSE);
-            break;
-        case KEY_RIGHT:
-            pFighter->Move(1);
-            nAuseCount = 0;
-                pGegner->SetAuseMode(FALSE);
-            break;
-        case KEY_SPACE:
-            pMunition->Start(pFighter->GetPoint());
-            break;
-        case KEY_L:
-            if(nLevel > 1)
-                return;
-            if(bTimeHigh)
-            {
-                bTimeHigh     = FALSE;
-                nTimeOut    = TIMELOW;
-            }
-            else
-            {
-                bTimeHigh     = TRUE;
-                nTimeOut    = TIMEHIGH;
-            }
-            aPaintTimer.SetTimeout(nTimeOut);
-            break;
-        case KEY_ADD:
-            if(nLevel > 1)
-                return;
-            nTimeOut++;
-            aPaintTimer.SetTimeout(nTimeOut);
-            break;
-        case KEY_SUBTRACT:
-            if(nLevel > 1)
-                return;
-            nTimeOut--;
-            if(nTimeOut <= 0)
-                nTimeOut = 1;
-            aPaintTimer.SetTimeout(nTimeOut);
-            aPaintTimer.Start();
-            break;
-        case KEY_P:
-            if(!ProgStatus)
-                return;
-            if(bPause)
-            {
-                aPaintTimer.Start();
-                bPause = FALSE;
-                SetBackground();
-                pPauseWindow->Hide();
-            }
-            else
-            {
-                aPaintTimer.Stop();
-                bPause = TRUE;
-                SetBackground( Wallpaper( COL_WHITE ) );
-                pPauseWindow->Show();
-                pPauseWindow->DrawText(Point(20,20),String(ResId(STR_PAUSE, *GetResMgr())));
-            }
-            break;
-        default:
-            FloatingWindow::KeyInput(rKEvent);
-    }
-}
-
-IMPL_LINK( MyWindow, PaintTimer, Timer*, EMPTYARG)
-{
-
-    Invalidate();
-
-    return 0;
-}
-
-IMPL_LINK( MyWindow, StartDlgTimer, Timer*, EMPTYARG )
-{
-    bWaitDlg = TRUE;
-
-    aWaitDlgTimer.Stop();
-
-    String  aString;
-    if(!bFightDest)
-    {
-        aString = String(ResId(STR_GRAT1,*GetResMgr()));
-        aString += String::CreateFromInt32(nLevel);
-        aString += String(ResId(STR_GRAT2,*GetResMgr()));
-
-        pBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,*GetResMgr())),aString);
-        PlaceDialog(pBox);
-        ProgStatus=FALSE;
-        SetBackground(Wallpaper( Color( COL_WHITE ) ) );
-
-        pBox->Execute();
-
-        SetBackground();
-        ProgStatus=TRUE;
-        delete pBox;
-        nLevel++;
-        GrabFocus();
-    }
-    else
-    {
-        nFighter--;
-        pScoreWindow->SetLives(nFighter);
-        if(nFighter > 0)
-        {
-            aString = String(ResId(STR_FIGHTDEST1,*GetResMgr()));
-            aString += String::CreateFromInt32(nFighter);
-            aString += String(ResId(STR_FIGHTDEST2,*GetResMgr()));
-        }
-        else
-        {
-            aString = String(ResId(STR_GAMEOVER,*GetResMgr()));
-            ProgStatus = FALSE;
-            nLevel     = 1;
-            nFighter   = 3;
-            pGegner->SetRandWert(200);
-            pGegner->SetDown(10);
-
-            if(bTimeHigh)
-                nTimeOut = TIMEHIGH;
-            else
-                nTimeOut = TIMELOW;
-        }
-
-        pBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,*GetResMgr())),aString);
-        PlaceDialog(pBox);
-        BOOL aDummyStatus = ProgStatus;
-        ProgStatus=FALSE;
-        SetBackground(Wallpaper( Color( COL_WHITE ) ) );
-
-        pBox->Execute();
-
-        SetBackground();
-        ProgStatus=aDummyStatus;
-        delete pBox;
-        GrabFocus();
-
-        if(!ProgStatus)
-        {
-            StartPhase = 1;
-            if (nScore > nHighScore)
-            {
-                String  aHSString;
-                aHSString = String(ResId(STR_HIGHSCORE1,*GetResMgr()));
-                aHSString += String::CreateFromInt32(nScore);
-                aHSString += String(ResId(STR_HIGHSCORE2,*GetResMgr()));
-                aHSString += String::CreateFromInt32(nHighScore);
-                aHSString += String(ResId(STR_HIGHSCORE3,*GetResMgr()));
-                nHighScore = nScore;
-                pBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,*GetResMgr())),aHSString);
-                PlaceDialog(pBox);
-                Paint(Rectangle(Point(0,0),Point(640,480)));
-                SetBackground(Wallpaper( Color( COL_WHITE ) ) );
-                pBox->Execute();
-                SetBackground();
-                delete pBox;
-                GrabFocus();
-            }
-            nScore     = 0;
-        }
-
-    }
-
-    InitLevel();
-    Invalidate();
-
-    bWaitDlg = FALSE;
-
-    return 0;
-}
-
-void MyWindow::MouseButtonDown(const MouseEvent& rMEvt)
-{
-    MessBox* pMessBox = 0L;
-
-    if (!ProgStatus)
-    {
-        TheHero = 0;
-
-        if (StartPhase == 1)
-        {
-            if ((rMEvt.GetPosPixel().X() >= 57) && (rMEvt.GetPosPixel().X() <=90))
-            {
-                if ((rMEvt.GetPosPixel().Y() >= 211) && (rMEvt.GetPosPixel().Y() <= 244))
-                    TheHero = STR_NAME1;
-                else if ((rMEvt.GetPosPixel().Y() >= 255) && (rMEvt.GetPosPixel().Y() <= 288))
-                    TheHero = STR_NAME2;
-                else if ((rMEvt.GetPosPixel().Y() >= 299) && (rMEvt.GetPosPixel().Y() <= 332))
-                    TheHero = STR_NAME3;
-                else if ((rMEvt.GetPosPixel().Y() >= 343) && (rMEvt.GetPosPixel().Y() <= 376))
-                    TheHero = STR_NAME4;
-                else if ((rMEvt.GetPosPixel().Y() >= 387) && (rMEvt.GetPosPixel().Y() <= 420))
-                    TheHero = STR_NAME5;
-            }
-            if (TheHero)
-            {
-                SetPointer(aPointer);
-                switch (TheHero)
-                {
-                    case STR_NAME1:
-                        {
-                            pMessBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,*GetResMgr())),String(ResId(STR_HERO1, *GetResMgr())));
-                        }
-                        break;
-                    case STR_NAME2:
-                        {
-                            pMessBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,*GetResMgr())), String(ResId(STR_HERO2, *GetResMgr())));
-                        }
-                        break;
-                    case STR_NAME3:
-                        {
-                            pMessBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,*GetResMgr())), String(ResId(STR_HERO3, *GetResMgr())));
-                        }
-                        break;
-                    case STR_NAME4:
-                        {
-                            pMessBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,*GetResMgr())), String(ResId(STR_HERO4, *GetResMgr())));
-                        }
-                        break;
-                    case STR_NAME5:
-                        {
-                            pMessBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,*GetResMgr())), String(ResId(STR_HERO5, *GetResMgr())));
-                        }
-                        break;
-                }
-                PlaceDialog(pMessBox);
-                pMessBox->Execute();
-                delete pMessBox;
-                StartPhase++;
-                pScoreWindow->SetHero(TheHero);
-                Invalidate();
-            }
-        }
-        else if (StartPhase == 2)
-        {
-            ProgStatus = TRUE;
-            StartPhase++;
-            pScoreWindow->ShowMe();
-            InitLevel();
-            Invalidate();
-            aPaintTimer.Start();
-        }
-    }
-    else
-    {
-        if((!bStartLevel) && (!bPause))
-            pMunition->Start(pFighter->GetPoint());
-    }
-}
-
-void MyWindow::MouseMove(const MouseEvent& rMEvt)
-{
-    long Hero;
-
-    if ((!ProgStatus) && ( StartPhase == 1 ))
-    {
-        Hero = 0;
-        if ((rMEvt.GetPosPixel().X() >= 57) && (rMEvt.GetPosPixel().X() <=90))
-        {
-            if ((rMEvt.GetPosPixel().Y() >= 211) && (rMEvt.GetPosPixel().Y() <= 244))
-                Hero = 1;
-            else if ((rMEvt.GetPosPixel().Y() >= 255) && (rMEvt.GetPosPixel().Y() <= 288))
-                Hero = 2;
-            else if ((rMEvt.GetPosPixel().Y() >= 299) && (rMEvt.GetPosPixel().Y() <= 332))
-                Hero = 3;
-            else if ((rMEvt.GetPosPixel().Y() >= 343) && (rMEvt.GetPosPixel().Y() <= 376))
-                Hero = 4;
-            else if ((rMEvt.GetPosPixel().Y() >= 387) && (rMEvt.GetPosPixel().Y() <= 420))
-                Hero = 5;
-        }
-        if ((Hero) && (GetPointer() != POINTER_REFHAND)) SetPointer(POINTER_REFHAND);
-        else if ((!Hero) && (GetPointer() != aPointer)) SetPointer(aPointer);
-    }
-    else if ( ProgStatus )
-    {
-        nDirection = rMEvt.GetPosPixel().X();
-        bMouseMooving = TRUE;
-    }
-}
-
-BOOL MyWindow::Close()
-{
-    Hide();
-#ifdef TEST
-    pApplication->Quit();
-#else
-    delete this;
-#endif
-
-    return TRUE;
-}
-
-void MyWindow::PlaceDialog(MessBox* pMessBox)
-{
-    if(pMessBox)
-    {
-        Point aPos = GetPosPixel();
-        Size aSize = GetSizePixel();
-        Size aBoxSize = pMessBox->GetOutputSizePixel();
-        aSize = Size(aSize.Width()/2 - aBoxSize.Width()/2,
-                        aSize.Height()/2 - aBoxSize.Height()/2);
-        pMessBox->SetPosPixel(
-                Point(aPos.X()+aSize.Width(),aPos.Y()+aSize.Height()));
-    }
-}
-
-#ifdef TEST
-void MyApp::Main()
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-         xMSF = cppu::createRegistryServiceFactory(
-             rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "applicat.rdb" ) ), sal_True );
-
-    ::comphelper::setProcessServiceFactory( xMSF );
-
-    ByteString aRes = "tfu";
-    ResMgr *pMyResMgr = ResMgr::CreateResMgr(aRes.GetBuffer());
-
-    MyWindow aWindow( NULL, pMyResMgr);
-
-#ifdef TEST
-    aWindow.setApplication(this);
-#endif
-
-    Execute();
-
-    delete pMyResMgr;
-}
-
-MyApp aMyApp;
-#else
-
-#ifdef WNT
-extern "C" void __cdecl StartInvader(Window* pParent , ResMgr* pRes)
-#else
-extern "C" void StartInvader(Window* pParent, ResMgr* pRes )
-#endif
-{
-    MyWindow *pInvaderWin = new MyWindow(pParent, pRes);
-    pInvaderWin->Show();
-}
-#endif
-
diff --git a/goodies/source/inv/invader.hrc b/goodies/source/inv/invader.hrc
deleted file mode 100644
index 689c3198cba1..000000000000
--- a/goodies/source/inv/invader.hrc
+++ /dev/null
@@ -1,63 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: invader.hrc,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.
- *
- ************************************************************************/
-#define MONSTER1        17000
-#define MONSTER2        17001
-#define MONSTER3        17002
-#define MONSTER4        17003
-#define FIGHTERR        17004
-#define FIGHTERL        17005
-#define FIGHTER1        17006
-#define MUNITION1       17007
-#define MUNITION2       17008
-#define MONSTER1B       17009
-#define MONSTER2B       17010
-#define MONSTER3B       17011
-#define MONSTER4B       17012
-#define EXPLOS1         17013
-#define EXPLOS2         17014
-#define EXPLOS3         17015
-#define BOMBE           17016
-#define WALL1           17017
-#define WALL2           17018
-#define WALL3           17019
-#define WALL4           17020
-#define WALL5           17021
-#define WALL6           17022
-#define WALL7           17023
-#define WALL8           17024
-#define WALL9           17025
-#define WALL10          17026
-#define WELCOME         17027
-#define WELCOME2        17028
-#define MONSTER5        17029
-#define MONSTER5A       17030
-#define MONSTER5B       17031
-#define HEROS           17032
-#define STARWARS        17033
diff --git a/goodies/source/inv/invader.hxx b/goodies/source/inv/invader.hxx
deleted file mode 100644
index 374d81002970..000000000000
--- a/goodies/source/inv/invader.hxx
+++ /dev/null
@@ -1,135 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: invader.hxx,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.
- *
- ************************************************************************/
-#ifndef _INVADER_HXX
-#define _INVADER_HXX
-
-#define WINWIDTH 640
-#define WINHEIGHT 480
-#define LEVELTEXTX 280
-#define LEVELTEXTY 200
-
-#define TIMEHIGH    100
-#define TIMELOW     30
-#define AUSEMODE    50
-
-#include <vcl/timer.hxx>
-#include <vcl/floatwin.hxx>
-#include <tools/resmgr.hxx>
-#include <vcl/image.hxx>
-#include <vcl/svapp.hxx>
-
-
-class Gegner;
-class Fighter;
-class Munition;
-class Explosion;
-class Bombe;
-class Wall;
-class ScoreWindow;
-class MessBox;
-
-class MyApp : public Application
-{
-    public:
-        virtual void        Main();
-};
-
-class MyWindow : public FloatingWindow
-{
-    private:
-        ResMgr*         pRes;
-        BOOL            ProgStatus;
-        BOOL            bStartLevel;
-        BOOL            bEndLevel;
-        BOOL            bFightDest;
-        BOOL            bTimeHigh;
-        BOOL            bPause;
-        BOOL            bAuseModus;
-        BOOL            bGetFighter;
-        BOOL            bWaitDlg;
-
-        long            nStartLevel;
-        long            StartPhase;
-        Pointer         aPointer;
-        long            nLevel;
-        long            nScore;
-        long            nHighScore;
-        long            TheHero;
-        long            nFighter;
-        long            nTimeOut;
-        long            nAuseCount;
-
-        Image*          pBitWelcome2;
-        Image*          pBitHeros;
-        Image*          pBitStarWars;
-        Gegner*         pGegner;
-        Fighter*        pFighter;
-        Munition*       pMunition;
-        Explosion*      pExplosion;
-        Bombe*          pBombe;
-        Wall*           pWall;
-        Timer           aPaintTimer;
-        Timer           aWaitDlgTimer;
-        ScoreWindow*    pScoreWindow;
-        VirtualDevice*  pVirtualDevice;
-        Window*         pPauseWindow;
-        MessBox*        pBox;
-
-        void            Init();
-        DECL_LINK( PaintTimer, Timer*);
-        DECL_LINK( StartDlgTimer, Timer* );
-
-        void            InitLevel();
-        void            RandomLevel();
-
-        long            nDirection;
-        BOOL            bMouseMooving;
-        void            PlaceDialog(MessBox* pBox);
-
-    public:
-                        MyWindow(Window* pParent, ResMgr* pRes);
-                        ~MyWindow();
-
-        virtual void    Paint(const Rectangle& rRect);
-        virtual void    KeyInput( const KeyEvent& rKEvent);
-        virtual void    MouseButtonDown(const MouseEvent& rMEvt);
-//          virtual void    MouseButtonUp(const MouseEvent& rMEvt);
-        virtual void    MouseMove(const MouseEvent& rMEvt);
-        virtual BOOL    Close();
-
-                void    EndLevel();
-                void    Kollision();
-        ResMgr*         GetResMgr(){return pRes;}
-
-        void    setApplication(MyApp *rApplication) { pApplication = rApplication; };
-        MyApp *pApplication;
-};
-
-#endif
diff --git a/goodies/source/inv/invader1.cxx b/goodies/source/inv/invader1.cxx
deleted file mode 100644
index 7c1b159fe0b0..000000000000
--- a/goodies/source/inv/invader1.cxx
+++ /dev/null
@@ -1,447 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: invader1.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#include <stdlib.h>
-#include <vcl/msgbox.hxx>
-#include <tools/datetime.hxx>
-
-#include "invader.hxx"
-#include "monst.hxx"
-#include "shapes.hxx"
-#include "expl.hxx"
-#include "waves.hxx"
-#include "score.hxx"
-#include "strings.hrc"
-
-
-void MyWindow::Kollision()
-{
-    Rectangle aRect;
-    long nStart   = nScore;
-    long nRockets = pMunition->Count();
-
-    long nWert;
-
-    unsigned long i;
-    for(i=0; i<pBombe->Count(); i++)
-    {
-        //Kollision Bombe->Mauer pr�fen
-        aRect = pBombe->GetKoll(i);
-        if(pWall->Kollision(aRect,FALSE))
-            pBombe->SetDelete(i);
-        //Kollision Bombe->Fighter pr�fen
-        if(pFighter->Kollision(pBombe->GetKoll(i),pExplosion))
-        {
-            bFightDest = TRUE;
-            pBombe->SetDelete(i);
-        }
-    }
-
-    for(i=0; i<pMunition->Count(); i++)
-    {
-        //Kollision Muniton->Gegner pr�fen
-        aRect = pMunition->GetKoll(i);
-        nWert = pGegner->Kollision(aRect,pExplosion);
-        if(nWert != -1)
-        {
-            nScore += nWert;
-            pMunition->SetDelete(i);
-        }
-        //Kollision Muniton->Mauer pr�fen
-        aRect = pMunition->GetKoll(i);
-        if(pWall->Kollision(aRect,FALSE))
-            pMunition->SetDelete(i);
-
-        //Kollision Munition->Bombe pr�fen
-        aRect = pMunition->GetKoll(i);
-        if(pBombe->Kollision(aRect,pExplosion))
-            pMunition->SetDelete(i);
-    }
-
-    for(i=0; i<pGegner->Count();i++)
-    {
-
-        //Kollision Gegner->Mauer pr�fen
-        aRect = pGegner->GetKoll(i);
-        pWall->Kollision(aRect,TRUE);
-        //Kollision Gegner->Fighter pr�fen
-        aRect = pGegner->GetKoll(i);
-        if(pFighter->Kollision(aRect,pExplosion))
-        {
-            bFightDest = TRUE;
-            pGegner->ClearAll();
-            pBombe->ClearAll();
-        }
-
-    }
-
-    pBombe->RemoveBomben();
-    nWert = pMunition->RemoveMunition();
-    if( nWert != nRockets)
-        pScoreWindow->SetRockets(nWert);
-
-    if(nScore > nStart)
-        pScoreWindow->SetScore(nScore);
-
-    if(pGegner->RemoveGegner())
-    {
-        bEndLevel = TRUE;
-        pBombe->ClearAll();
-        pMunition->ClearAll();
-    }
-
-    if(bFightDest)
-    {
-        pBombe->ClearAll();
-        pMunition->ClearAll();
-        pGegner->ClearAll();
-    }
-
-    if(pExplosion->RemoveExpl() && (bEndLevel || bFightDest))
-    {
-        if(!bWaitDlg)
-            aWaitDlgTimer.Start();
-
-        /*String    aString;
-        if(!bFightDest)
-        {
-            aString = String(ResId(STR_GRAT1,GetResMgr()));
-            aString += String(nLevel);
-            aString += String(ResId(STR_GRAT2,GetResMgr()));
-
-            if(!pBox)
-            {
-                bWaitDlg = TRUE;
-                pBox = new MessBox(GetParent(),WinBits(WB_OK),String(ResId(STR_APP_TITLE,GetResMgr())),aString);
-                ProgStatus=FALSE;
-                SetBackground(Wallpaper( Color( COL_WHITE ) ) );
-
-                aWaitDlgTimer.Start();
-                return;
-            }
-
-            SetBackground();
-            ProgStatus=TRUE;
-            delete pBox;
-            pBox = 0L;
-            nLevel++;
-            GrabFocus();
-        }
-        else
-        {
-            nFighter--;
-            pScoreWindow->SetLives(nFighter);
-            if(nFighter > 0)
-            {
-                aString = String(ResId(STR_FIGHTDEST1,GetResMgr()));
-                aString += String(nFighter);
-                aString += String(ResId(STR_FIGHTDEST2,GetResMgr()));
-            }
-            else
-            {
-                aString = String(ResId(STR_GAMEOVER,GetResMgr()));
-            }
-
-            BOOL aDummyStatus;
-
-            if(!pBox)
-            {
-                pBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,GetResMgr())),aString);
-                aDummyStatus = ProgStatus;
-                //ProgStatus=FALSE;
-                SetBackground(Wallpaper( Color( COL_WHITE ) ) );
-
-                aWaitDlgTimer.Start();
-
-                return;
-            }
-
-            if(nFighter == 0)
-            {
-                ProgStatus = FALSE;
-                nLevel     = 1;
-                nFighter   = 3;
-                pGegner->SetRandWert(200);
-                pGegner->SetDown(10);
-
-                if(bTimeHigh)
-                    nTimeOut = TIMEHIGH;
-                else
-                    nTimeOut = TIMELOW;
-            }
-
-            SetBackground();
-            //ProgStatus=aDummyStatus;
-            delete pBox;
-            pBox = 0L;
-            GrabFocus();
-
-            if(!ProgStatus)
-            {
-                StartPhase = 1;
-                if (nScore > nHighScore)
-                    {
-                        String  aString;
-                        aString = String(ResId(STR_HIGHSCORE1,GetResMgr()));
-                        aString += String(nScore);
-                        aString += String(ResId(STR_HIGHSCORE2,GetResMgr()));
-                        aString += String(nHighScore);
-                        aString += String(ResId(STR_HIGHSCORE3,GetResMgr()));
-                        nHighScore = nScore;
-                        if(!pBox)
-                        {
-                            pBox = new MessBox(this,WinBits(WB_OK),String(ResId(STR_APP_TITLE,GetResMgr())),aString);
-                            Paint(Rectangle(Point(0,0),Point(640,480)));
-                            SetBackground(Wallpaper( Color( COL_WHITE ) ) );
-
-                            aWaitDlgTimer.Start();
-                        }
-
-                        SetBackground();
-                        delete pBox;
-                        pBox = 0L;
-                        GrabFocus();
-                    }
-                nScore     = 0;
-            }
-
-        }
-
-        InitLevel();*/
-    }
-}
-
-void MyWindow::InitLevel()
-{
-    bStartLevel = TRUE;
-    long nWert;
-
-    aPaintTimer.SetTimeout(1000);
-    nStartLevel = 0;
-    pFighter->Init();
-    pMunition->ClearAll();
-    pBombe->ClearAll();
-    pWall->ClearAll();
-    pGegner->ClearAll();
-    bAuseModus = FALSE;
-    nAuseCount = 0;
-    pGegner->SetAuseMode(FALSE);
-
-    pScoreWindow->SetRockets(5);
-    pScoreWindow->SetLives(nFighter);
-    pScoreWindow->SetScore(nScore);
-    pScoreWindow->SetLevel(nLevel);
-
-    if(nLevel > 1)
-    {
-        pGegner->SetRandWert(pGegner->GetRandWert()+10);
-        nTimeOut -= 2;
-        if(nTimeOut <= 0)
-            nTimeOut = 1;
-    }
-
-    if(nLevel == 10 || nLevel == 20 || nLevel == 30 || nLevel >= 40)
-    {
-        pGegner->SetDown(pGegner->GetDown()+2);
-        if(pGegner->GetDown() > 30)
-            pGegner->SetDown(30);
-    }
-
-    nWert = nLevel;
-    while( nWert > WAVES )
-        nWert -= WAVES;
-
-    if(!( nLevel % 10 ))
-    {
-        if(!bGetFighter)
-        {
-            nFighter++;
-            pScoreWindow->SetLives(nFighter);
-            bGetFighter = TRUE;
-        }
-    }
-    else
-        bGetFighter = FALSE;
-
-    long nGegner;
-    long nDummy;
-
-    if(nLevel < WAVES*2)
-    {
-        nGegner = waves[nWert-1][0];
-        nDummy = nGegner;
-        for(long i=0; i<nGegner; i++)
-            if ( nLevel > 10 ) pGegner->InsertGegner((USHORT)waves[nWert-1][i*3+1],
-                                (USHORT)waves[nWert-1][i*3+2],
-                                (USHORT)waves[nWert-1][i*3+3]);
-            else if ( waves[nWert-1][i*3+1] < 4 ) pGegner->InsertGegner((USHORT)waves[nWert-1][i*3+1],
-                                (USHORT)waves[nWert-1][i*3+2],
-                                (USHORT)waves[nWert-1][i*3+3]);
-            else nDummy--;
-
-
-    }
-    else
-    {
-        if(levelpuf[0] != nLevel)
-            RandomLevel();
-        else
-        {
-            for(long i=0; i<levelpuf[1]; i++)
-                pGegner->InsertGegner(levelpuf[i*3+2],levelpuf[i*3+3],levelpuf[i*3+4]);
-        }
-        nGegner = levelpuf[1];
-        nDummy  = nGegner;
-    }
-
-    BYTE nMauer;
-    Point aPoint;
-
-    if(nLevel < WAVES*2)
-        nMauer = (BYTE)waves[nWert-1][nGegner*3+1];
-    else
-        nMauer = 0xff;
-    if(nMauer & 0x01)
-    {
-        aPoint = Point(0,340);
-        pWall->InsertWall(aPoint);
-    }
-    if(nMauer & 0x02)
-    {
-        aPoint = Point(32,340);
-        pWall->InsertWall(aPoint);
-    }
-    if(nMauer & 0x04)
-    {
-        aPoint = Point(64,340);
-        pWall->InsertWall(aPoint);
-    }
-    if(nMauer & 0x08)
-    {
-        aPoint = Point(96,340);
-        pWall->InsertWall(aPoint);
-    }
-    if(nMauer & 0x10)
-    {
-        aPoint = Point(128,340);
-        pWall->InsertWall(aPoint);
-    }
-    if(nMauer & 0x20)
-    {
-        aPoint = Point(160,340);
-        pWall->InsertWall(aPoint);
-    }
-    if(nMauer & 0x40)
-    {
-        aPoint = Point(192,340);
-        pWall->InsertWall(aPoint);
-    }
-    if(nMauer & 0x80)
-    {
-        aPoint = Point(224,340);
-        pWall->InsertWall(aPoint);
-    }
-    if(nLevel < WAVES*2)
-        nMauer = (BYTE)waves[nWert-1][nGegner*3+2];
-    else
-        nMauer = 0xff;
-    if(nMauer & 0x01)
-        pWall->InsertWall(Point(256,340));
-    if(nMauer & 0x02)
-        pWall->InsertWall(Point(288,340));
-    if(nMauer & 0x04)
-        pWall->InsertWall(Point(320,340));
-    if(nMauer & 0x08)
-        pWall->InsertWall(Point(352,340));
-    if(nMauer & 0x10)
-        pWall->InsertWall(Point(384,340));
-    if(nMauer & 0x20)
-        pWall->InsertWall(Point(416,340));
-    if(nMauer & 0x40)
-        pWall->InsertWall(Point(448,340));
-    if(nMauer & 0x80)
-        pWall->InsertWall(Point(480,340));
-    if(nLevel < WAVES*2)
-        nMauer = (BYTE)waves[nWert-1][nGegner*3+3];
-    else
-        nMauer = 0xff;
-    if(nMauer & 0x01)
-        pWall->InsertWall(Point(512,340));
-    if(nMauer & 0x02)
-        pWall->InsertWall(Point(544,340));
-    if(nMauer & 0x04)
-        pWall->InsertWall(Point(576,340));
-    if(nMauer & 0x08)
-        pWall->InsertWall(Point(608,340));
-
-    nGegner = nDummy;
-
-}
-
-void MyWindow::RandomLevel()
-{
-    Time aTime;
-
-    srand(aTime.GetTime() % 1000);
-
-    long nPos = ranpos[0];
-    while(!pGegner->Count())
-    {
-        for(long i=0; i<nPos ;i++)
-        {
-
-            int nRan = rand() % 40;
-
-            if(nRan < 3)
-                pGegner->InsertGegner(GEGNER5,ranpos[i*2+1],ranpos[i*2+2]);
-            if(nRan > 2 && nRan < 9)
-                pGegner->InsertGegner(GEGNER4,ranpos[i*2+1],ranpos[i*2+2]);
-            if(nRan > 8 && nRan < 16)
-                pGegner->InsertGegner(GEGNER3,ranpos[i*2+1],ranpos[i*2+2]);
-            if(nRan > 15 && nRan < 27)
-                pGegner->InsertGegner(GEGNER2,ranpos[i*2+1],ranpos[i*2+2]);
-            if(nRan > 26 && nRan < 41)
-                pGegner->InsertGegner(GEGNER1,ranpos[i*2+1],ranpos[i*2+2]);
-        }
-    }
-
-    levelpuf[0] = nLevel;
-    levelpuf[1] = pGegner->Count();
-    unsigned long i;
-    for(i=0; i<pGegner->Count(); i++)
-    {
-        levelpuf[i*3+2] = pGegner->GegType(i);
-        levelpuf[i*3+3] = pGegner->GegnerX(i);
-        levelpuf[i*3+4] = pGegner->GegnerY(i);
-    }
-}
-
diff --git a/goodies/source/inv/makefile.mk b/goodies/source/inv/makefile.mk
deleted file mode 100644
index 500ba17f6091..000000000000
--- a/goodies/source/inv/makefile.mk
+++ /dev/null
@@ -1,159 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.21 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=goodies
-TARGET=invader
-TARGETTYPE=GUI
-
-EXTERNAL_WARNINGS_NOT_ERRORS := TRUE
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-.IF "$(L10N_framework)"==""
-
-.IF "$(TEST)" != ""
-CDEFS+=-DTEST
-OBJFILES=	\
-        $(OBJ)$/invader.obj \
-        $(OBJ)$/invader1.obj \
-        $(OBJ)$/shapes.obj \
-        $(OBJ)$/expl.obj \
-        $(OBJ)$/score.obj \
-        $(OBJ)$/monst.obj
-.ELSE
-
-SLOFILES= \
-        $(SLO)$/invader.obj \
-        $(SLO)$/invader1.obj \
-        $(SLO)$/shapes.obj \
-        $(SLO)$/expl.obj \
-        $(SLO)$/score.obj \
-        $(SLO)$/monst.obj
-.ENDIF
-.ENDIF
-
-SRS1NAME=$(TARGET)
-SRC1FILES=gegner.src strings.src
-
-RESLIB1IMAGES= $(PRJ)$/res
-RESLIB1NAME=tfu
-RESLIB1SRSFILES=$(SRS)$/invader.srs
-
-
-.IF "$(L10N_framework)"==""
-
-.IF "$(TEST)"!=""
-APP1TARGET= $(TARGET)
-APP1OBJS= $(OBJFILES)
-APP1STDLIBS=	$(CPPULIB)			\
-                $(CPPUHELPERLIB)	\
-                $(COMPHELPERLIB)	\
-                $(TOOLSLIB) 		\
-                $(SALLIB)			\
-                $(VOSLIB)			\
-                $(SOTLIB)			\
-                $(VCLLIB)
-
-.ELSE
-
-SHL1TARGET= tfu$(DLLPOSTFIX)
-SHL1IMPLIB= i
-SHL1STDLIBS=\
-            $(VCLLIB)     \
-            $(TOOLSLIB)  \
-            $(SALLIB)
-
-.IF "$(GUI)"=="WNT"
-SHL1STDLIBS+=\
-            $(COMDLG32LIB) \
-            $(ADVAPI32LIB)
-.ENDIF
-
-SHL1OBJS=$(SLOFILES)
-
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-
-.ENDIF
-# --- Targets -------------------------------------------------------
-.ENDIF
-
-.INCLUDE :	target.mk
-
-.IF "$(L10N_framework)"==""
-ALLTAR: \
-    $(BIN)$/applicat.rdb
-
-$(BIN)$/applicat.rdb : makefile.mk $(SOLARBINDIR)$/types.rdb
-    rm -f $@
-    $(GNUCOPY) $(SOLARBINDIR)$/types.rdb $@
-    cd $(BIN) && \
-        $(REGCOMP) -register -r applicat.rdb \
-            -c i18npool.uno$(DLLPOST)
-
-# --- Def-File ---
-
-.IF "$(GUI)"=="WNT"
-
-$(MISC)$/$(SHL1TARGET).def: makefile.mk
-    @echo -------------------------------------------
-    @echo DEF-File erstellen $@
-    @echo LIBRARY     $(DLLNAME)                    >$@
-.IF "$(COM)"!="GCC"
-    @echo DESCRIPTION 'Star Cube DLL'               >>$@
-    @echo DATA                READ WRITE NONSHARED  >>$@
-.ENDIF
-    @echo EXPORTS                                   >>$@
-    @echo     StartInvader    @22                    >>$@
-
-.ENDIF
-
-.IF "$(GUI)"=="OS2"
-
-$(MISC)$/$(SHL1TARGET).def: makefile.mk
-    @+echo -------------------------------------------
-    @+echo DEF-File erstellen $@
-        @+echo LIBRARY     $(SHL1TARGET) INITINSTANCE TERMINSTANCE   >$@
-        @+echo DESCRIPTION 'Star Cube DLL'               >>$@
-        @+echo DATA                MULTIPLE  >>$@
-        @+echo EXPORTS                                   >>$@
-        @+echo     _StartInvader    @22                    >>$@
-
-.ENDIF
-
-.ELSE
-pseudo:
-
-.ENDIF
diff --git a/goodies/source/inv/monst.cxx b/goodies/source/inv/monst.cxx
deleted file mode 100644
index 81c1a7edc1bc..000000000000
--- a/goodies/source/inv/monst.cxx
+++ /dev/null
@@ -1,427 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: monst.cxx,v $
- * $Revision: 1.7 $
- *
- * 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_goodies.hxx"
-#include <stdlib.h>
-#include "monst.hxx"
-#include "invader.hrc"
-#include "expl.hxx"
-#include "shapes.hxx"
-#include <vcl/outdev.hxx>
-#include <tools/time.hxx>
-
-Gegner::Gegner(Fighter* pFig, Bombe* pBom, ResMgr* pRes) :
-            GegnerListe(0,0),
-            pBitMonst1(0L),
-            pBitMonst2(0L),
-            pBitMonst3(0L),
-            pBitMonst4(0L),
-            pBitMonst1b(0L),
-            pBitMonst2b(0L),
-            pBitMonst3b(0L),
-            pBitMonst4b(0L),
-            pBitMonst5(0L),
-            pBitMonst5a(0L),
-            pBitMonst5b(0L),
-            pBombe(pBom),
-            pFighter(pFig),
-            bDown(FALSE),
-            bLeft(TRUE),
-            bAuseMode(FALSE),
-            nDown(MOVEY)
-{
-    pBitMonst1  = ImplLoadImage( MONSTER1, pRes );
-    pBitMonst2  = ImplLoadImage( MONSTER2, pRes );
-    pBitMonst3  = ImplLoadImage( MONSTER3, pRes );
-    pBitMonst4  = ImplLoadImage( MONSTER4, pRes );
-    pBitMonst1b = ImplLoadImage( MONSTER1B, pRes );
-    pBitMonst2b = ImplLoadImage( MONSTER2B, pRes );
-    pBitMonst3b = ImplLoadImage( MONSTER3B, pRes );
-    pBitMonst4b = ImplLoadImage( MONSTER4B, pRes );
-    pBitMonst5  = ImplLoadImage( MONSTER5, pRes );
-    pBitMonst5a = ImplLoadImage( MONSTER5A, pRes );
-    pBitMonst5b = ImplLoadImage( MONSTER5B, pRes );
-
-    aOutSize = pBitMonst1->GetSizePixel();
-
-    SetRandWert( 100 );
-}
-
-Gegner::~Gegner()
-{
-    ClearAll();
-
-    delete pBitMonst1;
-    delete pBitMonst2;
-    delete pBitMonst3;
-    delete pBitMonst4;
-    delete pBitMonst1b;
-    delete pBitMonst2b;
-    delete pBitMonst3b;
-    delete pBitMonst4b;
-    delete pBitMonst5;
-    delete pBitMonst5a;
-    delete pBitMonst5b;
-}
-
-void Gegner::InsertGegner(long nType, long x, long y)
-{
-    Gegner_Impl* pWork = new Gegner_Impl();
-
-    pWork->aType = (enum GegnerType)nType;
-    pWork->aMode = MOVE1;
-    pWork->aXY   = Point(x,y);
-    pWork->aX    = x;
-    pWork->nHits = 0;
-    switch(pWork->aType)
-    {
-        case GEGNER1:
-            pWork->nPoints = 50;
-            pWork->nMaxHits = 1;
-            break;
-        case GEGNER2:
-            pWork->nPoints = 75;
-            pWork->nMaxHits = 2;
-            break;
-        case GEGNER3:
-            pWork->nPoints = 150;
-            pWork->nMaxHits = 3;
-            break;
-        case GEGNER4:
-            pWork->nPoints = 225;
-            pWork->nMaxHits = 5;
-            break;
-        case GEGNER5:
-            pWork->nPoints = 500;
-            pWork->nMaxHits = 3;
-            pWork->aMode = HIDE;
-            break;
-    }
-
-    Insert(pWork);
-}
-
-void Gegner::Move()
-{
-    BOOL bNextDown = FALSE;
-    unsigned long i;
-    for(i=0; i<Count(); i++)
-    {
-        if(bDown)
-        {
-            SetGegnerPos(i,Point(GegnerX(i),GegnerY(i)+nDown));
-
-        }
-        else if(bLeft)
-        {
-            SetGegnerPos(i,Point(GegnerX(i)+MOVEX,GegnerY(i)));
-            if(GegnerX(i)+MOVEX+aOutSize.Width() > nMaxX)
-                bNextDown = TRUE;
-        }
-        else
-        {
-            SetGegnerPos(i,Point(GegnerX(i)-MOVEX,GegnerY(i)));
-            if(GegnerX(i)-MOVEX <= 0)
-                bNextDown = TRUE;
-        }
-
-    }
-
-    if(bDown)
-    {
-        if(bLeft)
-            bLeft = FALSE;
-        else
-            bLeft = TRUE;
-    }
-
-    bDown = FALSE;
-    if(bNextDown)
-        bDown = TRUE;
-}
-
-void Gegner::DrawGegner(OutputDevice* pDev,Point* pStart)
-{
-
-    Time aTime;
-    srand(aTime.GetTime() % 1000);
-
-    nMaxX = pDev->GetOutputSizePixel().Width()-pStart->X();
-    unsigned long i;
-    for(i=0; i<Count();i++)
-    {
-        switch(GegType(i))
-        {
-            case GEGNER1:
-                if(GegMode(i) == MOVE1)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst1);
-                    SetMode(i,MOVE2);
-                }
-                else if(GegMode(i) == MOVE2)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst1b);
-                    SetMode(i,MOVE1);
-                }
-                break;
-            case GEGNER2:
-                if(GegMode(i) == MOVE1)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst2);
-                    SetMode(i,MOVE2);
-                }
-                else if(GegMode(i) == MOVE2)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst2b);
-                    SetMode(i,MOVE1);
-                }
-                break;
-            case GEGNER3:
-                if(GegMode(i) == MOVE1)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst3);
-                    SetMode(i,MOVE2);
-                }
-                else if(GegMode(i) == MOVE2)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst3b);
-                    SetMode(i,MOVE1);
-                }
-                break;
-            case GEGNER4:
-                if(GegMode(i) == MOVE1)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst4);
-                    SetMode(i,MOVE2);
-                }
-                else if(GegMode(i) == MOVE2)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst4b);
-                    SetMode(i,MOVE1);
-                }
-                break;
-            case GEGNER5:
-                if(GegMode(i) == MOVE1)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst5);
-                    DecDelay(i);
-                    if(!GetDelay(i))
-                    {
-                        SetDelay(i);
-                        SetMode(i,MOVE2);
-                    }
-                }
-                if(GegMode(i) == MOVE2)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst5a);
-                    DecDelay(i);
-                    if(!GetDelay(i))
-                    {
-                        SetDelay(i);
-                        SetMode(i,MOVE3);
-                    }
-                }
-                if(GegMode(i) == MOVE3)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst5b);
-                    DecDelay(i);
-                    pBombe->InsertBombe(Point(GegnerX(i),
-                                            GegnerY(i)+aOutSize.Height()/2));
-                    if(!GetDelay(i))
-                    {
-                        SetDelay(i);
-                        SetMode(i,MOVE4);
-                    }
-                }
-                if(GegMode(i) == MOVE4)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst5a);
-                    DecDelay(i);
-                    if(!GetDelay(i))
-                    {
-                        SetDelay(i);
-                        if ( rand() % 5 < 2 )
-                            SetMode(i,MOVE3);
-                        else
-                            SetMode(i,MOVE5);
-                    }
-                }
-                if(GegMode(i) == MOVE5)
-                {
-                    pDev->DrawImage(Point(pStart->X()+GegnerX(i),
-                            pStart->Y()+GegnerY(i)),*pBitMonst5);
-                    DecDelay(i);
-                    if(!GetDelay(i))
-                    {
-                        if ( rand() % 5 < 2 )
-                        {
-                            SetMode(i,MOVE1);
-                            SetDelay(i);
-                        }
-                        else
-                            SetMode(i,HIDE);
-                    }
-                }
-                break;
-
-        }
-
-        SetKoll(i,Rectangle(Point(GegnerX(i)+KOLLXY,GegnerY(i)+KOLLXY),
-                        Point(GegnerX(i)+aOutSize.Width()-KOLLXY,
-                            GegnerY(i)+aOutSize.Height()-KOLLXY)));
-
-        if(bAuseMode && GegMode(i) == MOVE1)
-        {
-            if(GegnerX(i) < pFighter->GetHalf() &&
-                        GegnerX(i)+aOutSize.Width() > pFighter->GetHalf())
-                    pBombe->InsertBombe(Point(pFighter->GetPoint().X(),
-                                            GegnerY(i)+aOutSize.Height()/2));
-        }
-        else
-        {
-            int ran = rand();
-
-            int nScaledLimit;
-            // NOTE: the two expressions are the same in floatingpoint but not in integer
-
-            int nRandMax = RAND_MAX;
-            if ( nRandMax < 32767 )
-                nScaledLimit = GetRandWert() / ( 32767 / nRandMax );
-            else
-                nScaledLimit = GetRandWert() * ( nRandMax / 32767);
-
-            if(GegType(i) != GEGNER5)
-            {
-                if(ran < nScaledLimit )
-                    pBombe->InsertBombe(Point(GegnerX(i),
-                                            GegnerY(i)+aOutSize.Height()/2));
-            }
-            else if(GegMode(i) == HIDE)
-            {
-                if(ran < (nScaledLimit *3) /2)
-                {
-                    SetMode(i,MOVE1);
-                    SetDelay(i);
-                }
-            }
-        }
-    }
-
-    Move();
-}
-
-long Gegner::Kollision(Rectangle& rRect, Explosion* pExpl)
-{
-    long nWert = -1;
-
-    Rectangle aWork;
-
-    unsigned long i;
-    for( i=0; i<Count();i++)
-    {
-        aWork = GegnerKoll(i);
-        if((aWork.Left() <= rRect.Left() &&  aWork.Right() >= rRect.Right()) &&
-            (aWork.Top() <= rRect.Top() && aWork.Bottom() >= rRect.Bottom()) &&
-                GegMode(i) != DELETED)
-        {
-            nWert = 0;
-            if(GegnerDest(i))
-            {
-                SetMode(i,DELETED);
-                if(nWert == -1)
-                    nWert = GegnerPoints(i);
-                else
-                    nWert += GegnerPoints(i);
-            }
-
-            pExpl->InsertExpl(GegnerPos(i));
-
-        }
-    }
-
-    return nWert;
-}
-
-BOOL Gegner::GegnerDest(long nWert)
-{
-    GegnerHit(nWert);
-    if(GetObject(nWert)->nHits >= GetObject(nWert)->nMaxHits)
-        return TRUE;
-
-    return FALSE;
-}
-
-Rectangle Gegner::GetKoll(long nWert)
-{
-    return Rectangle(Point(GegnerX(nWert)+aOutSize.Width()/2,
-                            GegnerY(nWert)+aOutSize.Height()),
-                     Point(GegnerX(nWert)+aOutSize.Width()/2,
-                            GegnerY(nWert)+aOutSize.Height()));
-}
-
-BOOL Gegner::RemoveGegner()
-{
-    for(long i=Count()-1; i>=0; i--)
-    {
-        Gegner_Impl* pWork = GetObject(i);
-
-        if(pWork->aMode == DELETED)
-        {
-            Remove(pWork);
-            delete pWork;
-        }
-    }
-    if(Count())
-        return FALSE;
-    else
-        return TRUE;
-}
-
-void Gegner::ClearAll()
-{
-    unsigned long i;
-    for( i=0; i<Count(); i++ )
-        delete GetObject(i);
-
-    Clear();
-}
diff --git a/goodies/source/inv/monst.hxx b/goodies/source/inv/monst.hxx
deleted file mode 100644
index ff29bbd6a3fd..000000000000
--- a/goodies/source/inv/monst.hxx
+++ /dev/null
@@ -1,135 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: monst.hxx,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.
- *
- ************************************************************************/
-#ifndef _MONST_HXX
-#define _MONST_HXX
-
-enum GegnerType { GEGNER1, GEGNER2, GEGNER3, GEGNER4, GEGNER5 };
-enum GegnerMode { MOVE1, MOVE2, MOVE3, MOVE4, MOVE5, DELETED, HIDE };
-
-#define DIFFX   20
-#define DIFFY   20
-#define MOVEX   10
-#define MOVEY   10
-#define KOLLXY  2
-
-#include <tools/list.hxx>
-#include <vcl/image.hxx>
-#include <tools/gen.hxx>
-#include <vcl/outdev.hxx>
-
-struct Gegner_Impl
-{
-    Point       aXY;
-    long        nRow;
-    long        aX;
-    long        nDiffX;
-    long        nPoints;
-    long        nMaxHits;
-    long        nHits;
-    long        nDelay;
-    GegnerType  aType;
-    GegnerMode  aMode;
-    Rectangle   aKoll;
-};
-
-DECLARE_LIST(GegnerListe,Gegner_Impl*)
-
-class Explosion;
-class Bombe;
-class Fighter;
-
-class Gegner : public GegnerListe
-{
-    private:
-        long        nRows;
-        long        nGegnerRow;
-        long        nMaxX;
-        Size        aOutSize;
-        Image*      pBitMonst1;
-        Image*      pBitMonst2;
-        Image*      pBitMonst3;
-        Image*      pBitMonst4;
-        Image*      pBitMonst1b;
-        Image*      pBitMonst2b;
-        Image*      pBitMonst3b;
-        Image*      pBitMonst4b;
-        Image*      pBitMonst5;
-        Image*      pBitMonst5a;
-        Image*      pBitMonst5b;
-        Bombe*      pBombe;
-        Fighter*    pFighter;
-
-        BOOL        bDown;
-        BOOL        bLeft;
-        BOOL        bAuseMode;
-        long        nRandWert;
-        long        nDown;
-
-    public:
-                    Gegner(Fighter* pFighter, Bombe* pBombe, ResMgr* pRes);
-                    ~Gegner();
-
-        void        InsertGegner(long nType, long x, long y);
-        void        DrawGegner(OutputDevice* pDev, Point* pStart);
-        void        Move();
-        void        SetRandWert(long nWert) { nRandWert = nWert; }
-        long        GetRandWert() { return nRandWert; }
-        long        GegnerX(long nWert) { return GetObject(nWert)->aXY.X(); }
-        long        GegnerXStart(long nWert) { return GetObject(nWert)->aX; }
-        long        GegnerY(long nWert) { return GetObject(nWert)->aXY.Y(); }
-        GegnerType  GegType(long nWert)
-                        { return GetObject(nWert)->aType; }
-        GegnerMode  GegMode(long nWert)
-                        { return GetObject(nWert)->aMode; }
-        void        SetMode(long nWert, enum GegnerMode nMode)
-                        { GetObject(nWert)->aMode = nMode; }
-        void        SetGegnerPos(long nWert, const Point& rPoint)
-                        { GetObject(nWert)->aXY = rPoint;}
-        long        GegnerDiffX(long nWert) { return GetObject(nWert)->nDiffX; }
-        Rectangle&  GegnerKoll(long nWert) { return GetObject(nWert)->aKoll; }
-        Rectangle   GetKoll(long nWert);
-        void        SetKoll(long nWert, const Rectangle& rRect)
-                        { GetObject(nWert)->aKoll = rRect; }
-        long        Kollision(Rectangle& rRect, Explosion* pExplosion);
-        Point&      GegnerPos(long nWert) { return GetObject(nWert)->aXY; }
-        BOOL        RemoveGegner();
-        void        ClearAll();
-        long        GegnerPoints(long nWert) { return GetObject(nWert)->nPoints; }
-        void        GegnerHit(long nWert) { GetObject(nWert)->nHits++; }
-        BOOL        GegnerDest(long nWert);
-        void        SetDown(long nWert) { nDown = nWert; }
-        long        GetDown() { return nDown; }
-        void        SetAuseMode(BOOL bFlag) { bAuseMode = bFlag; }
-        void        SetDelay(long nWert) { GetObject(nWert)->nDelay = 3; }
-        long        GetDelay(long nWert) { return GetObject(nWert)->nDelay; }
-        void        DecDelay(long nWert) { GetObject(nWert)->nDelay--; }
-};
-
-#endif
diff --git a/goodies/source/inv/score.cxx b/goodies/source/inv/score.cxx
deleted file mode 100644
index 6ff3abcbb90d..000000000000
--- a/goodies/source/inv/score.cxx
+++ /dev/null
@@ -1,155 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: score.cxx,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.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#include "score.hxx"
-#include "strings.hrc"
-#include "invader.hxx"
-
-ScoreWindow::ScoreWindow(Window* Parent, WinBits wBits, ResMgr* pP) :
-                    Window(Parent, wBits),
-                    nHero(-1),
-                    nRockets(5),
-                    nLives(3),
-                    nScore(0L),
-                    pRes(pP),
-                    bPaintBack(FALSE)
-{
-    SetBackground(Wallpaper( Color( COL_GRAY ) ) );
-}
-
-ScoreWindow::~ScoreWindow()
-{
-}
-
-void ScoreWindow::Paint(const Rectangle&)
-{
-    Font aFont = GetFont();
-    aFont.SetColor(COL_WHITE);
-    aFont.SetFillColor(COL_GRAY);
-    SetFont(*&aFont);
-
-    SetFillColor(COL_GRAY);
-
-    if(bPaintBack)
-    {
-        Push( PUSH_LINECOLOR );
-        SetLineColor();
-        DrawRect(Rectangle(Point(0,0),GetOutputSizePixel()));
-        Pop();
-    }
-
-    if(nHero)
-        DrawText(Point(0,0),String(ResId(nHero, *pRes)));
-
-    DrawText(Point(180,0),String(ResId(STR_ROCKETS, *pRes)));
-
-    DrawText(Point(300,0),String(ResId(STR_FIGHTER, *pRes)));
-    DrawText(Point(370,0),String::CreateFromInt32(nLives));
-
-    DrawText(Point(400,0),String(ResId(STR_LEVEL, *pRes)));
-    DrawText(Point(460,0),String::CreateFromInt32(nLevel));
-
-    DrawText(Point(500,0),String(ResId(STR_SCORE, *pRes)));
-    String aString = String::CreateFromInt32(nScore);
-    if ( aString.Len() < 7 )
-    {
-        for ( xub_StrLen i = aString.Len(); i < 7; ++i )
-            aString.Insert( '0', 0 );
-    }
-    DrawText(Point(560,0),aString);
-
-    for(long i=0; i<5;i++)
-    {
-        if(nRockets > i)
-        {
-            SetLineColor(COL_GREEN);
-            SetFillColor(COL_GREEN);
-        }
-        else
-        {
-            SetLineColor(COL_RED);
-            SetFillColor(COL_RED);
-        }
-
-        DrawRect(Rectangle(Point(250+i*8,5),Point(256+i*8,12)));
-    }
-    SetBackground(Wallpaper( Color( COL_GRAY ) ) );
-
-    bPaintBack = FALSE;
-}
-
-void ScoreWindow::SetHero(long nName)
-{
-    nHero = nName;
-
-    SetBackground();
-    Invalidate();
-}
-
-void ScoreWindow::SetRockets(long nWert)
-{
-    nRockets = nWert;
-
-    SetBackground();
-    Invalidate();
-}
-
-void ScoreWindow::SetLives(long nWert)
-{
-    nLives = nWert;
-
-//  SetBackground();
-    Invalidate();
-}
-
-void ScoreWindow::SetScore(long nWert)
-{
-    nScore = nWert;
-
-    SetBackground();
-    Invalidate();
-}
-
-void ScoreWindow::SetLevel(long nWert)
-{
-    nLevel = nWert;
-
-//  SetBackground();
-    Invalidate();
-}
-
-void ScoreWindow::ShowMe()
-{
-    bPaintBack = TRUE;
-
-    Window::Show();
-}
diff --git a/goodies/source/inv/shapes.cxx b/goodies/source/inv/shapes.cxx
deleted file mode 100644
index 87c09c928a1b..000000000000
--- a/goodies/source/inv/shapes.cxx
+++ /dev/null
@@ -1,485 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: shapes.cxx,v $
- * $Revision: 1.7 $
- *
- * 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_goodies.hxx"
-#include "shapes.hxx"
-#include "invader.hrc"
-#include "expl.hxx"
-#include <vcl/outdev.hxx>
-#include <vcl/virdev.hxx>
-#include <vcl/bitmap.hxx>
-
-Image* ImplLoadImage( USHORT nId, ResMgr* pRes )
-{
-    return new Image( Bitmap( ResId( nId, *pRes ) ), COL_WHITE );
-}
-
-// ------------------------------------------------------------------------
-
-Fighter::Fighter(Size& rOut, ResMgr* pRes) :
-            pFightr(NULL),
-            pFightl(NULL),
-            eMode(FIGHT_NORM),
-            bNoKey(FALSE),
-            nDelay(0),
-            pFight1(NULL)
-{
-    pFight1 = ImplLoadImage( FIGHTER1, pRes );
-    pFightr = ImplLoadImage( FIGHTERR, pRes );
-    pFightl = ImplLoadImage( FIGHTERL, pRes );
-
-    aSize = pFight1->GetSizePixel();
-
-    aOut.X() = rOut.Width()/2-aSize.Width()/2;
-    aOut.Y() = rOut.Height()-aSize.Height()-10;
-
-    aStart = aOut;
-
-    nMax = rOut.Width() - aSize.Width();
-}
-
-Fighter::~Fighter()
-{
-
-    delete pFight1;
-    delete pFightr;
-    delete pFightl;
-}
-
-void Fighter::Init()
-{
-    aOut  = aStart;
-    eMode = FIGHT_NORM;
-}
-
-void Fighter::Paint(OutputDevice& rDev)
-{
-    if(eMode == FIGHT_DEST)
-        return;
-
-    switch(eMode)
-    {
-        case FIGHT_NORM:
-            rDev.DrawImage(aOut,*pFight1);
-            break;
-        case FIGHT_RIGHT:
-            rDev.DrawImage(aOut,*pFightr);
-            break;
-        case FIGHT_LEFT:
-            rDev.DrawImage(aOut,*pFightl);
-            break;
-        case FIGHT_DEST:
-            break;
-    }
-
-    if(nDelay <= 0)
-        eMode = FIGHT_NORM;
-    else
-        nDelay--;
-
-    bNoKey = FALSE;
-}
-
-void Fighter::Move(long nDirect)
-{
-    if(eMode == FIGHT_DEST)
-        return;
-
-    if(nDirect < 0)
-    {
-        aOut.X() -= KANONEX;
-        eMode = FIGHT_LEFT;
-    }
-    else
-    {
-        aOut.X() += KANONEX;
-        eMode = FIGHT_RIGHT;
-    }
-
-    nDelay = 5;
-
-    if(aOut.X() <= 0)
-        aOut.X() = 1;
-    if(aOut.X() > nMax)
-        aOut.X() = nMax;
-
-    bNoKey = TRUE;
-}
-
-BOOL Fighter::Kollision(Rectangle aRect, Explosion* pExpl)
-{
-        if((aOut.X() <= aRect.Left() && aOut.X()+aSize.Width() >= aRect.Right()) &&
-            (aOut.Y() <= aRect.Top() && aOut.Y()+aSize.Height() >= aRect.Bottom()))
-        {
-            pExpl->InsertExpl(aOut);
-            eMode = FIGHT_DEST;
-            return TRUE;
-        }
-
-    return FALSE;
-}
-
-Munition::Munition(ResMgr* pRes) :
-            MunitionListe(0,1),
-            pMunition2( NULL ),
-            pMunition1( NULL )
-{
-    pMunition1 = ImplLoadImage( MUNITION1,pRes );
-    pMunition2 = ImplLoadImage( MUNITION2,pRes );
-
-    aSize = pMunition1->GetSizePixel();
-}
-
-Munition::~Munition()
-{
-    ClearAll();
-
-    delete pMunition1;
-    delete pMunition2;
-}
-
-void Munition::Start(Point& rPoint)
-{
-    if( Count() >= MUNMAX)
-        return;
-
-
-    Munition_Impl* pWork = new Munition_Impl();
-
-    pWork->aPoint = rPoint;
-    pWork->eMode = MUNI_MODE1;
-
-    Insert(pWork);
-}
-
-void Munition::Paint(OutputDevice& rDev)
-{
-    unsigned long i;
-    for(i=0; i<Count();i++)
-    {
-        switch(GetMode(i))
-        {
-            case MUNI_MODE1:
-                rDev.DrawImage(GetPoint(i),*pMunition1);
-                SetMode(i,MUNI_MODE2);
-                break;
-            case MUNI_MODE2:
-                rDev.DrawImage(GetPoint(i),*pMunition2);
-                SetMode(i,MUNI_MODE1);
-                break;
-            case MUNI_DEL:
-                break;
-        }
-
-        SetKoll(i,Rectangle(Point(GetPoint(i).X()+aSize.Width()/2,GetPoint(i).Y()),
-                    Point(GetPoint(i).X()+aSize.Width()/2,
-                            GetPoint(i).Y())));
-
-
-        SetPoint(i,Point(GetPoint(i).X(),GetPoint(i).Y() - MUNIY));
-        if(GetPoint(i).Y() <= aSize.Height()*-1)
-        {
-            SetMode(i,MUNI_DEL);
-        }
-    }
-}
-
-long Munition::RemoveMunition()
-{
-    for(long i=Count()-1; i>=0; i--)
-    {
-        if(GetMode(i) == MUNI_DEL)
-        {
-            Munition_Impl* pWork = GetObject(i);
-            Remove(pWork);
-            delete pWork;
-        }
-    }
-
-    return 5-Count();
-}
-
-void Munition::ClearAll()
-{
-    for(long i=Count()-1; i>=0; i--)
-        delete  GetObject(i);
-
-    Clear();
-}
-
-Bombe::Bombe(ResMgr* pRes) :
-        BombenListe(0,1)
-{
-    pBombe = ImplLoadImage( BOMBE,pRes );
-
-    aSize = pBombe->GetSizePixel();
-    nSpeed = BOMBEY;
-}
-
-Bombe::~Bombe()
-{
-    ClearAll();
-
-    delete pBombe;
-}
-
-void Bombe::Paint(OutputDevice& rDev)
-{
-    unsigned long i;
-    for(i=0; i<Count();i++)
-    {
-        rDev.DrawImage(GetPoint(i),*pBombe);
-        SetKoll(i,Rectangle(Point(GetPoint(i).X()+aSize.Width()/2,
-                                GetPoint(i).Y()+aSize.Height()),
-                        Point(GetPoint(i).X()+aSize.Width()/2,
-                            GetPoint(i).Y()+aSize.Height())));
-
-        SetPoint(i,Point(GetPoint(i).X(),GetPoint(i).Y() + MUNIY));
-    }
-}
-
-void Bombe::InsertBombe(const Point& rPoint)
-{
-    Bombe_Impl* pWork = new Bombe_Impl;
-    pWork->aXY = rPoint;
-    pWork->bDelete = FALSE;
-    Insert(pWork);
-}
-
-void Bombe::RemoveBomben()
-{
-    for(long i=Count()-1; i>=0; i--)
-    {
-        Bombe_Impl* pWork = GetObject(i);
-        if(pWork->bDelete)
-        {
-            Remove(pWork);
-            delete pWork;
-        }
-    }
-}
-
-void Bombe::ClearAll()
-{
-    unsigned long i;
-    for(i=0;i<Count();i++)
-        delete GetObject(i);
-    Clear();
-}
-
-BOOL Bombe::Kollision(Rectangle aRect, Explosion* pExpl)
-{
-    unsigned long i;
-    for(i=0;i<Count();i++)
-    {
-        if((GetPoint(i).X() <= aRect.Left() && GetPoint(i).X()+aSize.Width() >= aRect.Right()) &&
-            (GetPoint(i).Y() <= aRect.Top() && GetPoint(i).Y()+aSize.Height() >= aRect.Bottom()))
-        {
-            pExpl->InsertExpl(GetPoint(i));
-            SetDelete(i);
-            return TRUE;
-        }
-    }
-
-    return FALSE;
-}
-
-Wall::Wall(ResMgr* pRes) :
-            WallListe(0,1),
-            pWall1(0L),
-            pWall2(0L),
-            pWall3(0L),
-            pWall4(0L),
-            pWall5(0L),
-            pWall6(0L),
-            pWall7(0L),
-            pWall8(0L),
-            pWall9(0L),
-            pWall10(0L)
-{
-    pWall1  = ImplLoadImage( WALL1,pRes );
-    pWall2  = ImplLoadImage( WALL2,pRes );
-    pWall3  = ImplLoadImage( WALL3,pRes );
-    pWall4  = ImplLoadImage( WALL4,pRes );
-    pWall5  = ImplLoadImage( WALL5,pRes );
-    pWall6  = ImplLoadImage( WALL6,pRes );
-    pWall7  = ImplLoadImage( WALL7,pRes );
-    pWall8  = ImplLoadImage( WALL8,pRes );
-    pWall9  = ImplLoadImage( WALL9,pRes );
-    pWall10 = ImplLoadImage( WALL10,pRes );
-
-    aSize = pWall1->GetSizePixel();
-}
-
-Wall::~Wall()
-{
-    ClearAll();
-
-    delete pWall1;
-    delete pWall2;
-    delete pWall3;
-    delete pWall4;
-    delete pWall5;
-    delete pWall6;
-    delete pWall7;
-    delete pWall8;
-    delete pWall9;
-    delete pWall10;
-}
-
-void Wall::Paint(OutputDevice& rDev)
-{
-    unsigned long i;
-    for(i=0; i<Count(); i++)
-    {
-        switch(GetMode(i))
-        {
-            case WALL_MOD1:
-                rDev.DrawImage(GetPoint(i),*pWall1);
-                break;
-            case WALL_MOD2:
-                rDev.DrawImage(GetPoint(i),*pWall2);
-                break;
-            case WALL_MOD3:
-                rDev.DrawImage(GetPoint(i),*pWall3);
-                break;
-            case WALL_MOD4:
-                rDev.DrawImage(GetPoint(i),*pWall4);
-                break;
-            case WALL_MOD5:
-                rDev.DrawImage(GetPoint(i),*pWall5);
-                break;
-            case WALL_MOD6:
-                rDev.DrawImage(GetPoint(i),*pWall6);
-                break;
-            case WALL_MOD7:
-                rDev.DrawImage(GetPoint(i),*pWall7);
-                break;
-            case WALL_MOD8:
-                rDev.DrawImage(GetPoint(i),*pWall8);
-                break;
-            case WALL_MOD9:
-                rDev.DrawImage(GetPoint(i),*pWall9);
-                break;
-            case WALL_MOD10:
-                rDev.DrawImage(GetPoint(i),*pWall10);
-                break;
-            case WALL_DEL:
-                break;
-        }
-
-    }
-}
-
-void Wall::InsertWall(const Point& rPoint)
-{
-    Wall_Impl* pWork = new Wall_Impl();
-
-    pWork->aXY = rPoint;
-    pWork->aXY.Y() = WALLY;
-    pWork->eMode = WALL_MOD1;
-
-    Insert(pWork);
-}
-
-void Wall::ClearAll()
-{
-    unsigned long i;
-    for(i=0; i<Count(); i++)
-        delete GetObject(i);
-
-    Clear();
-}
-
-BOOL Wall::Kollision(Rectangle& rRect, BOOL bDel)
-{
-    BOOL nTreffer = FALSE;
-
-    Rectangle aWork;
-
-    unsigned long i;
-    for(i=0; i<Count();i++)
-    {
-
-        Point aPoint = GetPoint(i);
-        aWork = Rectangle(Point(aPoint.X(),aPoint.Y()-WALLKOLL),
-                            Point(aPoint.X()+aSize.Width(),
-                            aPoint.Y()+aSize.Height()-WALLKOLL));
-
-        if((aWork.Left() <= rRect.Left() &&  aWork.Right() >= rRect.Right()) &&
-            (aWork.Top() <= rRect.Top() && aWork.Bottom() >= rRect.Bottom()) &&
-                GetMode(i) != WALL_DEL)
-        {
-            switch(GetMode(i))
-            {
-                case WALL_MOD1:
-                    SetMode(i,WALL_MOD2);
-                    break;
-                case WALL_MOD2:
-                    SetMode(i,WALL_MOD3);
-                    break;
-                case WALL_MOD3:
-                    SetMode(i,WALL_MOD4);
-                    break;
-                case WALL_MOD4:
-                    SetMode(i,WALL_MOD5);
-                    break;
-                case WALL_MOD5:
-                    SetMode(i,WALL_MOD6);
-                    break;
-                case WALL_MOD6:
-                    SetMode(i,WALL_MOD7);
-                    break;
-                case WALL_MOD7:
-                    SetMode(i,WALL_MOD8);
-                    break;
-                case WALL_MOD8:
-                    SetMode(i,WALL_MOD9);
-                    break;
-                case WALL_MOD9:
-                    SetMode(i,WALL_MOD10);
-                    break;
-                case WALL_MOD10:
-                    SetMode(i,WALL_DEL);
-                    break;
-                case WALL_DEL:
-                    break;
-            }
-
-            if(bDel)
-                SetMode(i,WALL_DEL);
-
-            nTreffer = TRUE;
-        }
-    }
-
-    return nTreffer;
-}
diff --git a/goodies/source/inv/shapes.hxx b/goodies/source/inv/shapes.hxx
deleted file mode 100644
index b94b93e905fc..000000000000
--- a/goodies/source/inv/shapes.hxx
+++ /dev/null
@@ -1,194 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: shapes.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 _SHAPES_HXX
-#define _SHAPES_HXX
-
-
-#include <vcl/image.hxx>
-#include <vcl/outdev.hxx>
-
-#define KANONEX     10
-#define BOMBEY      20
-#define MUNIXY      10
-#define BOMBXY      5
-#define WALLY       400
-#define WALLKOLL    8
-
-Image* ImplLoadImage( USHORT nId, ResMgr* pRes );
-
-enum FighterMode { FIGHT_NORM, FIGHT_RIGHT, FIGHT_LEFT, FIGHT_DEST};
-
-class Explosion;
-
-class Fighter
-{
-    private:
-        Image*      pFightr;
-        Image*      pFightl;
-        Point       aOut;
-        Point       aStart;
-        long        nMax;
-        FighterMode eMode;
-        BOOL        bNoKey;
-        Size        aSize;
-        long        nDelay;
-
-    public:
-
-        Image*      pFight1;
-
-                    Fighter(Size& rOut, ResMgr* pRes);
-                    ~Fighter();
-        void        Paint(OutputDevice& pDev);
-        void        Move(long nDirect);
-        Point&      GetPoint() { return aOut; }
-        BOOL        Kollision(Rectangle, Explosion* pExpl);
-        void        Init();
-        void        NoFighter() { eMode = FIGHT_DEST; }
-        long        GetHalf() { return aOut.X()+aSize.Width()/2; }
-};
-
-enum MuniMode { MUNI_DEL, MUNI_MODE1, MUNI_MODE2 };
-
-#define MUNIY       10
-#define MUNMAX      5
-
-struct Munition_Impl
-{
-    MuniMode    eMode;
-    Point       aPoint;
-    Rectangle   aKoll;
-};
-
-DECLARE_LIST(MunitionListe,Munition_Impl*)
-
-class Munition : public MunitionListe
-{
-    private:
-        Image*      pMunition2;
-        Size        aSize;
-
-    public:
-
-        Image*      pMunition1;
-
-                    Munition(ResMgr* pRes);
-                    ~Munition();
-        void        Paint(OutputDevice& rDev);
-        void        Start(Point& rPoint);
-        void        SetDelete(long nWert) { GetObject(nWert)->eMode = MUNI_DEL; }
-        Rectangle   GetKoll(long nWert) { return GetObject(nWert)->aKoll; }
-        void        SetKoll(long nWert, Rectangle aRect)
-                        { GetObject(nWert)->aKoll = aRect; }
-        MuniMode    GetMode(long nWert) { return GetObject(nWert)->eMode; }
-        void        SetMode(long nWert, enum MuniMode mode)
-                        { GetObject(nWert)->eMode = mode; }
-        void        SetPoint(long nWert, const Point& rPoint)
-                        { GetObject(nWert)->aPoint = rPoint; }
-        Point       GetPoint(long nWert) { return GetObject(nWert)->aPoint; }
-        long        RemoveMunition();
-        void        ClearAll();
-};
-
-struct Bombe_Impl
-{
-    Point           aXY;
-    Rectangle       aKoll;
-    BOOL            bDelete;
-};
-
-DECLARE_LIST(BombenListe, Bombe_Impl*)
-
-class Bombe : public BombenListe
-{
-    private:
-        Image*      pBombe;
-        Size        aSize;
-        long        nSpeed;
-
-    public:
-                    Bombe(ResMgr* pRes);
-                    ~Bombe();
-        void        Paint(OutputDevice& rDev);
-        Point&      GetPoint(long nWert) { return GetObject(nWert)->aXY; }
-        void        SetPoint(long nWert, const Point& rPoint)
-                        { GetObject(nWert)->aXY = rPoint; }
-        void        InsertBombe(const Point& rPoint);
-        Rectangle   GetKoll(long nWert) { return GetObject(nWert)->aKoll; }
-        void        SetKoll(long nWert, Rectangle aRect)
-                        { GetObject(nWert)->aKoll = aRect; }
-        void        SetDelete(long nWert) { GetObject(nWert)->bDelete = TRUE; }
-        void        RemoveBomben();
-        void        SetSpeed(long nWert) { nSpeed = nWert; }
-        void        ClearAll();
-        BOOL        Kollision(Rectangle aRect, Explosion* pExpl);
-};
-
-enum WallMode { WALL_MOD1, WALL_MOD2, WALL_MOD3, WALL_MOD4,  WALL_MOD5,
-                 WALL_MOD6, WALL_MOD7, WALL_MOD8, WALL_MOD9, WALL_MOD10,
-                 WALL_DEL };
-struct Wall_Impl
-{
-    Point           aXY;
-    WallMode        eMode;
-};
-
-DECLARE_LIST(WallListe, Wall_Impl*)
-
-class Wall : public WallListe
-{
-    private:
-        Image*      pWall1;
-        Image*      pWall2;
-        Image*      pWall3;
-        Image*      pWall4;
-        Image*      pWall5;
-        Image*      pWall6;
-        Image*      pWall7;
-        Image*      pWall8;
-        Image*      pWall9;
-        Image*      pWall10;
-        Size        aSize;
-
-    public:
-                    Wall(ResMgr* pRes);
-                    ~Wall();
-
-        void        Paint(OutputDevice& pDev);
-        WallMode    GetMode(long nWert) { return GetObject(nWert)->eMode; }
-        void        SetMode(long nWert, enum WallMode Mode)
-                        { GetObject(nWert)->eMode = Mode; }
-        Point       GetPoint(long nWert) { return GetObject(nWert)->aXY; }
-        void        InsertWall(const Point& rPoint);
-        void        ClearAll();
-        BOOL        Kollision(Rectangle& rRect, BOOL bDel);
-};
-
-#endif
diff --git a/goodies/source/inv/strings.hrc b/goodies/source/inv/strings.hrc
deleted file mode 100644
index 968f84471263..000000000000
--- a/goodies/source/inv/strings.hrc
+++ /dev/null
@@ -1,57 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: strings.hrc,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.
- *
- ************************************************************************/
-#define STR_BASE                7000
-#define STR_APP_TITLE           (STR_BASE+1)
-#define STR_HERO1               (STR_BASE+2)
-#define STR_HERO2               (STR_BASE+3)
-#define STR_HERO3               (STR_BASE+4)
-#define STR_HERO4               (STR_BASE+5)
-#define STR_HERO5               (STR_BASE+6)
-#define STR_LEVELSTART          (STR_BASE+7)
-#define STR_NAME1               (STR_BASE+8)
-#define STR_NAME2               (STR_BASE+9)
-#define STR_NAME3               (STR_BASE+10)
-#define STR_NAME4               (STR_BASE+11)
-#define STR_NAME5               (STR_BASE+12)
-#define STR_ROCKETS             (STR_BASE+13)
-#define STR_FIGHTER             (STR_BASE+14)
-#define STR_SCORE               (STR_BASE+15)
-#define STR_LEVEL               (STR_BASE+16)
-#define STR_GRAT1               (STR_BASE+17)
-#define STR_GRAT2               (STR_BASE+18)
-#define STR_FIGHTDEST1          (STR_BASE+19)
-#define STR_FIGHTDEST2          (STR_BASE+20)
-#define STR_GAMEOVER            (STR_BASE+21)
-#define STR_HIGHSCORE1          (STR_BASE+22)
-#define STR_HIGHSCORE2          (STR_BASE+23)
-#define STR_HIGHSCORE3          (STR_BASE+24)
-#define STR_PAUSE               (STR_BASE+25)
-#define STR_CHOOSEHERO          (STR_BASE+26)
-
diff --git a/goodies/source/inv/strings.src b/goodies/source/inv/strings.src
deleted file mode 100644
index 2a5f712da55c..000000000000
--- a/goodies/source/inv/strings.src
+++ /dev/null
@@ -1,136 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: strings.src,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.
- *
- ************************************************************************/
-
-
-#include "strings.hrc"
-
-String STR_APP_TITLE {
-            Text = "StarWars Galaxy (c)96 by Updaters / TRI & NF";
-};
-
-String STR_HERO1 {
-            Text = "Eine gute Wahl!\n\nTriminatoren sind Spezialisten in\nder Bekämpfung tötlicher CXXe.";
-};
-
-String STR_HERO2 {
-            Text = "Weise entschieden!\n\nHuge Jelly Stars bekämpfen wirkungsvoll\ngefährliche Makefiles!";
-};
-
-String STR_HERO3 {
-            Text = "Zu dieser Entscheidung ist zu gratulieren!\n\nMega Hunter bekämpfen alles immer überall!";
-};
-
-String STR_HERO4 {
-            Text = "Gut gewählt!\n\nNatural Fighter vernichten gerne tötliche HXXe!";
-};
-
-String STR_HERO5 {
-            Text = "Excellen entschieden!\n\nOverkill GunFighter optimieren jeden Einsatz wirkungsvoll!";
-};
-
-String STR_LEVELSTART {
-            Text = "START LEVEL";
-};
-
-String STR_NAME1 {
-            Text = "Triminator";
-};
-
-String STR_NAME2 {
-            Text = "Huge Jelly Star";
-};
-
-String STR_NAME3 {
-            Text = "Mega Hunter";
-};
-
-String STR_NAME4 {
-            Text = "Natural Fighter";
-};
-
-String STR_NAME5 {
-            Text = "Overkill GunFighter";
-};
-
-String STR_ROCKETS {
-            Text = "Rockets";
-};
-
-String STR_FIGHTER {
-            Text = "Fighter";
-};
-
-String STR_SCORE {
-            Text = "Score";
-};
-
-String STR_LEVEL {
-            Text = "Level";
-};
-
-String STR_GRAT1 {
-            Text = "Gratuliere !!\nSie haben das ";
-};
-
-String STR_GRAT2 {
-            Text = ". Geschwader vernichtet!!\n\nSie erhalten den Orden des inkompatiblen Updates am roten Band!";
-};
-
-String STR_FIGHTDEST1 {
-            Text = "Tod und Teufel !!\n\nIhr Fighter wurde terminiert!\nVerbleibende Waffensysteme im Basislager: ";
-};
-
-String STR_FIGHTDEST2 {
-            Text = "\nViel Glück....";
-};
-
-String STR_GAMEOVER {
-            Text = "Tödlicher Fehler !!\n\nIhr Fighter wurde zerstört!\nSie kommen in den Updaterhimmel...\nBegeben Sie sich direkt dorthin,\nziehen Sie nich über Los,\nziehen Sie nicht DM 4000!\n\nGAME OVER!!!";
-};
-
-String STR_HIGHSCORE1 {
-            Text = "Sie sind ja eine ware Vernichtungsmaschine!\n\nSie haben den Highscore geknackt!\n\nNeuer Highscore: ";
-};
-
-String STR_HIGHSCORE2 {
-            Text = " Punkte\nAlter Highscore: ";
-};
-
-String STR_HIGHSCORE3 {
-            Text = " Punkte";
-};
-
-String STR_PAUSE {
-            Text = " Spiel wegen wichtiger Mussänderung unterbrochen... ";
-};
-
-String STR_CHOOSEHERO {
-            Text = "Choose Your Hero ...";
-};
diff --git a/goodies/source/inv/waves.hxx b/goodies/source/inv/waves.hxx
deleted file mode 100644
index 81866effedf0..000000000000
--- a/goodies/source/inv/waves.hxx
+++ /dev/null
@@ -1,121 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: waves.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 _WAVES_HXX
-#define _WAVES_HXX
-
-#include <tools/solar.h>
-
-#define MAX_LEN     250
-#define WAVES       10
-#define RANMAX      60
-
-#ifdef WIN
-#pragma data_seg( "MY_DATA", "DATA" )
-#endif
-
-USHORT ranpos[RANMAX*2+1] =
-{   60,
-    10,20,50,20,90,20,130,20,170,20,210,20,250,20,290,20,330,20,370,20,
-    30,50,70,50,110,50,150,50,190,50,230,50,270,50,310,50,350,50,390,50,
-    10,80,50,80,90,80,130,80,170,80,210,80,250,80,290,80,330,80,370,80,
-    30,110,70,110,110,110,150,110,190,110,230,110,270,110,310,110,350,
-    110,390,110,
-    10,140,50,140,90,140,130,140,170,140,210,140,250,140,290,140,330,140,
-    370,140,
-    30,170,70,170,110,170,150,170,190,170,230,170,270,170,310,170,350,
-    170,390,170
-};
-
-long levelpuf[RANMAX*3+2] =
-{   0, 0, 0, 0, 0};
-
-BYTE waves[WAVES][MAX_LEN] = {
-{ 11, 0, 10, 20, 0, 50, 20, 0, 90, 20, 0, 130, 20, 0, 170, 20,
-    0, 30, 50, 0, 70, 50, 0, 110, 50, 0, 150, 50, 0, 190, 50,
-    4,100, 200,
-    240, 240, 0 },
-{ 12, 1, 10, 20, 1, 50, 20, 1, 90, 20, 1, 130, 20, 1, 170, 20,
-    1, 30, 50, 1, 70, 50, 1, 110, 50, 1, 150, 50, 1, 190, 50,
-    4,80, 200, 4,120,200,
-    15, 15, 15 },
-{ 13, 2, 10, 20, 2, 50, 20, 2, 90, 20, 2, 130, 20, 2, 170, 20,
-    2, 30, 50, 2, 70, 50, 2, 110, 50, 2, 150, 50, 2, 190, 50,
-    4,5,250, 4,100,190, 4,200,230,
-    240, 240, 0 },
-{ 14, 3, 10, 20, 3, 50, 20, 3, 90, 20, 3, 130, 20, 3, 170, 20,
-    3, 30, 50, 3, 70, 50, 3, 110, 50, 3, 150, 50, 3, 190, 50,
-    4, 10,190, 4,50,240, 4,120,250, 4, 180,210,
-    15, 15, 15 },
-{ 25, 0, 10, 50, 0, 10, 90, 0, 10, 130,
-      1, 50, 30, 1, 50, 70, 1, 50, 110,
-      2, 90, 10, 1, 90, 50, 2, 90, 90,
-      3,130, 10, 3,130, 50, 3,130, 90,
-      2,170, 10, 1,170, 50, 2,170, 90,
-      1,210, 30, 1,210, 70, 1,210, 110,
-      0,250, 50, 0,250, 90, 0,250, 130,
-      4, 211, 211, 4, 215, 115, 4, 230,230, 4,198, 210,
-      15, 6, 15 },
-{ 18, 3, 10, 10, 3, 50, 10, 3, 90, 10, 3, 130, 10, 3, 170, 10,
-    2, 30, 50, 2, 70 , 50, 2, 110, 50, 2, 150, 50,
-        4,10,90,1, 50, 90, 1, 90, 90, 1, 130, 90,
-            0, 70, 130, 0, 110, 130,4,150,110,
-                0, 90, 170, 4, 120, 200,
-    240, 255, 0 },
-{ 15, 0, 50, 50, 0, 100, 50, 0, 150, 50, 0, 200, 50, 0, 250, 50,
-    2, 50, 100, 2, 150, 100, 2, 250, 100,
-    3, 100, 150, 3, 200, 150,
-    0, 50, 200, 1, 100, 200, 0, 150, 200, 1, 200, 200, 0, 250 ,200,
-    255, 249, 15 },
-{ 20, 1, 10, 20, 1, 50, 20, 1, 90, 20, 1, 130, 20, 1, 170, 20,
-    1, 30, 50, 1, 70, 50, 1, 110, 50, 1, 150, 50, 1, 190, 50,
-    2, 10, 80, 2, 50, 80, 2, 90, 80, 2, 130, 80, 2, 170, 80,
-    2, 30, 110, 2, 70, 110, 2, 110, 110, 2, 150, 110, 2, 190, 110,
-    240, 240, 0 },
-
-{ 40, 0, 10, 20, 0, 50, 20, 0, 90, 20, 0, 130, 20, 0, 170, 20,
-    0, 30, 50, 0, 70, 50, 0, 110, 50, 0, 150, 50, 0, 190, 50,
-    1, 10, 80, 1, 50, 80, 1, 90, 80, 1, 130, 80, 1, 170, 80,
-    1, 30, 110, 1, 70, 110, 1, 110, 110, 1, 150, 110, 1, 190, 110,
-    2, 10, 140, 2, 50, 140, 2, 90, 140, 2, 130, 140, 2, 170, 140,
-    0, 30, 170, 0, 70, 170, 0, 110, 170, 0, 150, 170, 0, 190, 170,
-    3, 10, 200, 3, 50, 200, 3, 90, 200, 3, 130, 200, 3, 170, 200,
-    0, 30, 230, 0, 70, 230, 0, 110, 230, 0, 150, 230, 0, 190, 230,
-    15, 15, 15 },
-{ 64, 0, 5, 5, 0, 40, 5, 0, 75, 5, 0, 110, 5, 0, 145, 5, 0, 180, 5, 0, 215, 5, 0, 250, 5,
-    0, 5, 40, 0, 40, 40, 0, 75, 40, 0, 110, 40, 0, 145, 40, 0, 180, 40, 0, 215, 40, 0, 250, 40,
-    0, 5, 75, 1, 40, 75, 2, 75, 75, 2, 110, 75, 2, 145, 75, 2, 180, 75, 1, 215, 75, 0, 250, 75,
-    0, 5, 110, 1, 40, 110, 2, 75, 110, 0, 110, 110, 3, 145, 110, 2, 180, 110, 1, 215, 110, 0, 250, 110,
-    0, 5, 145, 1, 40, 145, 2, 75, 145, 3, 110, 145, 0, 145, 145, 2, 180, 145, 1, 215, 145, 0, 250, 145,
-    0, 5, 180, 1, 40, 180, 2, 75, 180, 2, 110, 180, 2, 145, 180, 2, 180, 180, 1, 215, 180, 0, 250, 180,
-    0, 5, 215, 0, 40, 215, 0, 75, 215, 0, 110, 215, 0, 145, 215, 0, 180, 215, 0, 215, 215, 0, 250, 215,
-    0, 5, 250, 0, 40, 250, 0, 75, 250, 0, 110, 250, 0, 145, 250, 0, 180, 250, 0, 215, 250, 0, 250, 250,
-    255, 255, 255 },
-};
-#endif
diff --git a/goodies/source/unographic/graphicuno.cxx b/goodies/source/unographic/graphicuno.cxx
deleted file mode 100755
index b47f04034336..000000000000
--- a/goodies/source/unographic/graphicuno.cxx
+++ /dev/null
@@ -1,169 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: graphicuno.cxx,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.
- *
- ************************************************************************/
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#include <osl/diagnose.h>
-#include <cppuhelper/factory.hxx>
-#include <uno/mapping.hxx>
-#include "provider.hxx"
-#include "renderer.hxx"
-
-#include <com/sun/star/registry/XRegistryKey.hpp>
-#include "comphelper/servicedecl.hxx"
-
-using namespace com::sun::star;
-namespace sdecl = comphelper::service_decl;
-
-namespace unographic {
-extern sdecl::ServiceDecl const serviceDecl;
-// --------------------
-// - *_createInstance -
-// --------------------
-
-static uno::Reference< uno::XInterface > SAL_CALL GraphicProvider_createInstance( const uno::Reference< lang::XMultiServiceFactory >& )
-{
-    return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicProvider );
-}
-
-// -----------------------------------------------------------------------------
-
-static uno::Reference< uno::XInterface > SAL_CALL GraphicRendererVCL_createInstance( const uno::Reference< lang::XMultiServiceFactory >&)
-{
-    return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicRendererVCL );
-}
-
-// ------------------------------------------
-// - component_getImplementationEnvironment -
-// ------------------------------------------
-
-extern "C" void SAL_CALL component_getImplementationEnvironment( const sal_Char** ppEnvTypeName, uno_Environment** )
-{
-    *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-}
-
-// -----------------------
-// - component_writeInfo -
-// -----------------------
-
-extern "C" sal_Bool SAL_CALL component_writeInfo( void* pServiceManager, void* pRegistryKey )
-{
-    sal_Bool bRet = sal_False;
-
-    if( pRegistryKey )
-    {
-        try
-        {
-            uno::Reference< registry::XRegistryKey >    xNewKey;
-            uno::Sequence< ::rtl::OUString >            aServices;
-
-            // GraphicProvider
-            xNewKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey )->createKey(
-                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                        GraphicProvider::getImplementationName_Static() +
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-            aServices = GraphicProvider::getSupportedServiceNames_Static();
-
-            int i;
-            for( i = 0; i < aServices.getLength(); i++ )
-                xNewKey->createKey( aServices.getConstArray()[ i ] );
-
-            // GraphicRendererVCL
-            xNewKey = reinterpret_cast< registry::XRegistryKey * >( pRegistryKey )->createKey(
-                        ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
-                        GraphicRendererVCL::getImplementationName_Static() +
-                        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
-
-            aServices = ( GraphicRendererVCL::getSupportedServiceNames_Static() );
-
-            for( i = 0; i < aServices.getLength(); i++ )
-                xNewKey->createKey( aServices.getConstArray()[ i ] );
-
-               if ( !component_writeInfoHelper( reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ), reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ), serviceDecl ) )
-                return false;
-
-            bRet = true;
-        }
-        catch (registry::InvalidRegistryException &)
-        {
-            OSL_ENSURE( sal_False, "### InvalidRegistryException!" );
-        }
-    }
-
-    return bRet;
-}
-
-// ------------------------
-// - component_getFactory -
-// ------------------------
-
-extern "C" void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* pRegistryKey )
-{
-    void * pRet = 0;
-
-    if( pServiceManager && ( 0 == GraphicProvider::getImplementationName_Static().compareToAscii( pImplName ) ) )
-    {
-        uno::Reference< lang::XSingleServiceFactory > xFactory( ::cppu::createOneInstanceFactory(
-            reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
-            GraphicProvider::getImplementationName_Static(),
-            GraphicProvider_createInstance,
-            GraphicProvider::getSupportedServiceNames_Static() ) );
-
-        if( xFactory.is())
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-    else if( pServiceManager && ( 0 == GraphicRendererVCL::getImplementationName_Static().compareToAscii( pImplName ) ) )
-    {
-        uno::Reference< lang::XSingleServiceFactory > xFactory( ::cppu::createOneInstanceFactory(
-            reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),
-            GraphicRendererVCL::getImplementationName_Static(),
-            GraphicRendererVCL_createInstance,
-            GraphicRendererVCL::getSupportedServiceNames_Static() ) );
-
-        if( xFactory.is())
-        {
-            xFactory->acquire();
-            pRet = xFactory.get();
-        }
-    }
-    else
-    {
-        pRet =  component_getFactoryHelper( pImplName, reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ),reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ), serviceDecl );
-
-    }
-    return pRet;
-}
-
-}
diff --git a/goodies/util/goodies.dxp b/goodies/util/goodies.dxp
deleted file mode 100755
index 9630d7e06768..000000000000
--- a/goodies/util/goodies.dxp
+++ /dev/null
@@ -1,3 +0,0 @@
-component_getImplementationEnvironment
-component_writeInfo
-component_getFactory
diff --git a/goodies/util/makefile.mk b/goodies/util/makefile.mk
deleted file mode 100644
index dc5d9566ea8a..000000000000
--- a/goodies/util/makefile.mk
+++ /dev/null
@@ -1,105 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.12 $
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=goodies
-TARGET=go
-
-#goodies.hid generieren
-GEN_HID=TRUE
-
-# --- Settings ---------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Allgemein ---------------------------------------------------
-.IF "$(L10N_framework)"==""
-
-LIB1TARGET=$(SLB)$/go.lib
-LIB1FILES=\
-    $(SLB)$/base3d.lib	\
-    $(SLB)$/graphic.lib \
-    $(SLB)$/unographic.lib	
-
-SHL1TARGET= go$(DLLPOSTFIX)
-SHL1IMPLIB= igo
-
-SHL1STDLIBS=\
-        $(BASEGFXLIB)		\
-        $(VCLLIB)			\
-        $(SVLLIB)			\
-        $(SVTOOLLIB)		\
-        $(UNOTOOLSLIB)		\
-        $(TOOLSLIB)			\
-        $(SALLIB)			\
-        $(CPPULIB) 			\
-        $(COMPHELPERLIB) 	\
-        $(CPPUHELPERLIB)	\
-        $(BASEGFXLIB)		\
-        $(TKLIB)			
-
-SHL1DEF=	$(MISC)$/$(SHL1TARGET).def
-SHL1LIBS=	$(SLB)$/go.lib
-
-DEF1NAME	=$(SHL1TARGET)
-DEF1DEPN	=$(MISC)$/$(SHL1TARGET).flt \
-        $(LIB1TARGET)
-DEF1DES		=Goodies
-DEFLIB1NAME	=go
-DEF1EXPORTFILE	=goodies.dxp
-
-# THB: exports list goodies checked for 6.0 Final 6.12.2001
-# Note: explicit exports only necessary for VCL graphic filters (see there)
-.ENDIF
-
-# --- Targets -----------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(depend)"==""
-
-# --- Goodies-Filter-Datei ---
-.IF "$(L10N_framework)"==""
-
-$(MISC)$/$(SHL1TARGET).flt: makefile.mk
-    @echo ------------------------------
-    @echo Making: $@
-        @echo _Impl>$@
-    @echo WEP>>$@
-        @echo m_pLoader>$@
-    @echo LIBMAIN>>$@
-    @echo LibMain>>$@
-        @echo CT>>$@
-
-.ENDIF
-
-.ENDIF
diff --git a/goodies/util/shelp.ico b/goodies/util/shelp.ico
deleted file mode 100644
index 34afa8928737..000000000000
--- a/goodies/util/shelp.ico
+++ /dev/null
diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx
index 70057397d2e5..ad49d9f13027 100644
--- a/i18npool/inc/breakiteratorImpl.hxx
+++ b/i18npool/inc/breakiteratorImpl.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: breakiteratorImpl.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/i18npool/inc/breakiterator_cjk.hxx b/i18npool/inc/breakiterator_cjk.hxx
index 8a1ec419324c..e94dd7cd0534 100644
--- a/i18npool/inc/breakiterator_cjk.hxx
+++ b/i18npool/inc/breakiterator_cjk.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: breakiterator_cjk.hxx,v $
- * $Revision: 1.6.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/inc/breakiterator_ctl.hxx b/i18npool/inc/breakiterator_ctl.hxx
index 3e687b5e8e68..17661614ab7b 100644
--- a/i18npool/inc/breakiterator_ctl.hxx
+++ b/i18npool/inc/breakiterator_ctl.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: breakiterator_ctl.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/i18npool/inc/breakiterator_th.hxx b/i18npool/inc/breakiterator_th.hxx
index e7af7338170a..cba8bd2440de 100644
--- a/i18npool/inc/breakiterator_th.hxx
+++ b/i18npool/inc/breakiterator_th.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: breakiterator_th.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/i18npool/inc/breakiterator_unicode.hxx b/i18npool/inc/breakiterator_unicode.hxx
index 654df424b237..53600c0cb3ae 100644
--- a/i18npool/inc/breakiterator_unicode.hxx
+++ b/i18npool/inc/breakiterator_unicode.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: breakiterator_unicode.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/i18npool/inc/bullet.h b/i18npool/inc/bullet.h
index 720b96ae9274..6a0b945d2de0 100644
--- a/i18npool/inc/bullet.h
+++ b/i18npool/inc/bullet.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: bullet.h,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/i18npool/inc/calendarImpl.hxx b/i18npool/inc/calendarImpl.hxx
index 9c62c935d11c..8ba8d6caec34 100644
--- a/i18npool/inc/calendarImpl.hxx
+++ b/i18npool/inc/calendarImpl.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: calendarImpl.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/i18npool/inc/calendar_gregorian.hxx b/i18npool/inc/calendar_gregorian.hxx
index 3af095cc7959..2d32c7a75348 100644
--- a/i18npool/inc/calendar_gregorian.hxx
+++ b/i18npool/inc/calendar_gregorian.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: calendar_gregorian.hxx,v $
- * $Revision: 1.16.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/inc/calendar_hijri.hxx b/i18npool/inc/calendar_hijri.hxx
index bd10985aaad2..d9f4be232671 100644
--- a/i18npool/inc/calendar_hijri.hxx
+++ b/i18npool/inc/calendar_hijri.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: calendar_hijri.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/i18npool/inc/calendar_jewish.hxx b/i18npool/inc/calendar_jewish.hxx
index 1af374192558..23e207389bc0 100644
--- a/i18npool/inc/calendar_jewish.hxx
+++ b/i18npool/inc/calendar_jewish.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: calendar_jewish.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/i18npool/inc/cclass_cjk.hxx b/i18npool/inc/cclass_cjk.hxx
index b294d391d2de..9619d5f7d39c 100644
--- a/i18npool/inc/cclass_cjk.hxx
+++ b/i18npool/inc/cclass_cjk.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: cclass_cjk.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/i18npool/inc/cclass_unicode.hxx b/i18npool/inc/cclass_unicode.hxx
index 3b56902394c3..60f28748b584 100644
--- a/i18npool/inc/cclass_unicode.hxx
+++ b/i18npool/inc/cclass_unicode.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: cclass_unicode.hxx,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/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx
index 8bb059b1c903..e47fbd184c26 100644
--- a/i18npool/inc/chaptercollator.hxx
+++ b/i18npool/inc/chaptercollator.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: chaptercollator.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/i18npool/inc/characterclassificationImpl.hxx b/i18npool/inc/characterclassificationImpl.hxx
index 80bf099f9d3d..0292507a379a 100644
--- a/i18npool/inc/characterclassificationImpl.hxx
+++ b/i18npool/inc/characterclassificationImpl.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: characterclassificationImpl.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/i18npool/inc/chartonum.hxx b/i18npool/inc/chartonum.hxx
index 06e8c1249c0d..5f2e8fdd55e5 100644
--- a/i18npool/inc/chartonum.hxx
+++ b/i18npool/inc/chartonum.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: chartonum.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/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx
index 4e51ac3e2c25..7e4192553183 100644
--- a/i18npool/inc/collatorImpl.hxx
+++ b/i18npool/inc/collatorImpl.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: collatorImpl.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/i18npool/inc/collator_unicode.hxx b/i18npool/inc/collator_unicode.hxx
index bc472d695527..312f41cb1793 100644
--- a/i18npool/inc/collator_unicode.hxx
+++ b/i18npool/inc/collator_unicode.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: collator_unicode.hxx,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/i18npool/inc/defaultnumberingprovider.hxx b/i18npool/inc/defaultnumberingprovider.hxx
index 2bfc9e707d69..1d9a319ac12c 100644
--- a/i18npool/inc/defaultnumberingprovider.hxx
+++ b/i18npool/inc/defaultnumberingprovider.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: defaultnumberingprovider.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/i18npool/inc/i18npool/i18npooldllapi.h b/i18npool/inc/i18npool/i18npooldllapi.h
index 45ff77c198bb..581352ef3fa2 100644
--- a/i18npool/inc/i18npool/i18npooldllapi.h
+++ b/i18npool/inc/i18npool/i18npooldllapi.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: i18npooldllapi.h,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/i18npool/inc/i18npool/lang.h b/i18npool/inc/i18npool/lang.h
index 0b393cdfb5a9..8599ec75c634 100644
--- a/i18npool/inc/i18npool/lang.h
+++ b/i18npool/inc/i18npool/lang.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: lang.h,v $
- * $Revision: 1.12.24.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/inc/i18npool/mslangid.hxx b/i18npool/inc/i18npool/mslangid.hxx
index 27688cd995dc..61f526a7f370 100644
--- a/i18npool/inc/i18npool/mslangid.hxx
+++ b/i18npool/inc/i18npool/mslangid.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: mslangid.hxx,v $
- * $Revision: 1.5.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/inc/i18npool/paper.hxx b/i18npool/inc/i18npool/paper.hxx
index 5690a8fe7254..76aebbe473d5 100644
--- a/i18npool/inc/i18npool/paper.hxx
+++ b/i18npool/inc/i18npool/paper.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$
+ * 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/i18npool/inc/indexentrysupplier.hxx b/i18npool/inc/indexentrysupplier.hxx
index e7e2e8670374..11395cce8bf6 100644
--- a/i18npool/inc/indexentrysupplier.hxx
+++ b/i18npool/inc/indexentrysupplier.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: indexentrysupplier.hxx,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/i18npool/inc/indexentrysupplier_asian.hxx b/i18npool/inc/indexentrysupplier_asian.hxx
index e1b3e6c3da43..42ab05eda04d 100644
--- a/i18npool/inc/indexentrysupplier_asian.hxx
+++ b/i18npool/inc/indexentrysupplier_asian.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: indexentrysupplier_asian.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/i18npool/inc/indexentrysupplier_common.hxx b/i18npool/inc/indexentrysupplier_common.hxx
index 214e9921547c..eae97f019237 100644
--- a/i18npool/inc/indexentrysupplier_common.hxx
+++ b/i18npool/inc/indexentrysupplier_common.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: indexentrysupplier_common.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/i18npool/inc/indexentrysupplier_default.hxx b/i18npool/inc/indexentrysupplier_default.hxx
index 8fd1b2d651ac..eae78f5c576d 100644
--- a/i18npool/inc/indexentrysupplier_default.hxx
+++ b/i18npool/inc/indexentrysupplier_default.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: indexentrysupplier_default.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/i18npool/inc/indexentrysupplier_ja_phonetic.hxx b/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
index baf02ec8f6c8..3b5faa823153 100644
--- a/i18npool/inc/indexentrysupplier_ja_phonetic.hxx
+++ b/i18npool/inc/indexentrysupplier_ja_phonetic.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: indexentrysupplier_ja_phonetic.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/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx
index 4d529f8fcd0a..84d1b4938d1b 100644
--- a/i18npool/inc/inputsequencechecker.hxx
+++ b/i18npool/inc/inputsequencechecker.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: inputsequencechecker.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/i18npool/inc/inputsequencechecker_hi.hxx b/i18npool/inc/inputsequencechecker_hi.hxx
index 432f5cc3199b..4f0e4a7e2cb6 100644
--- a/i18npool/inc/inputsequencechecker_hi.hxx
+++ b/i18npool/inc/inputsequencechecker_hi.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: inputsequencechecker_hi.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/i18npool/inc/inputsequencechecker_th.hxx b/i18npool/inc/inputsequencechecker_th.hxx
index 153fdbbd916e..979740626682 100644
--- a/i18npool/inc/inputsequencechecker_th.hxx
+++ b/i18npool/inc/inputsequencechecker_th.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: inputsequencechecker_th.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/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx
index 37a643cac392..327d0f5bd55b 100644
--- a/i18npool/inc/localedata.hxx
+++ b/i18npool/inc/localedata.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: localedata.hxx,v $
- * $Revision: 1.20.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/inc/makefile.mk b/i18npool/inc/makefile.mk
index dcc68880942f..3195ab22fbaf 100644
--- a/i18npool/inc/makefile.mk
+++ b/i18npool/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/inc/nativenumbersupplier.hxx b/i18npool/inc/nativenumbersupplier.hxx
index a7aab0a70efb..9054f0b67851 100644
--- a/i18npool/inc/nativenumbersupplier.hxx
+++ b/i18npool/inc/nativenumbersupplier.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: nativenumbersupplier.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/i18npool/inc/numberformatcode.hxx b/i18npool/inc/numberformatcode.hxx
index 1e4bb0f46933..eeefba3a7c27 100644
--- a/i18npool/inc/numberformatcode.hxx
+++ b/i18npool/inc/numberformatcode.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: numberformatcode.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/i18npool/inc/numtochar.hxx b/i18npool/inc/numtochar.hxx
index 6e773d407641..8c8f307d9c1d 100644
--- a/i18npool/inc/numtochar.hxx
+++ b/i18npool/inc/numtochar.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: numtochar.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/i18npool/inc/numtotext_cjk.hxx b/i18npool/inc/numtotext_cjk.hxx
index 622d19196a3c..9d266af17774 100644
--- a/i18npool/inc/numtotext_cjk.hxx
+++ b/i18npool/inc/numtotext_cjk.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: numtotext_cjk.hxx,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/i18npool/inc/ordinalsuffix.hxx b/i18npool/inc/ordinalsuffix.hxx
index 69a88ec84645..4be7bbe74ff3 100644
--- a/i18npool/inc/ordinalsuffix.hxx
+++ b/i18npool/inc/ordinalsuffix.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: ordinalsuffix.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/i18npool/inc/pch/precompiled_i18npool.cxx b/i18npool/inc/pch/precompiled_i18npool.cxx
index d460ef2f1158..5abba95233d3 100644
--- a/i18npool/inc/pch/precompiled_i18npool.cxx
+++ b/i18npool/inc/pch/precompiled_i18npool.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: precompiled_i18npool.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/i18npool/inc/pch/precompiled_i18npool.hxx b/i18npool/inc/pch/precompiled_i18npool.hxx
index cf4f141a3ec5..dd53267e0b0d 100644
--- a/i18npool/inc/pch/precompiled_i18npool.hxx
+++ b/i18npool/inc/pch/precompiled_i18npool.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_i18npool.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/i18npool/inc/scripttypedetector.hxx b/i18npool/inc/scripttypedetector.hxx
index 46618e5deb0f..3ae841a4175b 100644
--- a/i18npool/inc/scripttypedetector.hxx
+++ b/i18npool/inc/scripttypedetector.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: scripttypedetector.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/i18npool/inc/servicename.hxx b/i18npool/inc/servicename.hxx
index 787e0c355d6c..605a9e2e5390 100644
--- a/i18npool/inc/servicename.hxx
+++ b/i18npool/inc/servicename.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: servicename.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/i18npool/inc/textToPronounce_zh.hxx b/i18npool/inc/textToPronounce_zh.hxx
index 9bc174840d5e..e1452606d28f 100644
--- a/i18npool/inc/textToPronounce_zh.hxx
+++ b/i18npool/inc/textToPronounce_zh.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: textToPronounce_zh.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/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx
index b870df55c9f1..9cdc8a9b75e2 100644
--- a/i18npool/inc/textconversion.hxx
+++ b/i18npool/inc/textconversion.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: textconversion.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/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx
index 5baef3bb0c70..cd7a15778a78 100644
--- a/i18npool/inc/textconversionImpl.hxx
+++ b/i18npool/inc/textconversionImpl.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: textconversionImpl.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/i18npool/inc/texttonum.hxx b/i18npool/inc/texttonum.hxx
index ac3d9f657120..c9018f69a334 100644
--- a/i18npool/inc/texttonum.hxx
+++ b/i18npool/inc/texttonum.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: texttonum.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/i18npool/inc/transliterationImpl.hxx b/i18npool/inc/transliterationImpl.hxx
index 95af5ce98568..a50d7cd4e98e 100644
--- a/i18npool/inc/transliterationImpl.hxx
+++ b/i18npool/inc/transliterationImpl.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: transliterationImpl.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/i18npool/inc/transliteration_Ignore.hxx b/i18npool/inc/transliteration_Ignore.hxx
index 8c8a12d7e441..68201ca5901c 100644
--- a/i18npool/inc/transliteration_Ignore.hxx
+++ b/i18npool/inc/transliteration_Ignore.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: transliteration_Ignore.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/i18npool/inc/transliteration_Numeric.hxx b/i18npool/inc/transliteration_Numeric.hxx
index a3fa5b61663a..76ffd3661a8a 100644
--- a/i18npool/inc/transliteration_Numeric.hxx
+++ b/i18npool/inc/transliteration_Numeric.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: transliteration_Numeric.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/i18npool/inc/transliteration_OneToOne.hxx b/i18npool/inc/transliteration_OneToOne.hxx
index f2f666a07936..dbe37a1ebe05 100644
--- a/i18npool/inc/transliteration_OneToOne.hxx
+++ b/i18npool/inc/transliteration_OneToOne.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: transliteration_OneToOne.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/i18npool/inc/transliteration_body.hxx b/i18npool/inc/transliteration_body.hxx
index 518f4efd0d2f..a03b61a90194 100644
--- a/i18npool/inc/transliteration_body.hxx
+++ b/i18npool/inc/transliteration_body.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: transliteration_body.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/i18npool/inc/transliteration_caseignore.hxx b/i18npool/inc/transliteration_caseignore.hxx
index 12c8f7487ce0..493a01c46f18 100644
--- a/i18npool/inc/transliteration_caseignore.hxx
+++ b/i18npool/inc/transliteration_caseignore.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: transliteration_caseignore.hxx,v $
- * $Revision: 1.5.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/inc/transliteration_commonclass.hxx b/i18npool/inc/transliteration_commonclass.hxx
index 608704ae5b7c..57de252f1721 100644
--- a/i18npool/inc/transliteration_commonclass.hxx
+++ b/i18npool/inc/transliteration_commonclass.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: transliteration_commonclass.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/i18npool/inc/warnings_guard_unicode_brkiter.h b/i18npool/inc/warnings_guard_unicode_brkiter.h
index d1137e5b6b86..50ede3b3bab9 100644
--- a/i18npool/inc/warnings_guard_unicode_brkiter.h
+++ b/i18npool/inc/warnings_guard_unicode_brkiter.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: warnings_guard_unicode_brkiter.h,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/i18npool/inc/warnings_guard_unicode_calendar.h b/i18npool/inc/warnings_guard_unicode_calendar.h
index 83bc4e11aa7d..8ea632da2bc5 100644
--- a/i18npool/inc/warnings_guard_unicode_calendar.h
+++ b/i18npool/inc/warnings_guard_unicode_calendar.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: warnings_guard_unicode_calendar.h,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/i18npool/inc/warnings_guard_unicode_tblcoll.h b/i18npool/inc/warnings_guard_unicode_tblcoll.h
index c50868dfc005..4c4b80e58324 100644
--- a/i18npool/inc/warnings_guard_unicode_tblcoll.h
+++ b/i18npool/inc/warnings_guard_unicode_tblcoll.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: warnings_guard_unicode_tblcoll.h,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/i18npool/inc/wtt.h b/i18npool/inc/wtt.h
index 1357c9bd0892..a299f38093ba 100644
--- a/i18npool/inc/wtt.h
+++ b/i18npool/inc/wtt.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: wtt.h,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/i18npool/inc/xdictionary.hxx b/i18npool/inc/xdictionary.hxx
index ac2005c9f397..99a52b6ea1b0 100644
--- a/i18npool/inc/xdictionary.hxx
+++ b/i18npool/inc/xdictionary.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: xdictionary.hxx,v $
- * $Revision: 1.7.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 0a75e642f240..e4e08d42df43 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.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: breakiteratorImpl.cxx,v $
- * $Revision: 1.27.4.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/breakiterator/breakiterator_cjk.cxx b/i18npool/source/breakiterator/breakiterator_cjk.cxx
index 9d690469067a..16d7d1337538 100644
--- a/i18npool/source/breakiterator/breakiterator_cjk.cxx
+++ b/i18npool/source/breakiterator/breakiterator_cjk.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: breakiterator_cjk.cxx,v $
- * $Revision: 1.17.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/breakiterator/breakiterator_ctl.cxx b/i18npool/source/breakiterator/breakiterator_ctl.cxx
index 0e1bee869cac..cc174084198e 100644
--- a/i18npool/source/breakiterator/breakiterator_ctl.cxx
+++ b/i18npool/source/breakiterator/breakiterator_ctl.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: breakiterator_ctl.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/i18npool/source/breakiterator/breakiterator_th.cxx b/i18npool/source/breakiterator/breakiterator_th.cxx
index 1a0486a56b60..cbbcd510379b 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.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: breakiterator_th.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/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index f0710c996858..d7242d180d85 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.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: breakiterator_unicode.cxx,v $
- * $Revision: 1.36.2.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/breakiterator/data/makefile.mk b/i18npool/source/breakiterator/data/makefile.mk
index ba380babb279..cb37c5132f67 100644
--- a/i18npool/source/breakiterator/data/makefile.mk
+++ b/i18npool/source/breakiterator/data/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/breakiterator/gendict.cxx b/i18npool/source/breakiterator/gendict.cxx
index e10b4baf5e1b..fe2758602ee4 100644
--- a/i18npool/source/breakiterator/gendict.cxx
+++ b/i18npool/source/breakiterator/gendict.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: gendict.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/i18npool/source/breakiterator/makefile.mk b/i18npool/source/breakiterator/makefile.mk
index 50e437e98b91..f3088125ecf1 100644
--- a/i18npool/source/breakiterator/makefile.mk
+++ b/i18npool/source/breakiterator/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.17.16.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/breakiterator/xdictionary.cxx b/i18npool/source/breakiterator/xdictionary.cxx
index add22f39d58e..aba69b5e9a21 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.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: xdictionary.cxx,v $
- * $Revision: 1.18.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx
index b73b36c9944c..2d09d047c7cb 100644
--- a/i18npool/source/calendar/calendarImpl.cxx
+++ b/i18npool/source/calendar/calendarImpl.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: calendarImpl.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/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx
index e52cd4938f2a..727a6f601ba3 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.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: calendar_gregorian.cxx,v $
- * $Revision: 1.34.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx
index 903b17278a1d..dcf651098574 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.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: calendar_hijri.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/i18npool/source/calendar/calendar_jewish.cxx b/i18npool/source/calendar/calendar_jewish.cxx
index 927b10a34deb..34ad13f1d384 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.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: calendar_jewish.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/i18npool/source/calendar/makefile.mk b/i18npool/source/calendar/makefile.mk
index b3b5be95241a..cce0e4950796 100644
--- a/i18npool/source/calendar/makefile.mk
+++ b/i18npool/source/calendar/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx
index 2160c27188f1..045512e61258 100644
--- a/i18npool/source/characterclassification/cclass_unicode.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode.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: cclass_unicode.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/i18npool/source/characterclassification/cclass_unicode_parser.cxx b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 39e925cb7eb9..2abd7eb90539 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.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: cclass_unicode_parser.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/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx
index a47c757f1f44..5665bf654194 100644
--- a/i18npool/source/characterclassification/characterclassificationImpl.cxx
+++ b/i18npool/source/characterclassification/characterclassificationImpl.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: characterclassificationImpl.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/i18npool/source/characterclassification/makefile.mk b/i18npool/source/characterclassification/makefile.mk
index c038c659b49d..7b8bfe98253a 100644
--- a/i18npool/source/characterclassification/makefile.mk
+++ b/i18npool/source/characterclassification/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/characterclassification/scripttypedetector.cxx b/i18npool/source/characterclassification/scripttypedetector.cxx
index ab9633da5c39..cb90e99075e1 100644
--- a/i18npool/source/characterclassification/scripttypedetector.cxx
+++ b/i18npool/source/characterclassification/scripttypedetector.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: scripttypedetector.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/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx
index 0472795887d7..946053c1adee 100644
--- a/i18npool/source/collator/chaptercollator.cxx
+++ b/i18npool/source/collator/chaptercollator.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: chaptercollator.cxx,v $
- * $Revision: 1.11.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/collator/collatorImpl.cxx b/i18npool/source/collator/collatorImpl.cxx
index 39b637a4a1c8..bdd28a255d07 100644
--- a/i18npool/source/collator/collatorImpl.cxx
+++ b/i18npool/source/collator/collatorImpl.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: collatorImpl.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/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx
index 40826c3c3184..2494829968d6 100644
--- a/i18npool/source/collator/collator_unicode.cxx
+++ b/i18npool/source/collator/collator_unicode.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: collator_unicode.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/i18npool/source/collator/data/makefile.mk b/i18npool/source/collator/data/makefile.mk
index bdf802adc94d..2dd7623bd38d 100644
--- a/i18npool/source/collator/data/makefile.mk
+++ b/i18npool/source/collator/data/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/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
index c14b068efeca..09c1da0729ec 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.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: gencoll_rule.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/i18npool/source/collator/makefile.mk b/i18npool/source/collator/makefile.mk
index b38386d53de0..654b857b7d25 100644
--- a/i18npool/source/collator/makefile.mk
+++ b/i18npool/source/collator/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.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 91d856b19e62..751116160ebe 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.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: defaultnumberingprovider.cxx,v $
- * $Revision: 1.30.24.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/defaultnumberingprovider/makefile.mk b/i18npool/source/defaultnumberingprovider/makefile.mk
index 434fa5f9fefc..daf640879969 100644
--- a/i18npool/source/defaultnumberingprovider/makefile.mk
+++ b/i18npool/source/defaultnumberingprovider/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/indexentry/data/indexdata_alphanumeric.h b/i18npool/source/indexentry/data/indexdata_alphanumeric.h
index f37bd926c7eb..db3979d84ca4 100644
--- a/i18npool/source/indexentry/data/indexdata_alphanumeric.h
+++ b/i18npool/source/indexentry/data/indexdata_alphanumeric.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: indexdata_alphanumeric.h,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/i18npool/source/indexentry/data/indexdata_ja_phonetic.h b/i18npool/source/indexentry/data/indexdata_ja_phonetic.h
index d0873b359229..a09a35ec1478 100644
--- a/i18npool/source/indexentry/data/indexdata_ja_phonetic.h
+++ b/i18npool/source/indexentry/data/indexdata_ja_phonetic.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: indexdata_ja_phonetic.h,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/i18npool/source/indexentry/data/makefile.mk b/i18npool/source/indexentry/data/makefile.mk
index 6149bbd8b12a..8f698e3dbe2d 100644
--- a/i18npool/source/indexentry/data/makefile.mk
+++ b/i18npool/source/indexentry/data/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/i18npool/source/indexentry/genindex_data.cxx b/i18npool/source/indexentry/genindex_data.cxx
index 6857e8d1b4d0..91f9725f493f 100644
--- a/i18npool/source/indexentry/genindex_data.cxx
+++ b/i18npool/source/indexentry/genindex_data.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: genindex_data.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/i18npool/source/indexentry/indexentrysupplier.cxx b/i18npool/source/indexentry/indexentrysupplier.cxx
index 988c1ead09d5..3321559e478f 100644
--- a/i18npool/source/indexentry/indexentrysupplier.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier.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: indexentrysupplier.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/i18npool/source/indexentry/indexentrysupplier_asian.cxx b/i18npool/source/indexentry/indexentrysupplier_asian.cxx
index a117d4dae4aa..cbe55a9832e0 100644
--- a/i18npool/source/indexentry/indexentrysupplier_asian.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_asian.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: indexentrysupplier_asian.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/i18npool/source/indexentry/indexentrysupplier_common.cxx b/i18npool/source/indexentry/indexentrysupplier_common.cxx
index 0447f0230af8..24964906c18b 100644
--- a/i18npool/source/indexentry/indexentrysupplier_common.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_common.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: indexentrysupplier_common.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/i18npool/source/indexentry/indexentrysupplier_default.cxx b/i18npool/source/indexentry/indexentrysupplier_default.cxx
index 09fc96e18002..7de3f540eaa7 100644
--- a/i18npool/source/indexentry/indexentrysupplier_default.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_default.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: indexentrysupplier_default.cxx,v $
- * $Revision: 1.14.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
index 5c2c42b6b906..bfc23d100ea3 100644
--- a/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.cxx
+++ b/i18npool/source/indexentry/indexentrysupplier_ja_phonetic.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: indexentrysupplier_ja_phonetic.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/i18npool/source/indexentry/makefile.mk b/i18npool/source/indexentry/makefile.mk
index 770fe062c688..6b4ea3ed5ff2 100644
--- a/i18npool/source/indexentry/makefile.mk
+++ b/i18npool/source/indexentry/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.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx
index 9b71a27f7acd..946cdd07064d 100644
--- a/i18npool/source/inputchecker/inputsequencechecker.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker.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: inputsequencechecker.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/i18npool/source/inputchecker/inputsequencechecker_hi.cxx b/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
index 0c449a9f6061..a265ef0a651e 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_hi.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_hi.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: inputsequencechecker_hi.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/i18npool/source/inputchecker/inputsequencechecker_th.cxx b/i18npool/source/inputchecker/inputsequencechecker_th.cxx
index 815431368237..d4956c9758ea 100644
--- a/i18npool/source/inputchecker/inputsequencechecker_th.cxx
+++ b/i18npool/source/inputchecker/inputsequencechecker_th.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: inputsequencechecker_th.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/i18npool/source/inputchecker/makefile.mk b/i18npool/source/inputchecker/makefile.mk
index 06af9ccb9ad1..2100b205b3e3 100644
--- a/i18npool/source/inputchecker/makefile.mk
+++ b/i18npool/source/inputchecker/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/isolang/insys.cxx b/i18npool/source/isolang/insys.cxx
index ccfdd6829c9d..65d78ef8efe4 100644
--- a/i18npool/source/isolang/insys.cxx
+++ b/i18npool/source/isolang/insys.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: insys.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/i18npool/source/isolang/inunx.cxx b/i18npool/source/isolang/inunx.cxx
index 7e79625085bb..5450f8b24c66 100644
--- a/i18npool/source/isolang/inunx.cxx
+++ b/i18npool/source/isolang/inunx.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: inunx.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/i18npool/source/isolang/inwnt.cxx b/i18npool/source/isolang/inwnt.cxx
index 2550eb3acd10..2e07e8ea1322 100644
--- a/i18npool/source/isolang/inwnt.cxx
+++ b/i18npool/source/isolang/inwnt.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: inwnt.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/i18npool/source/isolang/isolang.cxx b/i18npool/source/isolang/isolang.cxx
index 3aaab05617bf..28c86d39673e 100644
--- a/i18npool/source/isolang/isolang.cxx
+++ b/i18npool/source/isolang/isolang.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: isolang.cxx,v $
- * $Revision: 1.16.24.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/isolang/langid.pl b/i18npool/source/isolang/langid.pl
index f4852cc7197d..629f08901a7d 100755
--- a/i18npool/source/isolang/langid.pl
+++ b/i18npool/source/isolang/langid.pl
@@ -5,14 +5,10 @@ if 0;
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: langid.pl,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/i18npool/source/isolang/makefile.mk b/i18npool/source/isolang/makefile.mk
index be2a3b73f138..b8f01460f67b 100644
--- a/i18npool/source/isolang/makefile.mk
+++ b/i18npool/source/isolang/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/isolang/mslangid.cxx b/i18npool/source/isolang/mslangid.cxx
index aab92d717429..8e9dddff872b 100644
--- a/i18npool/source/isolang/mslangid.cxx
+++ b/i18npool/source/isolang/mslangid.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: mslangid.cxx,v $
- * $Revision: 1.10.24.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/localedata/LocaleNode.cxx b/i18npool/source/localedata/LocaleNode.cxx
index 905fe67b894f..4204b3636fcb 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.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: LocaleNode.cxx,v $
- * $Revision: 1.29.24.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/localedata/LocaleNode.hxx b/i18npool/source/localedata/LocaleNode.hxx
index 30935bf7097d..bf1bd1a9c4ab 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.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: LocaleNode.hxx,v $
- * $Revision: 1.14.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index b5c1e8c1eb1b..2591b70fb63d 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/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.47.24.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/localedata/filewriter.cxx b/i18npool/source/localedata/filewriter.cxx
index c00feadae6f1..04af1e091954 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.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: filewriter.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/i18npool/source/localedata/localedata.cxx b/i18npool/source/localedata/localedata.cxx
index 9be84dbf4763..920a63fe149a 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.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: localedata.cxx,v $
- * $Revision: 1.59.24.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/localedata/makefile.mk b/i18npool/source/localedata/makefile.mk
index e1bd0ac1a6ce..9a671e8bcd6b 100644
--- a/i18npool/source/localedata/makefile.mk
+++ b/i18npool/source/localedata/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/localedata/saxparser.cxx b/i18npool/source/localedata/saxparser.cxx
index 429e2e4edd80..083d2097a54a 100644
--- a/i18npool/source/localedata/saxparser.cxx
+++ b/i18npool/source/localedata/saxparser.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: saxparser.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/i18npool/source/nativenumber/data/numberchar.h b/i18npool/source/nativenumber/data/numberchar.h
index 5cd04858bb3f..542bf8a81b85 100644
--- a/i18npool/source/nativenumber/data/numberchar.h
+++ b/i18npool/source/nativenumber/data/numberchar.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: numberchar.h,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/i18npool/source/nativenumber/makefile.mk b/i18npool/source/nativenumber/makefile.mk
index cc9b3fc45e16..ffbdc879e142 100644
--- a/i18npool/source/nativenumber/makefile.mk
+++ b/i18npool/source/nativenumber/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 6922290bd10c..53d6e037b0f9 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.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: nativenumbersupplier.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/numberformatcode/makefile.mk b/i18npool/source/numberformatcode/makefile.mk
index cd0a866b32fc..957ed91fb1a8 100644
--- a/i18npool/source/numberformatcode/makefile.mk
+++ b/i18npool/source/numberformatcode/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx
index e755fc021e6e..8f5f926cc728 100644
--- a/i18npool/source/numberformatcode/numberformatcode.cxx
+++ b/i18npool/source/numberformatcode/numberformatcode.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: numberformatcode.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/i18npool/source/ordinalsuffix/makefile.mk b/i18npool/source/ordinalsuffix/makefile.mk
index 802546700beb..4de03813e222 100644
--- a/i18npool/source/ordinalsuffix/makefile.mk
+++ b/i18npool/source/ordinalsuffix/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
index 0702cdae1ccb..b577d72c5d0e 100644
--- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx
+++ b/i18npool/source/ordinalsuffix/ordinalsuffix.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: ordinalsuffix.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/i18npool/source/paper/makefile.mk b/i18npool/source/paper/makefile.mk
index 2aef382a32fa..fa05cc21f3f9 100644
--- a/i18npool/source/paper/makefile.mk
+++ b/i18npool/source/paper/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/paper/paper.cxx b/i18npool/source/paper/paper.cxx
index 726a4c3bd898..21be12588e37 100644
--- a/i18npool/source/paper/paper.cxx
+++ b/i18npool/source/paper/paper.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$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/registerservices/makefile.mk b/i18npool/source/registerservices/makefile.mk
index 8961fbcc0d6f..513685e18ad0 100644
--- a/i18npool/source/registerservices/makefile.mk
+++ b/i18npool/source/registerservices/makefile.mk
@@ -2,14 +2,10 @@
 #*
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/registerservices/registerservices.cxx b/i18npool/source/registerservices/registerservices.cxx
index 3cb29cd6838f..2274aa5b714d 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/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.44.16.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/search/levdis.cxx b/i18npool/source/search/levdis.cxx
index 187693269041..aa889a6d3581 100644
--- a/i18npool/source/search/levdis.cxx
+++ b/i18npool/source/search/levdis.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: levdis.cxx,v $
- * $Revision: 1.6.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/search/levdis.hxx b/i18npool/source/search/levdis.hxx
index 92240444175b..b61b731ea664 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.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: levdis.hxx,v $
- * $Revision: 1.4.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/search/makefile.mk b/i18npool/source/search/makefile.mk
index 2e81ec3f1d53..0a0d804c5c06 100644
--- a/i18npool/source/search/makefile.mk
+++ b/i18npool/source/search/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/search/textsearch.cxx b/i18npool/source/search/textsearch.cxx
index 2518a6cb0481..dea4eca2a618 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.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: textsearch.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/i18npool/source/search/textsearch.hxx b/i18npool/source/search/textsearch.hxx
index 380720e02acf..383b78e769b0 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.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: textsearch.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/i18npool/source/textconversion/data/makefile.mk b/i18npool/source/textconversion/data/makefile.mk
index 37569e1f3fd7..a93a4045af62 100644
--- a/i18npool/source/textconversion/data/makefile.mk
+++ b/i18npool/source/textconversion/data/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/i18npool/source/textconversion/genconv_dict.cxx b/i18npool/source/textconversion/genconv_dict.cxx
index a49bf3031bbc..3b3e5d4e9c0a 100644
--- a/i18npool/source/textconversion/genconv_dict.cxx
+++ b/i18npool/source/textconversion/genconv_dict.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: genconv_dict.cxx,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/i18npool/source/textconversion/makefile.mk b/i18npool/source/textconversion/makefile.mk
index 431abb1b513f..2b91d964b2ad 100644
--- a/i18npool/source/textconversion/makefile.mk
+++ b/i18npool/source/textconversion/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/textconversion/textconversion.cxx b/i18npool/source/textconversion/textconversion.cxx
index 9703d45e8b61..51bd7a4c1bf4 100644
--- a/i18npool/source/textconversion/textconversion.cxx
+++ b/i18npool/source/textconversion/textconversion.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: textconversion.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/i18npool/source/textconversion/textconversionImpl.cxx b/i18npool/source/textconversion/textconversionImpl.cxx
index e330074fb789..1e433737efe7 100644
--- a/i18npool/source/textconversion/textconversionImpl.cxx
+++ b/i18npool/source/textconversion/textconversionImpl.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: textconversionImpl.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/i18npool/source/textconversion/textconversion_ko.cxx b/i18npool/source/textconversion/textconversion_ko.cxx
index 04710a1c6d0d..862076501153 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.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: textconversion_ko.cxx,v $
- * $Revision: 1.15.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/textconversion/textconversion_zh.cxx b/i18npool/source/textconversion/textconversion_zh.cxx
index 12b8561f7dfe..2c0682d93205 100644
--- a/i18npool/source/textconversion/textconversion_zh.cxx
+++ b/i18npool/source/textconversion/textconversion_zh.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: textconversion_zh.cxx,v $
- * $Revision: 1.11.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/transliteration/chartonum.cxx b/i18npool/source/transliteration/chartonum.cxx
index 68eca7e7e16d..7fced835f289 100644
--- a/i18npool/source/transliteration/chartonum.cxx
+++ b/i18npool/source/transliteration/chartonum.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: chartonum.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/i18npool/source/transliteration/data/numberchar.h b/i18npool/source/transliteration/data/numberchar.h
index 4a9b7fcc59d6..7bc0c50fc35d 100644
--- a/i18npool/source/transliteration/data/numberchar.h
+++ b/i18npool/source/transliteration/data/numberchar.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: numberchar.h,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/i18npool/source/transliteration/fullwidthToHalfwidth.cxx b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
index 6b36ccc64dc4..95cf1ef4a237 100644
--- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
+++ b/i18npool/source/transliteration/fullwidthToHalfwidth.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: fullwidthToHalfwidth.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/i18npool/source/transliteration/halfwidthToFullwidth.cxx b/i18npool/source/transliteration/halfwidthToFullwidth.cxx
index d7a7638a10d9..7786d269d218 100644
--- a/i18npool/source/transliteration/halfwidthToFullwidth.cxx
+++ b/i18npool/source/transliteration/halfwidthToFullwidth.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: halfwidthToFullwidth.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/i18npool/source/transliteration/hiraganaToKatakana.cxx b/i18npool/source/transliteration/hiraganaToKatakana.cxx
index 0a47316f004f..ef59e1845767 100644
--- a/i18npool/source/transliteration/hiraganaToKatakana.cxx
+++ b/i18npool/source/transliteration/hiraganaToKatakana.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: hiraganaToKatakana.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/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx b/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
index 2031219d2f52..a67841d2e4d6 100644
--- a/i18npool/source/transliteration/ignoreBaFa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreBaFa_ja_JP.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: ignoreBaFa_ja_JP.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/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
index ac1ed76d4f0d..8e7f03b54d17 100644
--- a/i18npool/source/transliteration/ignoreHyuByu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreHyuByu_ja_JP.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: ignoreHyuByu_ja_JP.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/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
index 7d5195834397..833f060be638 100644
--- a/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP.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: ignoreIandEfollowedByYa_ja_JP.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/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
index 5b4f244efc8b..f6a11e11229d 100644
--- a/i18npool/source/transliteration/ignoreIterationMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreIterationMark_ja_JP.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: ignoreIterationMark_ja_JP.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/i18npool/source/transliteration/ignoreKana.cxx b/i18npool/source/transliteration/ignoreKana.cxx
index f9410c1ff044..103bf9de5e3a 100644
--- a/i18npool/source/transliteration/ignoreKana.cxx
+++ b/i18npool/source/transliteration/ignoreKana.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: ignoreKana.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/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
index 9ac561958085..39b2e7a384cc 100644
--- a/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP.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: ignoreKiKuFollowedBySa_ja_JP.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/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
index 6a79cc755907..818014e2c0c6 100644
--- a/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMiddleDot_ja_JP.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: ignoreMiddleDot_ja_JP.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/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
index 7e3a12e78bcf..2dc8a172223b 100644
--- a/i18npool/source/transliteration/ignoreMinusSign_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreMinusSign_ja_JP.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: ignoreMinusSign_ja_JP.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/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
index d02d54d49441..86048284d5b7 100644
--- a/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP.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: ignoreProlongedSoundMark_ja_JP.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/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
index 201bd7ba8f66..2554e2b672d3 100644
--- a/i18npool/source/transliteration/ignoreSeZe_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeZe_ja_JP.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: ignoreSeZe_ja_JP.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/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx b/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
index c672a2f37352..2a4fd0683864 100644
--- a/i18npool/source/transliteration/ignoreSeparator_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSeparator_ja_JP.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: ignoreSeparator_ja_JP.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/i18npool/source/transliteration/ignoreSize_ja_JP.cxx b/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
index fd93aa4093c5..373a8b32df6e 100644
--- a/i18npool/source/transliteration/ignoreSize_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSize_ja_JP.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: ignoreSize_ja_JP.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/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx b/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
index 8b7c458a0da2..c0d33e5ac1ef 100644
--- a/i18npool/source/transliteration/ignoreSpace_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreSpace_ja_JP.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: ignoreSpace_ja_JP.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/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx b/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
index d2f4a873657d..58e4cab48a83 100644
--- a/i18npool/source/transliteration/ignoreTiJi_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTiJi_ja_JP.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: ignoreTiJi_ja_JP.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/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
index bb18014baff5..dcbb4d03f437 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKana_ja_JP.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: ignoreTraditionalKana_ja_JP.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/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
index 0bc85b302557..2d2a3a1bdf13 100644
--- a/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP.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: ignoreTraditionalKanji_ja_JP.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/i18npool/source/transliteration/ignoreWidth.cxx b/i18npool/source/transliteration/ignoreWidth.cxx
index d02895f3cca2..494963c39d3f 100644
--- a/i18npool/source/transliteration/ignoreWidth.cxx
+++ b/i18npool/source/transliteration/ignoreWidth.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: ignoreWidth.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/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx b/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
index 3558e8686982..42e454e73941 100644
--- a/i18npool/source/transliteration/ignoreZiZu_ja_JP.cxx
+++ b/i18npool/source/transliteration/ignoreZiZu_ja_JP.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: ignoreZiZu_ja_JP.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/i18npool/source/transliteration/katakanaToHiragana.cxx b/i18npool/source/transliteration/katakanaToHiragana.cxx
index 013173840760..fd821af5bf5b 100644
--- a/i18npool/source/transliteration/katakanaToHiragana.cxx
+++ b/i18npool/source/transliteration/katakanaToHiragana.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: katakanaToHiragana.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/i18npool/source/transliteration/largeToSmall_ja_JP.cxx b/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
index 4bcb182e02ea..f53981cca01e 100644
--- a/i18npool/source/transliteration/largeToSmall_ja_JP.cxx
+++ b/i18npool/source/transliteration/largeToSmall_ja_JP.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: largeToSmall_ja_JP.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/i18npool/source/transliteration/makefile.mk b/i18npool/source/transliteration/makefile.mk
index daf3068d4d20..ffeaf0f8df69 100644
--- a/i18npool/source/transliteration/makefile.mk
+++ b/i18npool/source/transliteration/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/transliteration/numtochar.cxx b/i18npool/source/transliteration/numtochar.cxx
index 76bbf5a38aac..5742ddf04926 100644
--- a/i18npool/source/transliteration/numtochar.cxx
+++ b/i18npool/source/transliteration/numtochar.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: numtochar.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/i18npool/source/transliteration/numtotext_cjk.cxx b/i18npool/source/transliteration/numtotext_cjk.cxx
index cf7bade30f12..af33702ec57a 100644
--- a/i18npool/source/transliteration/numtotext_cjk.cxx
+++ b/i18npool/source/transliteration/numtotext_cjk.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: numtotext_cjk.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/i18npool/source/transliteration/smallToLarge_ja_JP.cxx b/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
index 24fa41d457e1..9b054dfb972a 100644
--- a/i18npool/source/transliteration/smallToLarge_ja_JP.cxx
+++ b/i18npool/source/transliteration/smallToLarge_ja_JP.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: smallToLarge_ja_JP.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/i18npool/source/transliteration/textToPronounce_zh.cxx b/i18npool/source/transliteration/textToPronounce_zh.cxx
index a99827fcae92..38c5d75931f2 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.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: textToPronounce_zh.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/i18npool/source/transliteration/texttonum.cxx b/i18npool/source/transliteration/texttonum.cxx
index 5ad4a01613fd..1d801bca569a 100644
--- a/i18npool/source/transliteration/texttonum.cxx
+++ b/i18npool/source/transliteration/texttonum.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: texttonum.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/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx
index afaadce5022a..dfadecfd5eb7 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.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: transliterationImpl.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/i18npool/source/transliteration/transliteration_Ignore.cxx b/i18npool/source/transliteration/transliteration_Ignore.cxx
index ba5b004fb5f0..35e82fc579f7 100644
--- a/i18npool/source/transliteration/transliteration_Ignore.cxx
+++ b/i18npool/source/transliteration/transliteration_Ignore.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: transliteration_Ignore.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/i18npool/source/transliteration/transliteration_Numeric.cxx b/i18npool/source/transliteration/transliteration_Numeric.cxx
index 81788575478f..95b44200ceac 100644
--- a/i18npool/source/transliteration/transliteration_Numeric.cxx
+++ b/i18npool/source/transliteration/transliteration_Numeric.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: transliteration_Numeric.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/i18npool/source/transliteration/transliteration_OneToOne.cxx b/i18npool/source/transliteration/transliteration_OneToOne.cxx
index e8a0b5b96d66..9628286f892d 100644
--- a/i18npool/source/transliteration/transliteration_OneToOne.cxx
+++ b/i18npool/source/transliteration/transliteration_OneToOne.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: transliteration_OneToOne.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/i18npool/source/transliteration/transliteration_body.cxx b/i18npool/source/transliteration/transliteration_body.cxx
index 0bea721a0c9d..a869f6713b99 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.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: transliteration_body.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/i18npool/source/transliteration/transliteration_caseignore.cxx b/i18npool/source/transliteration/transliteration_caseignore.cxx
index bec324e94a4a..ba63127c2d70 100644
--- a/i18npool/source/transliteration/transliteration_caseignore.cxx
+++ b/i18npool/source/transliteration/transliteration_caseignore.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: transliteration_caseignore.cxx,v $
- * $Revision: 1.11.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/source/transliteration/transliteration_commonclass.cxx b/i18npool/source/transliteration/transliteration_commonclass.cxx
index 998be9d96420..278336411ce8 100644
--- a/i18npool/source/transliteration/transliteration_commonclass.cxx
+++ b/i18npool/source/transliteration/transliteration_commonclass.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: transliteration_commonclass.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/i18npool/util/makefile.mk b/i18npool/util/makefile.mk
index 582089a309e8..5bf520eaad4d 100644
--- a/i18npool/util/makefile.mk
+++ b/i18npool/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.23 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18npool/util/makefile.pmk b/i18npool/util/makefile.pmk
index 8d4084233e1a..ed7e1e7b33e0 100644
--- a/i18npool/util/makefile.pmk
+++ b/i18npool/util/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: makefile.pmk,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/i18npool/version.mk b/i18npool/version.mk
index c089fdbe5641..ebd51341b13f 100644
--- a/i18npool/version.mk
+++ b/i18npool/version.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: version.mk,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/i18nutil/inc/i18nutil/casefolding.hxx b/i18nutil/inc/i18nutil/casefolding.hxx
index bc67f4fce47e..4a8030557b4d 100644
--- a/i18nutil/inc/i18nutil/casefolding.hxx
+++ b/i18nutil/inc/i18nutil/casefolding.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: casefolding.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/i18nutil/inc/i18nutil/oneToOneMapping.hxx b/i18nutil/inc/i18nutil/oneToOneMapping.hxx
index 9c79ddaabf58..53d4285d31af 100644
--- a/i18nutil/inc/i18nutil/oneToOneMapping.hxx
+++ b/i18nutil/inc/i18nutil/oneToOneMapping.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: oneToOneMapping.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/i18nutil/inc/i18nutil/unicode.hxx b/i18nutil/inc/i18nutil/unicode.hxx
index 11de3bd0a6bb..bd52ed5a46dd 100644
--- a/i18nutil/inc/i18nutil/unicode.hxx
+++ b/i18nutil/inc/i18nutil/unicode.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: unicode.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/i18nutil/inc/i18nutil/widthfolding.hxx b/i18nutil/inc/i18nutil/widthfolding.hxx
index 6e2e34adfe4c..556a4a319975 100644
--- a/i18nutil/inc/i18nutil/widthfolding.hxx
+++ b/i18nutil/inc/i18nutil/widthfolding.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: widthfolding.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/i18nutil/inc/i18nutil/x_rtl_ustring.h b/i18nutil/inc/i18nutil/x_rtl_ustring.h
index a3da83903d1d..028f9718b213 100644
--- a/i18nutil/inc/i18nutil/x_rtl_ustring.h
+++ b/i18nutil/inc/i18nutil/x_rtl_ustring.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: x_rtl_ustring.h,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/i18nutil/source/utility/casefolding.cxx b/i18nutil/source/utility/casefolding.cxx
index 7827aa47e30b..8563a44798f0 100644
--- a/i18nutil/source/utility/casefolding.cxx
+++ b/i18nutil/source/utility/casefolding.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: casefolding.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/i18nutil/source/utility/casefolding_data.h b/i18nutil/source/utility/casefolding_data.h
index 2336768f3aa1..ac8b609fb3d2 100644
--- a/i18nutil/source/utility/casefolding_data.h
+++ b/i18nutil/source/utility/casefolding_data.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: casefolding_data.h,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/i18nutil/source/utility/makefile.mk b/i18nutil/source/utility/makefile.mk
index acb99468e9fb..b38084309af4 100644
--- a/i18nutil/source/utility/makefile.mk
+++ b/i18nutil/source/utility/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/i18nutil/source/utility/oneToOneMapping.cxx b/i18nutil/source/utility/oneToOneMapping.cxx
index 4266af489e10..2f507be1017f 100644
--- a/i18nutil/source/utility/oneToOneMapping.cxx
+++ b/i18nutil/source/utility/oneToOneMapping.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: oneToOneMapping.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/i18nutil/source/utility/unicode.cxx b/i18nutil/source/utility/unicode.cxx
index 155e14f8c7e1..d018d9fcf949 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.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: unicode.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/i18nutil/source/utility/unicode_data.h b/i18nutil/source/utility/unicode_data.h
index c78a89e41284..7afd24f3eda8 100644
--- a/i18nutil/source/utility/unicode_data.h
+++ b/i18nutil/source/utility/unicode_data.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: unicode_data.h,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/i18nutil/source/utility/widthfolding.cxx b/i18nutil/source/utility/widthfolding.cxx
index e88dee2b4371..74b29aaa70dd 100644
--- a/i18nutil/source/utility/widthfolding.cxx
+++ b/i18nutil/source/utility/widthfolding.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: widthfolding.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/i18nutil/source/utility/widthfolding_data.h b/i18nutil/source/utility/widthfolding_data.h
index 9222790bfcaf..e67f40db904b 100644
--- a/i18nutil/source/utility/widthfolding_data.h
+++ b/i18nutil/source/utility/widthfolding_data.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: widthfolding_data.h,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/transex3/inc/cfgmerge.hxx b/l10ntools/inc/cfgmerge.hxx
index 9f1c97f05af5..ae0708f5ff05 100644
--- a/transex3/inc/cfgmerge.hxx
+++ b/l10ntools/inc/cfgmerge.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: cfgmerge.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/transex3/inc/export.hxx b/l10ntools/inc/export.hxx
index ec5195034e91..13fad506b54d 100644
--- a/transex3/inc/export.hxx
+++ b/l10ntools/inc/export.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: export.hxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,9 +28,9 @@
 #ifndef _EXPORT_HXX
 #define _EXPORT_HXX
 
-#ifndef TRANSEX_DIRECTORY_HXX
-#define TRANSEX_DIRECTORY_HXX
-#include <transex3/directory.hxx>
+#ifndef L10NTOOLS_DIRECTORY_HXX
+#define L10NTOOLS_DIRECTORY_HXX
+#include <l10ntools/directory.hxx>
 #endif
 
 
diff --git a/transex3/inc/gsicheck.hxx b/l10ntools/inc/gsicheck.hxx
index 13debcfc7106..fb1eecd38c82 100644
--- a/transex3/inc/gsicheck.hxx
+++ b/l10ntools/inc/gsicheck.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: gsicheck.hxx,v $
- * $Revision: 1.8.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/transex3/inc/helpmerge.hxx b/l10ntools/inc/helpmerge.hxx
index 0ebfa7ed62a9..cfa221bc6055 100644
--- a/transex3/inc/helpmerge.hxx
+++ b/l10ntools/inc/helpmerge.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: helpmerge.hxx,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/transex3/inc/inireader.hxx b/l10ntools/inc/inireader.hxx
index 0861290adf9f..0861290adf9f 100644
--- a/transex3/inc/inireader.hxx
+++ b/l10ntools/inc/inireader.hxx
diff --git a/transex3/inc/transex3/directory.hxx b/l10ntools/inc/l10ntools/directory.hxx
index 6e507961d3bb..6b71f59435f7 100644
--- a/transex3/inc/transex3/directory.hxx
+++ b/l10ntools/inc/l10ntools/directory.hxx
@@ -12,9 +12,9 @@
 
 #include <stdio.h>
 
-#ifndef TRANSEX_FILE_HXX
-#define TRANSEX_FILE_HXX
-#include <transex3/file.hxx>
+#ifndef L10NTOOLS_FILE_HXX
+#define L10NTOOLS_FILE_HXX
+#include <l10ntools/file.hxx>
 #endif
 
 namespace transex{
diff --git a/transex3/inc/transex3/file.hxx b/l10ntools/inc/l10ntools/file.hxx
index e3a1a46b4ee8..e3a1a46b4ee8 100644
--- a/transex3/inc/transex3/file.hxx
+++ b/l10ntools/inc/l10ntools/file.hxx
diff --git a/transex3/inc/transex3/vosapp.hxx b/l10ntools/inc/l10ntools/vosapp.hxx
index 49e10e15e3d4..49e10e15e3d4 100644
--- a/transex3/inc/transex3/vosapp.hxx
+++ b/l10ntools/inc/l10ntools/vosapp.hxx
diff --git a/transex3/inc/lngmerge.hxx b/l10ntools/inc/lngmerge.hxx
index 502889b27aa9..923da89988b6 100644
--- a/transex3/inc/lngmerge.hxx
+++ b/l10ntools/inc/lngmerge.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: lngmerge.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/goodies/inc/makefile.mk b/l10ntools/inc/makefile.mk
index 98924a5a1192..ce0925c51b26 100644
--- a/goodies/inc/makefile.mk
+++ b/l10ntools/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +26,7 @@
 #*************************************************************************
 PRJ=..
 
-PRJNAME=goodies
+PRJNAME=l10ntools
 TARGET=inc
 
 # --- Settings -----------------------------------------------------
diff --git a/goodies/source/filter.vcl/eppm/strings.hrc b/l10ntools/inc/pch/precompiled_l10ntools.cxx
index 1e280524839a..3ee4157f7bb3 100644
--- a/goodies/source/filter.vcl/eppm/strings.hrc
+++ b/l10ntools/inc/pch/precompiled_l10ntools.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: strings.hrc,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,4 +24,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#define KEY_FORMAT  256
+
+#include "precompiled_l10ntools.hxx"
+
diff --git a/transex3/inc/pch/precompiled_transex3.hxx b/l10ntools/inc/pch/precompiled_l10ntools.hxx
index 2ed3c72ad4ee..ea5d5ea28683 100644
--- a/transex3/inc/pch/precompiled_transex3.hxx
+++ b/l10ntools/inc/pch/precompiled_l10ntools.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_transex3.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/transex3/inc/srciter.hxx b/l10ntools/inc/srciter.hxx
index bcbdf5eb542b..36061346fe16 100644
--- a/transex3/inc/srciter.hxx
+++ b/l10ntools/inc/srciter.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: srciter.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,9 +25,9 @@
  *
  ************************************************************************/
 
-#ifndef TRANSEX_DIRECTORY_HXX
-#define TRANSEX_DIRECTORY_HXX
-#include <transex3/directory.hxx>
+#ifndef L10NTOOLS_DIRECTORY_HXX
+#define L10NTOOLS_DIRECTORY_HXX
+#include <l10ntools/directory.hxx>
 #endif
 
 // class SourceTreeIterator
diff --git a/transex3/inc/tagtest.hxx b/l10ntools/inc/tagtest.hxx
index 811c4bf0e164..3e9b03916f4f 100644
--- a/transex3/inc/tagtest.hxx
+++ b/l10ntools/inc/tagtest.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: tagtest.hxx,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/transex3/inc/tokens.h b/l10ntools/inc/tokens.h
index ef285f4c6361..12a06fa45ccf 100644
--- a/transex3/inc/tokens.h
+++ b/l10ntools/inc/tokens.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: tokens.h,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/transex3/inc/treeconfig.hxx b/l10ntools/inc/treeconfig.hxx
index 96d693b0d376..96d693b0d376 100644
--- a/transex3/inc/treeconfig.hxx
+++ b/l10ntools/inc/treeconfig.hxx
diff --git a/transex3/inc/utf8conv.hxx b/l10ntools/inc/utf8conv.hxx
index 32e506edbda8..e4f8fbe4fd51 100644
--- a/transex3/inc/utf8conv.hxx
+++ b/l10ntools/inc/utf8conv.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: utf8conv.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/transex3/inc/wrdtrans.hxx b/l10ntools/inc/wrdtrans.hxx
index efcb663204a6..b0b65526a2a2 100644
--- a/transex3/inc/wrdtrans.hxx
+++ b/l10ntools/inc/wrdtrans.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: wrdtrans.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/transex3/inc/wtranode.hxx b/l10ntools/inc/wtranode.hxx
index 4d71fc160fff..af01a4b29d5c 100644
--- a/transex3/inc/wtranode.hxx
+++ b/l10ntools/inc/wtranode.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: wtranode.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/transex3/inc/wtratree.hxx b/l10ntools/inc/wtratree.hxx
index 67d63280449f..6fd33a7cb413 100644
--- a/transex3/inc/wtratree.hxx
+++ b/l10ntools/inc/wtratree.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: wtratree.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/transex3/inc/xmlparse.hxx b/l10ntools/inc/xmlparse.hxx
index 18b047ef75c1..69e74a83ec47 100644
--- a/transex3/inc/xmlparse.hxx
+++ b/l10ntools/inc/xmlparse.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: xmlparse.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/transex3/inc/xmlutil.hxx b/l10ntools/inc/xmlutil.hxx
index 812f50b85c45..812f50b85c45 100644
--- a/transex3/inc/xmlutil.hxx
+++ b/l10ntools/inc/xmlutil.hxx
diff --git a/transex3/inc/xrmmerge.hxx b/l10ntools/inc/xrmmerge.hxx
index 47be1ea7a038..e8c3d322c92b 100644
--- a/transex3/inc/xrmmerge.hxx
+++ b/l10ntools/inc/xrmmerge.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: xrmmerge.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/transex3/java/l10nconv/build.xml b/l10ntools/java/l10nconv/build.xml
index 6902227e5122..7103ff05d58f 100755
--- a/transex3/java/l10nconv/build.xml
+++ b/l10ntools/java/l10nconv/build.xml
@@ -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: build.xml,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/transex3/java/l10nconv/converter.MF b/l10ntools/java/l10nconv/converter.MF
index 843d500b7548..843d500b7548 100755
--- a/transex3/java/l10nconv/converter.MF
+++ b/l10ntools/java/l10nconv/converter.MF
diff --git a/transex3/java/l10nconv/documentation/readmeConverter.sxw b/l10ntools/java/l10nconv/documentation/readmeConverter.sxw
index f779e10acb2c..f779e10acb2c 100755
--- a/transex3/java/l10nconv/documentation/readmeConverter.sxw
+++ b/l10ntools/java/l10nconv/documentation/readmeConverter.sxw
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java
index d304c2544bff..7338e8d6a669 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapCheck.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: DirtyTagWrapCheck.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/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
index 49fc08b69d32..6b76b75b75d6 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/DirtyTagWrapper.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: DirtyTagWrapper.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/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java
index 7495736ab68c..223885571007 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/Tag.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: Tag.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/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
index 7993fc9cf0a4..cc362a96e740 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/DirtyTags/TagPair.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: TagPair.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java
index 5b1fb6c62b61..d6fddfd049ae 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Convert.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Convert.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: Convert.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java
index 7ec09bcb411a..ad846ae88295 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Converter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Converter.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: Converter.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java
index 07a3708d4366..0b630978098d 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ConverterException.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: ConverterException.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java
index e8b4136f185a..fcc95905d3be 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataHandler.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: DataHandler.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java
index 59de7ca7e1f4..d6bb2ed85d73 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataReader.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: DataReader.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java
index c5d6765e3840..497bb54bbdb8 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/DataWriter.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: DataWriter.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java
index b05767e93ae3..a26665e1629e 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ExtMap.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: ExtMap.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java
index a21b8daa7b1d..600687c41d29 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/FileMaker.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: FileMaker.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java
index adb6e358a74c..398fcc9b686b 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIReader.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: GSIReader.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
index 085e26475e09..0f7aee811569 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIWriter.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: GSIWriter.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java
index ff0348f97d3d..526f3ca75640 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/GSIandSDFMerger.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: GSIandSDFMerger.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java
index 6a11360cc472..26ce5a6518eb 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/LineErrorException.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: LineErrorException.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java
index 997c05a70b4f..997a522acedb 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/OutputHandler.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: OutputHandler.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java
index f53fe0101275..585f69fe2c88 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/ResTypeResolver.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: ResTypeResolver.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java
index 29a9ee2e528a..557731fe88f1 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/Resolver.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: Resolver.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
index 4c0c234778ec..9e47ae73c719 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFReader.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: SDFReader.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
index 98eb8c856e6a..4c79cd113f6f 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/SDFWriter.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: SDFWriter.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java
index 522dcc18a5bd..76d14bd98569 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFReader.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: XLIFFReader.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
index 42eef42884c1..d7b6160dcc95 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/XLIFFWriter.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: XLIFFWriter.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/transex3/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd
index 91262ec28204..91262ec28204 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/converter/dtd/xliff.dtd
diff --git a/transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java
index 62ff008156ab..4015c3acd2a7 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.java
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/LanguageResolver.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: LanguageResolver.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/transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map
index a43e8f5e0218..a43e8f5e0218 100755
--- a/transex3/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map
+++ b/l10ntools/java/l10nconv/java/com/sun/star/tooling/languageResolver/lang.map
diff --git a/transex3/java/l10nconv/makefile.mk b/l10ntools/java/l10nconv/makefile.mk
index feb869778e80..423f3275fc37 100755
--- a/transex3/java/l10nconv/makefile.mk
+++ b/l10ntools/java/l10nconv/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +26,7 @@
 #*************************************************************************
 
 PRJ=../..
-PRJNAME=transex3
+PRJNAME=l10ntools
 TARGET=converter
 
 .INCLUDE : ant.mk
diff --git a/transex3/java/receditor/build.xml b/l10ntools/java/receditor/build.xml
index 34f02128f034..4a88f61e4fc5 100755
--- a/transex3/java/receditor/build.xml
+++ b/l10ntools/java/receditor/build.xml
@@ -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: build.xml,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/transex3/java/receditor/java/transex3/controller/EditorController.java b/l10ntools/java/receditor/java/transex3/controller/EditorController.java
index 38462d665304..38462d665304 100644
--- a/transex3/java/receditor/java/transex3/controller/EditorController.java
+++ b/l10ntools/java/receditor/java/transex3/controller/EditorController.java
diff --git a/transex3/java/receditor/java/transex3/controller/Main.java b/l10ntools/java/receditor/java/transex3/controller/Main.java
index e8dd06ce9f85..e8dd06ce9f85 100644
--- a/transex3/java/receditor/java/transex3/controller/Main.java
+++ b/l10ntools/java/receditor/java/transex3/controller/Main.java
diff --git a/transex3/java/receditor/java/transex3/model/ResourceFile.java b/l10ntools/java/receditor/java/transex3/model/ResourceFile.java
index 51fabb3a4b7a..51fabb3a4b7a 100644
--- a/transex3/java/receditor/java/transex3/model/ResourceFile.java
+++ b/l10ntools/java/receditor/java/transex3/model/ResourceFile.java
diff --git a/transex3/java/receditor/java/transex3/model/SdfEntity.java b/l10ntools/java/receditor/java/transex3/model/SdfEntity.java
index 4b293421fd28..4b293421fd28 100644
--- a/transex3/java/receditor/java/transex3/model/SdfEntity.java
+++ b/l10ntools/java/receditor/java/transex3/model/SdfEntity.java
diff --git a/transex3/java/receditor/java/transex3/model/SdfString.java b/l10ntools/java/receditor/java/transex3/model/SdfString.java
index 7419aeb5578b..7419aeb5578b 100644
--- a/transex3/java/receditor/java/transex3/model/SdfString.java
+++ b/l10ntools/java/receditor/java/transex3/model/SdfString.java
diff --git a/transex3/java/receditor/java/transex3/view/Editor.java b/l10ntools/java/receditor/java/transex3/view/Editor.java
index f46a82a11a2b..f46a82a11a2b 100644
--- a/transex3/java/receditor/java/transex3/view/Editor.java
+++ b/l10ntools/java/receditor/java/transex3/view/Editor.java
diff --git a/transex3/java/receditor/java/transex3/view/SdfTable.java b/l10ntools/java/receditor/java/transex3/view/SdfTable.java
index f0cc7bd84a34..f0cc7bd84a34 100644
--- a/transex3/java/receditor/java/transex3/view/SdfTable.java
+++ b/l10ntools/java/receditor/java/transex3/view/SdfTable.java
diff --git a/transex3/java/receditor/makefile.mk b/l10ntools/java/receditor/makefile.mk
index e5e3921eea6b..63587a557ec6 100755
--- a/transex3/java/receditor/makefile.mk
+++ b/l10ntools/java/receditor/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +26,7 @@
 #*************************************************************************
 
 PRJ=../..
-PRJNAME=transex3
+PRJNAME=l10ntools
 TARGET=receditor
 
 .INCLUDE : ant.mk
diff --git a/transex3/java/receditor/receditor.MF b/l10ntools/java/receditor/receditor.MF
index dced97882df9..dced97882df9 100755
--- a/transex3/java/receditor/receditor.MF
+++ b/l10ntools/java/receditor/receditor.MF
diff --git a/transex3/layout/README b/l10ntools/layout/README
index 1838e2a94ba0..1838e2a94ba0 100644
--- a/transex3/layout/README
+++ b/l10ntools/layout/README
diff --git a/transex3/layout/layoutparse.cxx b/l10ntools/layout/layoutparse.cxx
index 0f43c9a3053f..6bb839a9409e 100644
--- a/transex3/layout/layoutparse.cxx
+++ b/l10ntools/layout/layoutparse.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: layoutparse.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/transex3/layout/layoutparse.hxx b/l10ntools/layout/layoutparse.hxx
index b9cd8f6c18b2..cd24f091d318 100644
--- a/transex3/layout/layoutparse.hxx
+++ b/l10ntools/layout/layoutparse.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: layoutparse.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/transex3/layout/loc.sdf b/l10ntools/layout/loc.sdf
index 023357adc420..023357adc420 100644
--- a/transex3/layout/loc.sdf
+++ b/l10ntools/layout/loc.sdf
diff --git a/transex3/layout/makefile.mk b/l10ntools/layout/makefile.mk
index 9864b46242b2..95d6aa9863f4 100644
--- a/transex3/layout/makefile.mk
+++ b/l10ntools/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +29,7 @@ PRJ=..
 
 INCPRE=$(MISC)
 
-PRJNAME=transex3
+PRJNAME=l10ntools
 TARGET=tralay
 #TARGETTYPE=GUI
 TARGETTYPE=CUI
diff --git a/transex3/layout/tralay.cxx b/l10ntools/layout/tralay.cxx
index 740981674c50..72fd1a1d8c5e 100644
--- a/transex3/layout/tralay.cxx
+++ b/l10ntools/layout/tralay.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: tralay.cxx,v $
- *
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +26,7 @@
  ************************************************************************/
 
 #include <com/sun/star/xml/sax/SAXException.hpp>
-#include <transex3/vosapp.hxx>
+#include <l10ntools/vosapp.hxx>
 
 #include <osl/file.hxx>
 
diff --git a/transex3/layout/zoom.xml b/l10ntools/layout/zoom.xml
index 0fb3d27343ff..0fb3d27343ff 100644
--- a/transex3/layout/zoom.xml
+++ b/l10ntools/layout/zoom.xml
diff --git a/l10ntools/prj/build.lst b/l10ntools/prj/build.lst
new file mode 100644
index 000000000000..ff961c096cbd
--- /dev/null
+++ b/l10ntools/prj/build.lst
@@ -0,0 +1,10 @@
+tr	l10ntools	:	tools LIBXSLT:libxslt BERKELEYDB:berkeleydb LUCENE:lucene NULL
+tr	l10ntools						usr1	-	all	tr_mkout NULL
+tr	l10ntools\inc					nmake	-	all	tr_inc NULL
+tr	l10ntools\source					nmake	-	all	tr_src tr_inc NULL
+tr	l10ntools\layout					nmake	-	all	rt_layout tr_src tr_inc NULL
+#tr	l10ntools\java\l10nconv			nmake	-	all	tr_conv NULL
+#tr	l10ntools\java\receditor			nmake	-	all	tr_rece NULL
+tr  l10ntools\source\help    nmake   -   all tr_bla_help  NULL
+tr  l10ntools\source\filter\utils    nmake   -   all tr_bla_utils NULL
+tr  l10ntools\source\filter\merge    nmake   -   all tr_bla_merge tr_bla_utils NULL
diff --git a/transex3/prj/d.lst b/l10ntools/prj/d.lst
index a469837275ed..f75c16b43764 100644
--- a/transex3/prj/d.lst
+++ b/l10ntools/prj/d.lst
@@ -1,4 +1,4 @@
-mkdir: %_DEST%\inc%_EXT%\transex3
+mkdir: %_DEST%\inc%_EXT%\l10ntools
 mkdir: %_DEST%\bin%_EXT%
 mkdir: %_DEST%\bin%_EXT%\help
 mkdir: %_DEST%\bin%_EXT%\help\com
@@ -46,16 +46,16 @@ mkdir: %_DEST%\bin%_EXT%\help\com\sun\star\help
 ..\scripts\fast_merge.pl %_DEST%\bin%_EXT%\fast_merge.pl
 ..\scripts\keyidGen.pl %_DEST%\bin%_EXT%\keyidGen.pl
 
-..\inc\export.hxx %_DEST%\inc%_EXT%\transex3\export.hxx
-..\inc\transex3\directory.hxx %_DEST%\inc%_EXT%\transex3\directory.hxx
-..\inc\transex3\file.hxx %_DEST%\inc%_EXT%\transex3\file.hxx
-..\inc\transex3\vosapp.hxx %_DEST%\inc%_EXT%\transex3\vosapp.hxx
+..\inc\export.hxx %_DEST%\inc%_EXT%\l10ntools\export.hxx
+..\inc\l10ntools\directory.hxx %_DEST%\inc%_EXT%\l10ntools\directory.hxx
+..\inc\l10ntools\file.hxx %_DEST%\inc%_EXT%\l10ntools\file.hxx
+..\inc\l10ntools\vosapp.hxx %_DEST%\inc%_EXT%\l10ntools\vosapp.hxx
 
-..\inc\utf8conv.hxx %_DEST%\inc%_EXT%\transex3\utf8conv.hxx
+..\inc\utf8conv.hxx %_DEST%\inc%_EXT%\l10ntools\utf8conv.hxx
 ..\%__SRC%\lib\transex.lib %_DEST%\lib%_EXT%\transex.lib
 ..\%__SRC%\lib\libtransex.a %_DEST%\lib%_EXT%\libtransex.a
 
-..\source\help\compilehelp.hxx %_DEST%\inc%_EXT%\transex3\compilehelp.hxx
-#..\source\help\helplinkerdllapi.h  %_DEST%\inc%_EXT%\transex3\helplinkerdllapi.h
+..\source\help\compilehelp.hxx %_DEST%\inc%_EXT%\l10ntools\compilehelp.hxx
+#..\source\help\helplinkerdllapi.h  %_DEST%\inc%_EXT%\l10ntools\helplinkerdllapi.h
 ..\%__SRC%\lib\* %_DEST%\lib%_EXT%\*
 ..\%__SRC%\class\com\sun\star\help\* %_DEST%\bin%_EXT%\help\com\sun\star\help\*
diff --git a/transex3/scripts/fast_merge.pl b/l10ntools/scripts/fast_merge.pl
index 7321a9a42911..e2980fafddda 100644
--- a/transex3/scripts/fast_merge.pl
+++ b/l10ntools/scripts/fast_merge.pl
@@ -3,36 +3,28 @@ eval 'exec perl -wS $0 ${1+"$@"}'
     if 0;
 #*************************************************************************
 #
-#   OpenOffice.org - a multi-platform office productivity suite
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-#   $RCSfile: fast_merge.pl,v $
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $Revision: 1.1.2.2 $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   last change: $Author: ihi $ $Date: 2007/07/20 10:37:53 $
+# 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/transex3/scripts/keyidGen.pl b/l10ntools/scripts/keyidGen.pl
index acb5137e3f7c..2a4ac5caefc3 100644
--- a/transex3/scripts/keyidGen.pl
+++ b/l10ntools/scripts/keyidGen.pl
@@ -5,14 +5,10 @@ eval 'exec perl -S $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: keyidGen.pl,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/transex3/scripts/localize.pl b/l10ntools/scripts/localize.pl
index 10e8124027b1..8b6a8231ebce 100755
--- a/transex3/scripts/localize.pl
+++ b/l10ntools/scripts/localize.pl
@@ -7,14 +7,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: localize.pl,v $
-#
-# $Revision: 1.18.6.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -78,6 +74,7 @@ my $WIN;
 my $languages;
 #my %sl_modules;     # Contains all modules where en-US and de is source language
 my $use_default_date = '0';
+my $force_ooo_module = '0';
 my %is_ooo_module;
 my %is_so_module;
 my $DELIMITER;
@@ -275,7 +272,7 @@ sub check_modules_scm
 sub is_openoffice_module
 {
     my $module              = shift;
-    return "TRUE", if defined $is_ooo_module{ $module };
+    return "TRUE", if ( $force_ooo_module || defined $is_ooo_module{ $module } );
     return "";
 }
 
@@ -366,16 +363,10 @@ sub get_license_header{
 "#\n".
 "# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n".
 "# \n".
-"# Copyright 2008 by Sun Microsystems, Inc.\n".
+"# Copyright 2000, 2010 Oracle and/or its affiliates.\n".
 "#\n".
 "# OpenOffice.org - a multi-platform office productivity suite\n".
 "#\n".
-"# \$RCSfile:".
-"localize.pl,v \$\n".
-"#\n".
-"# \$Revision: ".
-"1.17.4.1 \$\n".
-"#\n".
 "# This file is part of OpenOffice.org.\n".
 "#\n".
 "# OpenOffice.org is free software: you can redistribute it and/or modify\n".
@@ -1114,7 +1105,7 @@ sub parse_options{
     my $extract;
     my $success = GetOptions('f=s' => \$sdffile , 'l=s' => \$languages , 's=s' => \$srcpath ,  'h' => \$help , 'v' => \$bVerbose ,
                              'm' => \$merge , 'e' => \$extract , 'x' => \$no_sort , 'd' => \$use_default_date , 'c' => \$create_dirs ,
-                             'n' => \$no_gsicheck );
+                             'n' => \$no_gsicheck , 'o' => \$force_ooo_module );
     $outputfile = $sdffile;
 
     #print STDOUT "DBG: lang = $languages\n";
@@ -1126,7 +1117,11 @@ sub parse_options{
             exit(1);
         }
     }
-    if( $help || !$success || $#ARGV > 1 || ( !$sdffile ) ){
+    if( $help ){
+        usage();
+        exit(0);
+    }
+    if( !$success || $#ARGV > 1 || ( !$sdffile ) ){
         usage();
         exit(1);
     }
@@ -1167,6 +1162,8 @@ sub usage{
     print STDERR "    -h              File with localize.sdf's\n!";
     print STDERR "    -n              No gsicheck\n";
     print STDERR "    -i              Module to merge\n";
+    print STDERR "    -o              force using ooo localization from the l10n module instead of l10n_so; \n";
+    print STDERR "                    useful if the type can't be detected by the .svn tags; \n";
     print STDERR "    -v              Verbose\n";
     print STDERR "\nExample:\n";
     print STDERR "\nlocalize -e -l en-US,pt-BR=en-US -f my.sdf\n( Extract en-US and pt-BR with en-US fallback )\n";
diff --git a/transex3/scripts/localize_old.pl b/l10ntools/scripts/localize_old.pl
index 151399d22002..fe63ba9a93de 100755
--- a/transex3/scripts/localize_old.pl
+++ b/l10ntools/scripts/localize_old.pl
@@ -7,14 +7,10 @@ eval 'exec perl -wS $0 ${1+"$@"}'
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: localize.pl,v $
-#
-# $Revision: 1.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -328,16 +324,10 @@ sub get_license_header{
 "#\n".
 "# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n".
 "# \n".
-"# Copyright 2008 by Sun Microsystems, Inc.\n".
+"# Copyright 2000, 2010 Oracle and/or its affiliates.\n".
 "#\n".
 "# OpenOffice.org - a multi-platform office productivity suite\n".
 "#\n".
-"# \$RCSfile:".
-"localize.pl,v \$\n".
-"#\n".
-"# \$Revision: ".
-"1.17.4.1 \$\n".
-"#\n".
 "# This file is part of OpenOffice.org.\n".
 "#\n".
 "# OpenOffice.org is free software: you can redistribute it and/or modify\n".
diff --git a/transex3/source/cfg_yy_wrapper.c b/l10ntools/source/cfg_yy_wrapper.c
index ac678d17f399..ac678d17f399 100644
--- a/transex3/source/cfg_yy_wrapper.c
+++ b/l10ntools/source/cfg_yy_wrapper.c
diff --git a/transex3/source/cfglex.l b/l10ntools/source/cfglex.l
index dd2d9a45ab59..cc92632620be 100644
--- a/transex3/source/cfglex.l
+++ b/l10ntools/source/cfglex.l
@@ -170,8 +170,8 @@ main( int argc, char* argv[])
 
 	pOutput = GetOutputFile( argc, argv );
 	if( !isQuiet() ){
-        fprintf( stdout, "\nCfgEx 0.9 Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.\n" );
-	    fprintf( stdout, "======================================================================\n" );
+        fprintf( stdout, "\nCfgEx 0.9 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
+	    fprintf( stdout, "===================================================================================\n" );
     }
 
     if ( !pOutput ) {
diff --git a/transex3/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 0607c9e9bb06..170c2922d9ce 100644
--- a/transex3/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.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: cfgmerge.cxx,v $
- * $Revision: 1.46 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 #include <tools/string.hxx>
 #include <tools/fsys.hxx>
diff --git a/transex3/source/directory.cxx b/l10ntools/source/directory.cxx
index ed0fe27d22c2..a36f8bd2361f 100644
--- a/transex3/source/directory.cxx
+++ b/l10ntools/source/directory.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: directory.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,8 +27,8 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
-#include <transex3/directory.hxx>
+#include "precompiled_l10ntools.hxx"
+#include <l10ntools/directory.hxx>
 #include "tools/string.hxx"
 #include <iostream>
 #include <vector>
diff --git a/transex3/source/export.cxx b/l10ntools/source/export.cxx
index 5294d902d2ee..a3df11c2920b 100644
--- a/transex3/source/export.cxx
+++ b/l10ntools/source/export.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: export.cxx,v $
- * $Revision: 1.57 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 #include <stdlib.h>
 #include <tools/fsys.hxx>
diff --git a/transex3/source/export2.cxx b/l10ntools/source/export2.cxx
index 7815e80e033f..8a384b415b6f 100644
--- a/transex3/source/export2.cxx
+++ b/l10ntools/source/export2.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: export2.cxx,v $
- * $Revision: 1.43 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include "export.hxx"
 #include "utf8conv.hxx"
 #include <tools/datetime.hxx>
@@ -354,17 +351,18 @@ bool Export::CopyFile( const ByteString& source , const ByteString& dest )
     const int BUFFERSIZE    = 8192;
     char buf[ BUFFERSIZE ];
 
-    FILE*  IN_FILE = fopen( source.GetBuffer() , "r" );
-    FILE* OUT_FILE = fopen( dest.GetBuffer() , "w" );
-
+    FILE* IN_FILE = fopen( source.GetBuffer() , "r" );
     if( IN_FILE == NULL )
     {
         cerr << "Export::CopyFile WARNING: Could not open " << source.GetBuffer() << "\n";
         return false;
     }
+
+    FILE* OUT_FILE = fopen( dest.GetBuffer() , "w" );
     if( OUT_FILE == NULL )
     {
         cerr << "Export::CopyFile WARNING: Could not open/create " << dest.GetBuffer() << " for writing\n";
+        fclose( IN_FILE );
         return false;
     }
 
diff --git a/transex3/source/file.cxx b/l10ntools/source/file.cxx
index 4ea9ca55d574..c6e177ce9c15 100644
--- a/transex3/source/file.cxx
+++ b/l10ntools/source/file.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: file.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,8 +27,8 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
-#include <transex3/file.hxx>
+#include "precompiled_l10ntools.hxx"
+#include <l10ntools/file.hxx>
 
 namespace transex
 {
diff --git a/transex3/source/filter/merge/FCFGMerge.cfg b/l10ntools/source/filter/merge/FCFGMerge.cfg
index 46fcccafe7e4..cae30bdd0260 100644
--- a/transex3/source/filter/merge/FCFGMerge.cfg
+++ b/l10ntools/source/filter/merge/FCFGMerge.cfg
@@ -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: FCFGMerge.cfg,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/transex3/source/filter/merge/FCFGMerge.java b/l10ntools/source/filter/merge/FCFGMerge.java
index 7fbfa8a0c986..2c2f35b66d1b 100644
--- a/transex3/source/filter/merge/FCFGMerge.java
+++ b/l10ntools/source/filter/merge/FCFGMerge.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: FCFGMerge.java,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/transex3/source/filter/merge/Manifest.mf b/l10ntools/source/filter/merge/Manifest.mf
index 1337eaf4d39a..1337eaf4d39a 100644
--- a/transex3/source/filter/merge/Manifest.mf
+++ b/l10ntools/source/filter/merge/Manifest.mf
diff --git a/transex3/source/filter/merge/Merger.java b/l10ntools/source/filter/merge/Merger.java
index 0bf11fc42fbf..3125732733f8 100644
--- a/transex3/source/filter/merge/Merger.java
+++ b/l10ntools/source/filter/merge/Merger.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: Merger.java,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/transex3/source/filter/merge/makefile.mk b/l10ntools/source/filter/merge/makefile.mk
index bf768be851d8..f8f8fb640249 100644
--- a/transex3/source/filter/merge/makefile.mk
+++ b/l10ntools/source/filter/merge/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.9.102.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +27,7 @@
 
 PRJ     = ..$/..$/..
 TARGET  = FCFGMerge
-PRJNAME = filter
+PRJNAME = l10ntools
 PACKAGE = com$/sun$/star$/filter$/config$/tools$/merge
 
 # --- Settings -----------------------------------------------------
diff --git a/transex3/source/filter/utils/AnalyzeStartupLog.java b/l10ntools/source/filter/utils/AnalyzeStartupLog.java
index 498528850697..60444338b67b 100644
--- a/transex3/source/filter/utils/AnalyzeStartupLog.java
+++ b/l10ntools/source/filter/utils/AnalyzeStartupLog.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: AnalyzeStartupLog.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/transex3/source/filter/utils/Cache.java b/l10ntools/source/filter/utils/Cache.java
index 94c26008ed13..f4120b2140cc 100644
--- a/transex3/source/filter/utils/Cache.java
+++ b/l10ntools/source/filter/utils/Cache.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: Cache.java,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/transex3/source/filter/utils/ConfigHelper.java b/l10ntools/source/filter/utils/ConfigHelper.java
index 78cc71cf65b2..a357b36fc5d1 100644
--- a/transex3/source/filter/utils/ConfigHelper.java
+++ b/l10ntools/source/filter/utils/ConfigHelper.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: ConfigHelper.java,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/transex3/source/filter/utils/FileHelper.java b/l10ntools/source/filter/utils/FileHelper.java
index 71f51cf36bf6..38019cf628df 100644
--- a/transex3/source/filter/utils/FileHelper.java
+++ b/l10ntools/source/filter/utils/FileHelper.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: FileHelper.java,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/transex3/source/filter/utils/Logger.java b/l10ntools/source/filter/utils/Logger.java
index 7657eba5f426..2d5ed631cd69 100644
--- a/transex3/source/filter/utils/Logger.java
+++ b/l10ntools/source/filter/utils/Logger.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: Logger.java,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/transex3/source/filter/utils/MalformedCommandLineException.java b/l10ntools/source/filter/utils/MalformedCommandLineException.java
index e073dcb9adcc..e4ea0f95d99c 100644
--- a/transex3/source/filter/utils/MalformedCommandLineException.java
+++ b/l10ntools/source/filter/utils/MalformedCommandLineException.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: MalformedCommandLineException.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/transex3/source/filter/utils/XMLHelper.java b/l10ntools/source/filter/utils/XMLHelper.java
index 0f912cac8e25..edd7508cbf94 100644
--- a/transex3/source/filter/utils/XMLHelper.java
+++ b/l10ntools/source/filter/utils/XMLHelper.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: XMLHelper.java,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/transex3/source/filter/utils/makefile.mk b/l10ntools/source/filter/utils/makefile.mk
index d41d8ba9a825..43a28d57ee9e 100644
--- a/transex3/source/filter/utils/makefile.mk
+++ b/l10ntools/source/filter/utils/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.9.98.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,7 +27,7 @@
 
 PRJ = ..$/..$/..
 TARGET  = FCFGUtils
-PRJNAME = filter
+PRJNAME = l10ntools
 PACKAGE = com$/sun$/star$/filter$/config$/tools$/utils
 
 # --- Settings -----------------------------------------------------
diff --git a/transex3/source/gsicheck.cxx b/l10ntools/source/gsicheck.cxx
index 99183602f951..1ec9827a753d 100644
--- a/transex3/source/gsicheck.cxx
+++ b/l10ntools/source/gsicheck.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: gsicheck.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
diff --git a/transex3/source/gsiconv.cxx b/l10ntools/source/gsiconv.cxx
index f6dea76ebb51..b2e470f604ea 100644
--- a/transex3/source/gsiconv.cxx
+++ b/l10ntools/source/gsiconv.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: gsiconv.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 #include <tools/fsys.hxx>
 #include <tools/stream.hxx>
diff --git a/transex3/source/help/HelpCompiler.cxx b/l10ntools/source/help/HelpCompiler.cxx
index 5001d0907972..79e41d37ea3f 100644
--- a/transex3/source/help/HelpCompiler.cxx
+++ b/l10ntools/source/help/HelpCompiler.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: HelpCompiler.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/transex3/source/help/HelpCompiler.hxx b/l10ntools/source/help/HelpCompiler.hxx
index 7ffb096bd635..e300fe26f16d 100644
--- a/transex3/source/help/HelpCompiler.hxx
+++ b/l10ntools/source/help/HelpCompiler.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: HelpCompiler.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/transex3/source/help/HelpFileDocument.java b/l10ntools/source/help/HelpFileDocument.java
index 2212db27f251..15e62d6c6c52 100644
--- a/transex3/source/help/HelpFileDocument.java
+++ b/l10ntools/source/help/HelpFileDocument.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: HelpFileDocument.java,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/transex3/source/help/HelpIndexerTool.java b/l10ntools/source/help/HelpIndexerTool.java
index 6bf22d1ac344..1245247c3c9a 100644
--- a/transex3/source/help/HelpIndexerTool.java
+++ b/l10ntools/source/help/HelpIndexerTool.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: HelpIndexer.java,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/transex3/source/help/HelpLinker.cxx b/l10ntools/source/help/HelpLinker.cxx
index 7dfe4ee4a2a2..ae2b88bfc470 100644
--- a/transex3/source/help/HelpLinker.cxx
+++ b/l10ntools/source/help/HelpLinker.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: HelpLinker.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/transex3/source/help/compilehelp.hxx b/l10ntools/source/help/compilehelp.hxx
index d123d628be27..472b15231639 100644
--- a/transex3/source/help/compilehelp.hxx
+++ b/l10ntools/source/help/compilehelp.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: compilehelp.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/transex3/source/help/helplinker.pmk b/l10ntools/source/help/helplinker.pmk
index 569c5f4dbdee..6e99d322f434 100644
--- a/transex3/source/help/helplinker.pmk
+++ b/l10ntools/source/help/helplinker.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: helplinker.pmk,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/transex3/source/help/makefile.mk b/l10ntools/source/help/makefile.mk
index 6fc823a1b59a..50351913fe55 100644
--- a/transex3/source/help/makefile.mk
+++ b/l10ntools/source/help/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.38 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,7 +26,7 @@
 #*************************************************************************
 
 PRJ		= ..$/..
-PRJNAME = xmlhelp
+PRJNAME = l10ntools
 TARGET  = HelpLinker
 LIBBASENAME = helplinker
 PACKAGE = com$/sun$/star$/help
diff --git a/transex3/source/helpex.cxx b/l10ntools/source/helpex.cxx
index f4a1589b530e..49a59266a85d 100644
--- a/transex3/source/helpex.cxx
+++ b/l10ntools/source/helpex.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: helpex.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/transex3/source/helpmerge.cxx b/l10ntools/source/helpmerge.cxx
index 8aafc692f14c..0ab7e6eb5c2e 100644
--- a/transex3/source/helpmerge.cxx
+++ b/l10ntools/source/helpmerge.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: helpmerge.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <tools/fsys.hxx>
 #include <osl/file.hxx>
 // local includes
diff --git a/transex3/source/inireader.cxx b/l10ntools/source/inireader.cxx
index 0985e788452d..63f902a5a1da 100644
--- a/transex3/source/inireader.cxx
+++ b/l10ntools/source/inireader.cxx
@@ -120,7 +120,7 @@ void INIreader::toStlString( const UnicodeString& str , string& stl_str)
         char* buffer = new char[ str.length()*3 ];
         str.extract( 0 , str.length() , buffer );
         stl_str = string( buffer );
-        delete buffer;
+        delete [] buffer;
 }
 
 void INIreader::trim( string& str )
diff --git a/transex3/source/lngex.cxx b/l10ntools/source/lngex.cxx
index 53c97de6e045..c593b85d4932 100644
--- a/transex3/source/lngex.cxx
+++ b/l10ntools/source/lngex.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: lngex.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 
 // local includes
@@ -203,8 +200,8 @@ int _cdecl main( int argc, char *argv[] )
         return 1;
     }
     if( !bQuiet ){
-        fprintf( stdout, "\nUlfEx 1 Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.\n" );
-        fprintf( stdout, "====================================================================\n" );
+        fprintf( stdout, "\nUlfEx 1 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
+        fprintf( stdout, "=================================================================================\n" );
         fprintf( stdout, "\nProcessing File %s ...\n", sInputFile.GetBuffer());
     }else
     {
diff --git a/transex3/source/lngmerge.cxx b/l10ntools/source/lngmerge.cxx
index e55fdc83ce37..5f40a4346f53 100644
--- a/transex3/source/lngmerge.cxx
+++ b/l10ntools/source/lngmerge.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: lngmerge.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <tools/fsys.hxx>
 
 // local includes
diff --git a/transex3/source/localize.cxx b/l10ntools/source/localize.cxx
index c82d152cac7e..b869098faed7 100644
--- a/transex3/source/localize.cxx
+++ b/l10ntools/source/localize.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: localize.cxx,v $
- * $Revision: 1.50 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 
 #include "srciter.hxx"
 #include "export.hxx"
@@ -41,9 +38,9 @@
 #include "tools/errcode.hxx"
 #include "tools/fsys.hxx"
 
-#ifndef TRANSEX_FILE_HXX
-#define TRANSEX_FILE_HXX
-#include <transex3/file.hxx>
+#ifndef L10NTOOLS_FILE_HXX
+#define L10NTOOLS_FILE_HXX
+#include <l10ntools/file.hxx>
 #endif
 
 namespace transex3
@@ -938,10 +935,25 @@ int _cdecl main( int argc, char *argv[] )
     bool hasPwd = treeconfig.getActiveRepositories( repos );
     if( hasPwd ) cout << "Found special path!\n";
 
+    string minor_ext;
+    bool has_minor_ext;
+
+    if( Export::GetEnv("UPDMINOREXT") != NULL )
+    {
+        minor_ext     = string( Export::GetEnv("UPDMINOREXT") );
+        has_minor_ext = minor_ext.size();
+    }
+    else
+        has_minor_ext = false;
+
     // localize through all repositories
     for( vector<string>::iterator iter = repos.begin(); iter != repos.end() ; ++iter )
     {
-        string curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter;
+        string curRepository;
+        if( has_minor_ext )
+            curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter + minor_ext;
+        else
+            curRepository = string( Export::GetEnv("SOURCE_ROOT_DIR") ) + "/" + *iter;
         cout << "Localizing repository " << curRepository << "\n";
         SourceTreeLocalizer aIter( ByteString( curRepository.c_str() ) , sVersion , (sOutput.Len() > 0) , bQuiet2 , bSkipLinks );
         aIter.SetLanguageRestriction( sLanguages );
diff --git a/transex3/source/makefile.mk b/l10ntools/source/makefile.mk
index a557b210aad0..a8f17e8d6570 100644
--- a/transex3/source/makefile.mk
+++ b/l10ntools/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.46 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,7 +29,7 @@ PRJ=..
 
 INCPRE=$(MISC)
 
-PRJNAME=transex3
+PRJNAME=l10ntools
 TARGET=transex
 TARGETTYPE=CUI
 LIBTARGET=no
diff --git a/transex3/source/merge.cxx b/l10ntools/source/merge.cxx
index ee0f6f459655..3284b7026107 100644
--- a/transex3/source/merge.cxx
+++ b/l10ntools/source/merge.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: merge.cxx,v $
- * $Revision: 1.27.36.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 #include <tools/fsys.hxx>
 #include "export.hxx"
diff --git a/transex3/source/src_yy_wrapper.c b/l10ntools/source/src_yy_wrapper.c
index d326b9a94e86..d326b9a94e86 100644
--- a/transex3/source/src_yy_wrapper.c
+++ b/l10ntools/source/src_yy_wrapper.c
diff --git a/transex3/source/srciter.cxx b/l10ntools/source/srciter.cxx
index d2cbb2352570..e928a244efe6 100644
--- a/transex3/source/srciter.cxx
+++ b/l10ntools/source/srciter.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: srciter.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 
 #include "srciter.hxx"
 #include <stdio.h>
diff --git a/transex3/source/srclex.l b/l10ntools/source/srclex.l
index fef251e47224..473da8b5d511 100644
--- a/transex3/source/srclex.l
+++ b/l10ntools/source/srclex.l
@@ -260,8 +260,8 @@ main( int argc, char* argv[])
     
 	pOutput = GetOutputFile( argc, argv );
 	if( !isQuiet() ){ 
-        fprintf( stdout, "\nTransEx 3.1 Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.\n" );
-	    fprintf( stdout, "========================================================================\n" );
+        fprintf( stdout, "\nTransEx 3.1 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
+	    fprintf( stdout, "=====================================================================================\n" );
     }
 
     if ( !pOutput ) {
diff --git a/transex3/source/tagtest.cxx b/l10ntools/source/tagtest.cxx
index 89c1ecf15488..c382aaa7272d 100644
--- a/transex3/source/tagtest.cxx
+++ b/l10ntools/source/tagtest.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: tagtest.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <tools/string.hxx>
 #include "tagtest.hxx"
 
diff --git a/transex3/source/treeconfig.cxx b/l10ntools/source/treeconfig.cxx
index 137492c39a50..137492c39a50 100644
--- a/transex3/source/treeconfig.cxx
+++ b/l10ntools/source/treeconfig.cxx
diff --git a/transex3/source/utf8conv.cxx b/l10ntools/source/utf8conv.cxx
index 8fc61f9bb5cc..23642a29c88a 100644
--- a/transex3/source/utf8conv.cxx
+++ b/l10ntools/source/utf8conv.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: utf8conv.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include "utf8conv.hxx"
 
 //
diff --git a/transex3/source/wrdtrans.cxx b/l10ntools/source/wrdtrans.cxx
index 71866cd0e618..10d6f472640f 100644
--- a/transex3/source/wrdtrans.cxx
+++ b/l10ntools/source/wrdtrans.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: wrdtrans.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 
 /*
 #include "wrdtrans.hxx"
diff --git a/transex3/source/wtranode.cxx b/l10ntools/source/wtranode.cxx
index 0383ffa7feac..47fadc5d17f7 100644
--- a/transex3/source/wtranode.cxx
+++ b/l10ntools/source/wtranode.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: wtranode.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 
 
 #include "wtranode.hxx"
diff --git a/transex3/source/wtratree.cxx b/l10ntools/source/wtratree.cxx
index fea67215ba51..28adf7c7142b 100644
--- a/transex3/source/wtratree.cxx
+++ b/l10ntools/source/wtratree.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: wtratree.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 
 
 #include "wtratree.hxx"
diff --git a/transex3/source/xgfconv.cxx b/l10ntools/source/xgfconv.cxx
index 76ea1a2906a8..54b92fb3c1c2 100644
--- a/transex3/source/xgfconv.cxx
+++ b/l10ntools/source/xgfconv.cxx
@@ -6,7 +6,7 @@
 /*****************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #if defined(UNX) || defined(OS2)
 int main( int argc, char *argv[] )
 #else
diff --git a/transex3/source/xmlparse.cxx b/l10ntools/source/xmlparse.cxx
index 921f1d329f67..14b5944488a9 100644
--- a/transex3/source/xmlparse.cxx
+++ b/l10ntools/source/xmlparse.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: xmlparse.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <iterator> /* std::iterator*/
 
 #include <stdio.h>
diff --git a/transex3/source/xrm_yy_wrapper.c b/l10ntools/source/xrm_yy_wrapper.c
index 6a304d0d09dc..6a304d0d09dc 100644
--- a/transex3/source/xrm_yy_wrapper.c
+++ b/l10ntools/source/xrm_yy_wrapper.c
diff --git a/transex3/source/xrmlex.l b/l10ntools/source/xrmlex.l
index efc8bf1f7d91..c28aede4c6c1 100644
--- a/transex3/source/xrmlex.l
+++ b/l10ntools/source/xrmlex.l
@@ -180,8 +180,8 @@ main( int argc, char* argv[])
 
 	pOutput = GetOutputFile( argc, argv );
     if( !isQuiet() ){
-        fprintf( stdout, "\nXrmEx 0.9 Copyright 2000 Sun Microsystems, Inc. All Rights Reserved.\n" );
-	    fprintf( stdout, "======================================================================\n" );
+        fprintf( stdout, "\nXrmEx 0.9 Copyright 2000, 2010 Oracle and/or its affiliates. All Rights Reserved.\n" );
+	    fprintf( stdout, "===================================================================================\n" );
     }
 
 	if ( !pOutput ) {
diff --git a/transex3/source/xrmmerge.cxx b/l10ntools/source/xrmmerge.cxx
index f1b3d4d6cb5a..149fd560fe3b 100644
--- a/transex3/source/xrmmerge.cxx
+++ b/l10ntools/source/xrmmerge.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: xrmmerge.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_transex3.hxx"
+#include "precompiled_l10ntools.hxx"
 #include <stdio.h>
 #include <tools/string.hxx>
 #include <tools/fsys.hxx>
diff --git a/transex3/workbench/gsicheck_errors.sdf b/l10ntools/workbench/gsicheck_errors.sdf
index 04dde12e13ca..04dde12e13ca 100644
--- a/transex3/workbench/gsicheck_errors.sdf
+++ b/l10ntools/workbench/gsicheck_errors.sdf
diff --git a/transex3/workbench/gsicheck_errors_err-.sdf b/l10ntools/workbench/gsicheck_errors_err-.sdf
index f6b267b1c55b..f6b267b1c55b 100644
--- a/transex3/workbench/gsicheck_errors_err-.sdf
+++ b/l10ntools/workbench/gsicheck_errors_err-.sdf
diff --git a/transex3/workbench/gsicheck_errors_err-l.sdf b/l10ntools/workbench/gsicheck_errors_err-l.sdf
index 6ca7f7065cd2..6ca7f7065cd2 100644
--- a/transex3/workbench/gsicheck_errors_err-l.sdf
+++ b/l10ntools/workbench/gsicheck_errors_err-l.sdf
diff --git a/transex3/workbench/gsicheck_errors_err-s.sdf b/l10ntools/workbench/gsicheck_errors_err-s.sdf
index 523017fcfb35..523017fcfb35 100644
--- a/transex3/workbench/gsicheck_errors_err-s.sdf
+++ b/l10ntools/workbench/gsicheck_errors_err-s.sdf
diff --git a/transex3/workbench/gsicheck_errors_err-t.sdf b/l10ntools/workbench/gsicheck_errors_err-t.sdf
index e9594642113c..e9594642113c 100644
--- a/transex3/workbench/gsicheck_errors_err-t.sdf
+++ b/l10ntools/workbench/gsicheck_errors_err-t.sdf
diff --git a/transex3/workbench/gsicheck_errors_ok-.sdf b/l10ntools/workbench/gsicheck_errors_ok-.sdf
index 4bb4b7bece16..4bb4b7bece16 100644
--- a/transex3/workbench/gsicheck_errors_ok-.sdf
+++ b/l10ntools/workbench/gsicheck_errors_ok-.sdf
diff --git a/transex3/workbench/gsicheck_errors_ok-l.sdf b/l10ntools/workbench/gsicheck_errors_ok-l.sdf
index 9a55e7c95dd3..9a55e7c95dd3 100644
--- a/transex3/workbench/gsicheck_errors_ok-l.sdf
+++ b/l10ntools/workbench/gsicheck_errors_ok-l.sdf
diff --git a/transex3/workbench/gsicheck_errors_ok-s.sdf b/l10ntools/workbench/gsicheck_errors_ok-s.sdf
index 97dd4da6a54b..97dd4da6a54b 100644
--- a/transex3/workbench/gsicheck_errors_ok-s.sdf
+++ b/l10ntools/workbench/gsicheck_errors_ok-s.sdf
diff --git a/transex3/workbench/gsicheck_errors_ok-t.sdf b/l10ntools/workbench/gsicheck_errors_ok-t.sdf
index a6c097e6bd2f..a6c097e6bd2f 100644
--- a/transex3/workbench/gsicheck_errors_ok-t.sdf
+++ b/l10ntools/workbench/gsicheck_errors_ok-t.sdf
diff --git a/transex3/workbench/gsicheckcheck.btm b/l10ntools/workbench/gsicheckcheck.btm
index de71b17da332..de71b17da332 100644
--- a/transex3/workbench/gsicheckcheck.btm
+++ b/l10ntools/workbench/gsicheckcheck.btm
diff --git a/o3tl/inc/o3tl/cow_wrapper.hxx b/o3tl/inc/o3tl/cow_wrapper.hxx
index 9b281e3967bf..9f9248922917 100644
--- a/o3tl/inc/o3tl/cow_wrapper.hxx
+++ b/o3tl/inc/o3tl/cow_wrapper.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cow_wrapper.hxx,v $
- * $Revision: 1.6.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/o3tl/inc/o3tl/heap_ptr.hxx b/o3tl/inc/o3tl/heap_ptr.hxx
index a372fa32788d..581a2062fa5a 100644
--- a/o3tl/inc/o3tl/heap_ptr.hxx
+++ b/o3tl/inc/o3tl/heap_ptr.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: heap_ptr.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/o3tl/inc/o3tl/lazy_update.hxx b/o3tl/inc/o3tl/lazy_update.hxx
index 3d76ace9c22d..92c434772afb 100644
--- a/o3tl/inc/o3tl/lazy_update.hxx
+++ b/o3tl/inc/o3tl/lazy_update.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: lazy_update.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/o3tl/inc/o3tl/range.hxx b/o3tl/inc/o3tl/range.hxx
index 30ad2338f68f..a4519b881fa8 100644
--- a/o3tl/inc/o3tl/range.hxx
+++ b/o3tl/inc/o3tl/range.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: range.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/o3tl/qa/cow_wrapper_clients.cxx b/o3tl/qa/cow_wrapper_clients.cxx
index ae49a357f012..8c8c3eac04e1 100644
--- a/o3tl/qa/cow_wrapper_clients.cxx
+++ b/o3tl/qa/cow_wrapper_clients.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: cow_wrapper_clients.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/o3tl/qa/cow_wrapper_clients.hxx b/o3tl/qa/cow_wrapper_clients.hxx
index 83df1d2460aa..26e5d1adf2e3 100644
--- a/o3tl/qa/cow_wrapper_clients.hxx
+++ b/o3tl/qa/cow_wrapper_clients.hxx
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cow_wrapper_clients.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/o3tl/qa/export.map b/o3tl/qa/export.map
index bfd13f454044..709047ae63e5 100644
--- a/o3tl/qa/export.map
+++ b/o3tl/qa/export.map
@@ -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: export.map,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/o3tl/qa/makefile.mk b/o3tl/qa/makefile.mk
index b592790516da..7effe534bbee 100644
--- a/o3tl/qa/makefile.mk
+++ b/o3tl/qa/makefile.mk
@@ -1,15 +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: makefile.mk,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/o3tl/qa/test-heap_ptr.cxx b/o3tl/qa/test-heap_ptr.cxx
index 25f2209c94f5..44dc2083947a 100644
--- a/o3tl/qa/test-heap_ptr.cxx
+++ b/o3tl/qa/test-heap_ptr.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: test-heap_ptr.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/o3tl/qa/test-range.cxx b/o3tl/qa/test-range.cxx
index fa956db96005..9ead908675b9 100644
--- a/o3tl/qa/test-range.cxx
+++ b/o3tl/qa/test-range.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: test-range.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/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 58c37dcffa83..0f398c7e480a 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.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: adddlg.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/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index bb17044e800a..6cf545e130db 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.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: adddlg.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/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx
index c6daf547369c..76d181fb8e5e 100644
--- a/padmin/source/cmddlg.cxx
+++ b/padmin/source/cmddlg.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: cmddlg.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/padmin/source/cmddlg.hxx b/padmin/source/cmddlg.hxx
index 82a88e8423a8..9e6d12cf4277 100644
--- a/padmin/source/cmddlg.hxx
+++ b/padmin/source/cmddlg.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: cmddlg.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/padmin/source/desktopcontext.cxx b/padmin/source/desktopcontext.cxx
index d63be8ef608f..25db25bfaa31 100644
--- a/padmin/source/desktopcontext.cxx
+++ b/padmin/source/desktopcontext.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: desktopcontext.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/padmin/source/desktopcontext.hxx b/padmin/source/desktopcontext.hxx
index 9ae758470d15..13dcdd4c0105 100644
--- a/padmin/source/desktopcontext.hxx
+++ b/padmin/source/desktopcontext.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: desktopcontext.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/padmin/source/fontentry.cxx b/padmin/source/fontentry.cxx
index d76171e704c1..608a240b9866 100644
--- a/padmin/source/fontentry.cxx
+++ b/padmin/source/fontentry.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: fontentry.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/padmin/source/fontentry.hxx b/padmin/source/fontentry.hxx
index 30f53db97051..c9585564be9f 100644
--- a/padmin/source/fontentry.hxx
+++ b/padmin/source/fontentry.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: fontentry.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/padmin/source/helper.cxx b/padmin/source/helper.cxx
index 8ec82c052b68..b81d37df5cb1 100644
--- a/padmin/source/helper.cxx
+++ b/padmin/source/helper.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: helper.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/padmin/source/helper.hxx b/padmin/source/helper.hxx
index cd159bbc21c4..636241b826a6 100644
--- a/padmin/source/helper.hxx
+++ b/padmin/source/helper.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: helper.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/padmin/source/makefile.mk b/padmin/source/makefile.mk
index 91e4ca2a25f4..8bcbd51ef832 100644
--- a/padmin/source/makefile.mk
+++ b/padmin/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.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/padmin/source/newppdlg.cxx b/padmin/source/newppdlg.cxx
index 0fd6aa32c984..e1760c28db30 100644
--- a/padmin/source/newppdlg.cxx
+++ b/padmin/source/newppdlg.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: newppdlg.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/padmin/source/newppdlg.hxx b/padmin/source/newppdlg.hxx
index bd73b5ffed3e..5b4aa9f755eb 100644
--- a/padmin/source/newppdlg.hxx
+++ b/padmin/source/newppdlg.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: newppdlg.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/padmin/source/padialog.cxx b/padmin/source/padialog.cxx
index f73427526be6..3ea15e28141c 100644
--- a/padmin/source/padialog.cxx
+++ b/padmin/source/padialog.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: padialog.cxx,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,11 +57,16 @@
 #include "unotools/localedatawrapper.hxx"
 #include "unotools/configitem.hxx"
 #include "unotools/configmgr.hxx"
+
+#include "com/sun/star/awt/Size.hpp"
+
 using namespace psp;
 using namespace rtl;
 using namespace padmin;
 using namespace osl;
+using namespace com::sun::star;
 using namespace com::sun::star::uno;
+using namespace com::sun::star::beans;
 
 PADialog* PADialog::Create( Window* pParent, BOOL bAdmin )
 {
@@ -96,7 +98,6 @@ PADialog::PADialog( Window* pParent, BOOL /*bAdmin*/ ) :
         m_aCancelButton( this, PaResId( RID_PA_BTN_CANCEL ) ),
         m_aDefPrt( PaResId( RID_PA_STR_DEFPRT ) ),
         m_aRenameStr( PaResId( RID_PA_STR_RENAME ) ),
-        m_pPrinter( 0 ),
         m_rPIManager( PrinterInfoManager::get() )
 {
     FreeResource();
@@ -248,18 +249,6 @@ IMPL_LINK( PADialog, SelectHdl, ListBox*, pListBox )
     return 0;
 }
 
-IMPL_LINK( PADialog, EndPrintHdl, void*, EMPTYARG )
-{
-    String aInfoString( PaResId( RID_PA_TXT_TESTPAGE_PRINTED ) );
-    InfoBox aInfoBox( this, aInfoString );
-    aInfoBox.SetText( String( PaResId( RID_BXT_TESTPAGE ) ) );
-    aInfoBox.Execute();
-
-    delete m_pPrinter;
-    m_pPrinter = NULL;
-    return 0;
-}
-
 void PADialog::UpdateDefPrt()
 {
     m_rPIManager.setDefaultPrinter( getSelectedDevice() );
@@ -369,66 +358,77 @@ static Color approachColor( const Color& rFrom, const Color& rTo )
     return aColor;
 }
 
-#define DELTA 5.0
-void PADialog::PrintTestPage()
+class SpaPrinterController : public vcl::PrinterController
 {
-    if( m_pPrinter ) // already printing; user pressed button twice
-        return;
+public:
+    SpaPrinterController( const boost::shared_ptr<Printer>& i_pPrinter )
+    : vcl::PrinterController( i_pPrinter )
+    {}
+    virtual ~SpaPrinterController()
+    {}
+
+    virtual int getPageCount() const { return 1; }
+    virtual Sequence< PropertyValue > getPageParameters( int i_nPage ) const;
+    virtual void printPage( int i_nPage ) const;
+    virtual void jobFinished( com::sun::star::view::PrintableState );
+};
+
+Sequence< PropertyValue > SpaPrinterController::getPageParameters( int ) const
+{
+    Sequence< PropertyValue > aRet( 1 );
 
-    String sPrinter( getSelectedDevice() );
+    Size aPageSize( getPrinter()->GetPaperSizePixel() );
+    aPageSize = getPrinter()->PixelToLogic( aPageSize, MapMode( MAP_100TH_MM ) );
+
+    awt::Size aSize;
+    aSize.Width = aPageSize.Width();
+    aSize.Height = aPageSize.Height();
+    aRet[0].Value = makeAny(aSize);
+
+    return aRet;
+}
+
+void SpaPrinterController::printPage( int ) const
+{
+    const double DELTA = 5.0;
 
-    m_pPrinter = new Printer( sPrinter );
+    boost::shared_ptr<Printer> pPrinter( getPrinter() );
 
-    PrinterInfo aInfo( m_rPIManager.getPrinterInfo( sPrinter ) );
+    PrinterInfo aInfo( psp::PrinterInfoManager::get().getPrinterInfo( pPrinter->GetName() ) );
     const PPDParser* pPrintParser = aInfo.m_pParser;
 
     MapMode aMapMode( MAP_100TH_MM );
 
     Bitmap aButterfly( PaResId( RID_BUTTERFLY ) );
 
-    m_pPrinter->SetMapMode( aMapMode );
-    m_pPrinter->SetEndPrintHdl( LINK( this, PADialog, EndPrintHdl ) );
+    pPrinter->SetMapMode( aMapMode );
 
     Any aRet = utl::ConfigManager::GetDirectConfigProperty( utl::ConfigManager::PRODUCTNAME );
     OUString aJobName;
     aRet >>= aJobName;
 
     aJobName = aJobName + OUString( RTL_CONSTASCII_USTRINGPARAM( " Testpage" ) );
-    if( m_pPrinter->GetName() != sPrinter || ! m_pPrinter->StartJob( aJobName ) )
-    {
-        String aString( PaResId( RID_ERR_NOPRINTER ) );
-        aString.SearchAndReplaceAscii( "%s", sPrinter );
-
-        ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, aString );
-        aErrorBox.SetText( String( PaResId( RID_BXT_ENVIRONMENT ) ) );
-        aErrorBox.Execute();
-        delete m_pPrinter;
-        m_pPrinter = 0;
-        return;
-    }
-    m_pPrinter->StartPage();
 
-    Size aPaperSize=m_pPrinter->GetOutputSize();
+    Size aPaperSize=pPrinter->GetOutputSize();
     Point aCenter( aPaperSize.Width()/2-300,
                    aPaperSize.Height() - aPaperSize.Width()/2 );
     Point aP1( aPaperSize.Width()/48, 0), aP2( aPaperSize.Width()/40, 0 ), aPoint;
 
-    m_pPrinter->DrawRect( Rectangle( Point( 0,0 ), aPaperSize ) );
-    m_pPrinter->DrawRect( Rectangle( Point( 100,100 ),
+    pPrinter->DrawRect( Rectangle( Point( 0,0 ), aPaperSize ) );
+    pPrinter->DrawRect( Rectangle( Point( 100,100 ),
                                     Size( aPaperSize.Width()-200,
                                           aPaperSize.Height()-200 ) ) );
-    m_pPrinter->DrawRect( Rectangle( Point( 200,200 ),
+    pPrinter->DrawRect( Rectangle( Point( 200,200 ),
                                     Size( aPaperSize.Width()-400,
                                           aPaperSize.Height()-400 ) ) );
-    m_pPrinter->DrawRect( Rectangle( Point( 300,300 ),
+    pPrinter->DrawRect( Rectangle( Point( 300,300 ),
                                     Size( aPaperSize.Width()-600,
                                           aPaperSize.Height()-600 ) ) );
 
-    Font aFont( m_pPrinter->GetFont() );
-    aFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM( "Courier" ) ) );
+    Font aFont( String( RTL_CONSTASCII_USTRINGPARAM( "Courier" ) ), Size( 0, 400 ) );
     aFont.SetWeight( WEIGHT_NORMAL );
     aFont.SetItalic( ITALIC_NONE );
-    m_pPrinter->SetFont( aFont );
+    pPrinter->SetFont( aFont );
 
     OUStringBuffer aPrintText(1024);
     long nWidth = 0, nMaxWidth = 0;
@@ -455,12 +455,12 @@ void PADialog::PrintTestPage()
             aToken = String::CreateFromAscii( aResIds[i].pDirect );
         else
             aToken = String( PaResId( aResIds[i].nResId ) );
-        nMaxWidth = ( nWidth = m_pPrinter->GetTextWidth( aToken ) ) > nMaxWidth ? nWidth : nMaxWidth;
+        nMaxWidth = ( nWidth = pPrinter->GetTextWidth( aToken ) ) > nMaxWidth ? nWidth : nMaxWidth;
         aPrintText.append( aToken );
         aPrintText.append( (sal_Unicode)'\n' );
     };
 
-    m_pPrinter->DrawText( Rectangle( Point( 1000, 2000 ),
+    pPrinter->DrawText( Rectangle( Point( 1000, 1000 ),
                                     Size( aPaperSize.Width() - 2000,
                                           aPaperSize.Height() - 4000 ) ),
                           aPrintText.makeStringAndClear(),
@@ -470,7 +470,7 @@ void PADialog::PrintTestPage()
     const LocaleDataWrapper& rLocaleWrapper( aSettings.GetLocaleDataWrapper() );
 
     aPrintText.appendAscii( ": " );
-    aPrintText.append( sPrinter );
+    aPrintText.append( pPrinter->GetName() );
     aPrintText.appendAscii( "\n: " );
     if( pPrintParser )
         aPrintText.append( pPrintParser->getPrinterName() );
@@ -487,17 +487,17 @@ void PADialog::PrintTestPage()
     aPrintText.appendAscii( "\n: " );
     aPrintText.append( rLocaleWrapper.getTime( Time() ) );
 
-    m_pPrinter->DrawText( Rectangle( Point( 1100 + nMaxWidth, 2000 ),
+    pPrinter->DrawText( Rectangle( Point( 1100 + nMaxWidth, 1000 ),
                                     Size( aPaperSize.Width() - 2100 - nMaxWidth,
                                           aPaperSize.Height() - 4000 ) ),
                          aPrintText.makeStringAndClear(),
                          TEXT_DRAW_MULTILINE );
 
-    m_pPrinter->DrawBitmap( Point( aPaperSize.Width() - 4000, 1000 ),
+    pPrinter->DrawBitmap( Point( aPaperSize.Width() - 4000, 1000 ),
                            Size( 3000,3000 ),
                            aButterfly );
-    m_pPrinter->SetFillColor();
-    m_pPrinter->DrawRect( Rectangle( Point( aPaperSize.Width() - 4000, 1000 ),
+    pPrinter->SetFillColor();
+    pPrinter->DrawRect( Rectangle( Point( aPaperSize.Width() - 4000, 1000 ),
                                      Size( 3000,3000 ) ) );
 
     Color aWhite( 0xff, 0xff, 0xff );
@@ -511,22 +511,22 @@ void PADialog::PrintTestPage()
 
     Gradient aGradient( GRADIENT_LINEAR, aBlack, aWhite );
     aGradient.SetAngle( 900 );
-    m_pPrinter->DrawGradient( Rectangle( Point( 1000, 5500 ),
+    pPrinter->DrawGradient( Rectangle( Point( 1000, 5500 ),
                                         Size( aPaperSize.Width() - 2000,
                                               500 ) ), aGradient );
     aGradient.SetStartColor( aDarkRed );
     aGradient.SetEndColor( aLightBlue );
-    m_pPrinter->DrawGradient( Rectangle( Point( 1000, 6300 ),
+    pPrinter->DrawGradient( Rectangle( Point( 1000, 6300 ),
                                         Size( aPaperSize.Width() - 2000,
                                               500 ) ), aGradient );
     aGradient.SetStartColor( aDarkBlue );
     aGradient.SetEndColor( aLightGreen );
-    m_pPrinter->DrawGradient( Rectangle( Point( 1000, 7100 ),
+    pPrinter->DrawGradient( Rectangle( Point( 1000, 7100 ),
                                         Size( aPaperSize.Width() - 2000,
                                               500 ) ), aGradient );
     aGradient.SetStartColor( aDarkGreen );
     aGradient.SetEndColor( aLightRed );
-    m_pPrinter->DrawGradient( Rectangle( Point( 1000, 7900 ),
+    pPrinter->DrawGradient( Rectangle( Point( 1000, 7900 ),
                                         Size( aPaperSize.Width() - 2000,
                                               500 ) ), aGradient );
 
@@ -543,7 +543,7 @@ void PADialog::PrintTestPage()
     {
         aLineInfo.SetWidth( n/3 );
         aLineColor = approachColor( aLineColor, aApproachColor );
-        m_pPrinter->SetLineColor( aLineColor );
+        pPrinter->SetLineColor( aLineColor );
 
         // switch aproach color
         if( aApproachColor.IsRGBEqual( aLineColor ) )
@@ -556,7 +556,7 @@ void PADialog::PrintTestPage()
                 aApproachColor = Color( 0, 200, 0 );
         }
 
-        m_pPrinter->DrawLine( project( aP1 ) + aCenter,
+        pPrinter->DrawLine( project( aP1 ) + aCenter,
                              project( aP2 ) + aCenter,
                              aLineInfo );
         aPoint.X() = (int)((((double)aP1.X())*cosd - ((double)aP1.Y())*sind)*factor);
@@ -569,8 +569,38 @@ void PADialog::PrintTestPage()
 #if (OSL_DEBUG_LEVEL > 1) || defined DBG_UTIL
     fprintf( stderr, "%d lines\n",n );
 #endif
-    m_pPrinter->EndPage();
-    m_pPrinter->EndJob();
+}
+
+void SpaPrinterController::jobFinished( com::sun::star::view::PrintableState )
+{
+    String aInfoString( PaResId( RID_PA_TXT_TESTPAGE_PRINTED ) );
+    InfoBox aInfoBox( NULL, aInfoString );
+    aInfoBox.SetText( String( PaResId( RID_BXT_TESTPAGE ) ) );
+    aInfoBox.Execute();
+}
+
+void PADialog::PrintTestPage()
+{
+    String sPrinter( getSelectedDevice() );
+
+    boost::shared_ptr<Printer> pPrinter( new Printer( sPrinter ) );
+
+    if( pPrinter->GetName() != sPrinter )
+    {
+        String aString( PaResId( RID_ERR_NOPRINTER ) );
+        aString.SearchAndReplaceAscii( "%s", sPrinter );
+
+        ErrorBox aErrorBox( this, WB_OK | WB_DEF_OK, aString );
+        aErrorBox.SetText( String( PaResId( RID_BXT_ENVIRONMENT ) ) );
+        aErrorBox.Execute();
+        return;
+    }
+
+    boost::shared_ptr<vcl::PrinterController> pController( new SpaPrinterController( pPrinter ) );
+    JobSetup aJobSetup( pPrinter->GetJobSetup() );
+    aJobSetup.SetValue( String( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) ),
+                        String( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) );
+    Printer::PrintJob( pController, aJobSetup );
 }
 
 void PADialog::AddDevice()
diff --git a/padmin/source/padialog.hrc b/padmin/source/padialog.hrc
index 58e112415674..2f238592231a 100644
--- a/padmin/source/padialog.hrc
+++ b/padmin/source/padialog.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: padialog.hrc,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/padmin/source/padialog.hxx b/padmin/source/padialog.hxx
index ac6ee8f4279f..2a8285f8af88 100644
--- a/padmin/source/padialog.hxx
+++ b/padmin/source/padialog.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: padialog.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -83,7 +80,6 @@ namespace padmin {
         String                              m_aDefPrt;
         String                              m_aRenameStr;
 
-        Printer*                            m_pPrinter;
         ::psp::PrinterInfoManager&          m_rPIManager;
         ::std::list< ::rtl::OUString >      m_aPrinters;
 
@@ -94,7 +90,6 @@ namespace padmin {
         DECL_LINK( ClickBtnHdl, PushButton* );
         DECL_LINK( DoubleClickHdl, ListBox* );
         DECL_LINK( SelectHdl, ListBox* );
-        DECL_LINK( EndPrintHdl, void* );
         DECL_LINK( DelPressedHdl, ListBox* );
 
         PADialog( Window*,  BOOL );
diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src
index c7b8a5f62a45..8834bba3226c 100644
--- a/padmin/source/padialog.src
+++ b/padmin/source/padialog.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: padialog.src,v $
- * $Revision: 1.60 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/padmin/source/pamain.cxx b/padmin/source/pamain.cxx
index ba70b89b234b..f46a2c8a3149 100644
--- a/padmin/source/pamain.cxx
+++ b/padmin/source/pamain.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: pamain.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/padmin/source/progress.cxx b/padmin/source/progress.cxx
index 3bf3c98bf0ac..03ef67db8da9 100644
--- a/padmin/source/progress.cxx
+++ b/padmin/source/progress.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: progress.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/padmin/source/progress.hxx b/padmin/source/progress.hxx
index 5db9d8d75b24..552a049c3572 100644
--- a/padmin/source/progress.hxx
+++ b/padmin/source/progress.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: progress.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/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index 6cf4f8b257b1..17d28515e540 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.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: prtsetup.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -44,9 +41,9 @@ using namespace rtl;
 using namespace psp;
 using namespace padmin;
 
-void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDKey* pKey )
+void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDParser* pParser, const PPDKey* pKey )
 {
-    if( ! pKey )
+    if( ! pKey || ! pParser )
         return;
 
     const PPDValue* pValue = NULL;
@@ -56,7 +53,7 @@ void RTSDialog::insertAllPPDValues( ListBox& rBox, const PPDKey* pKey )
     for( int i = 0; i < pKey->countValues(); i++ )
     {
         pValue = pKey->getValue( i );
-        aOptionText = pValue->m_aOptionTranslation.Len() ? pValue->m_aOptionTranslation : pValue->m_aOption;
+        aOptionText = pParser->translateOption( pKey->getKey(), pValue->m_aOption) ;
 
         if( m_aJobData.m_aContext.checkConstraints( pKey, pValue ) )
         {
@@ -282,7 +279,7 @@ void RTSPaperPage::update()
     if( m_pParent->m_aJobData.m_pParser &&
         (pKey = m_pParent->m_aJobData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) )) )
     {
-        m_pParent->insertAllPPDValues( m_aDuplexBox, pKey );
+        m_pParent->insertAllPPDValues( m_aDuplexBox, m_pParent->m_aJobData.m_pParser, pKey );
     }
     else
     {
@@ -294,7 +291,7 @@ void RTSPaperPage::update()
     if( m_pParent->m_aJobData.m_pParser &&
         (pKey = m_pParent->m_aJobData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "PageSize" ) ) )) )
     {
-        m_pParent->insertAllPPDValues( m_aPaperBox, pKey );
+        m_pParent->insertAllPPDValues( m_aPaperBox, m_pParent->m_aJobData.m_pParser, pKey );
     }
     else
     {
@@ -306,7 +303,7 @@ void RTSPaperPage::update()
     if( m_pParent->m_aJobData.m_pParser &&
         (pKey = m_pParent->m_aJobData.m_pParser->getKey( String::CreateFromAscii( "InputSlot" ) )) )
     {
-        m_pParent->insertAllPPDValues( m_aSlotBox, pKey );
+        m_pParent->insertAllPPDValues( m_aSlotBox, m_pParent->m_aJobData.m_pParser, pKey );
     }
     else
     {
@@ -411,8 +408,8 @@ RTSDevicePage::RTSDevicePage( RTSDialog* pParent ) :
                 ! pKey->getKey().EqualsAscii( "Duplex" )
                 )
             {
-                USHORT nPos =
-                    m_aPPDKeyBox.InsertEntry( pKey->getUITranslation().Len() ? pKey->getUITranslation() : pKey->getKey() );
+                String aEntry( m_pParent->m_aJobData.m_pParser->translateKey( pKey->getKey() ) );
+                USHORT nPos = m_aPPDKeyBox.InsertEntry( aEntry );
                 m_aPPDKeyBox.SetEntryData( nPos, (void*)pKey );
             }
         }
@@ -466,10 +463,11 @@ void RTSDevicePage::FillValueBox( const PPDKey* pKey )
     for( int i = 0; i < pKey->countValues(); i++ )
     {
         pValue = pKey->getValue( i );
-        if( m_pParent->m_aJobData.m_aContext.checkConstraints( pKey, pValue ) )
+        if( m_pParent->m_aJobData.m_aContext.checkConstraints( pKey, pValue ) &&
+            m_pParent->m_aJobData.m_pParser )
         {
-            USHORT nPos =
-                m_aPPDValueBox.InsertEntry( pValue->m_aOptionTranslation.Len() ? pValue->m_aOptionTranslation : pValue->m_aOption );
+            String aEntry( m_pParent->m_aJobData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption ) );
+            USHORT nPos = m_aPPDValueBox.InsertEntry( aEntry );
             m_aPPDValueBox.SetEntryData( nPos, (void*)pValue );
         }
     }
diff --git a/padmin/source/prtsetup.hxx b/padmin/source/prtsetup.hxx
index 8487daa158da..65288f738482 100644
--- a/padmin/source/prtsetup.hxx
+++ b/padmin/source/prtsetup.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: prtsetup.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -85,7 +82,7 @@ class RTSDialog : public TabDialog
     DECL_LINK( ClickButton, Button* );
 
     // helper functions
-    void insertAllPPDValues( ListBox&, const ::psp::PPDKey* );
+    void insertAllPPDValues( ListBox&, const psp::PPDParser*, const psp::PPDKey* );
 public:
     RTSDialog( const ::psp::PrinterInfo& rJobData, const String& rPrinter, bool bAllPages, Window* pParent = NULL );
     ~RTSDialog();
diff --git a/padmin/source/psetupl.xpm b/padmin/source/psetupl.xpm
index 82690860d739..159374756290 100644
--- a/padmin/source/psetupl.xpm
+++ b/padmin/source/psetupl.xpm
@@ -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: 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/padmin/source/rtsetup.hrc b/padmin/source/rtsetup.hrc
index 47fc48959fba..30439088de8e 100644
--- a/padmin/source/rtsetup.hrc
+++ b/padmin/source/rtsetup.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: rtsetup.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/padmin/source/rtsetup.src b/padmin/source/rtsetup.src
index ff91118381f4..e04374a72245 100644
--- a/padmin/source/rtsetup.src
+++ b/padmin/source/rtsetup.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: rtsetup.src,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/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
index b128c002c99b..31ab4382fe52 100644
--- a/padmin/source/spadmin.sh
+++ b/padmin/source/spadmin.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: spadmin.sh,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/padmin/source/titlectrl.cxx b/padmin/source/titlectrl.cxx
index 513927459444..450780dce1e3 100644
--- a/padmin/source/titlectrl.cxx
+++ b/padmin/source/titlectrl.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: titlectrl.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/padmin/source/titlectrl.hxx b/padmin/source/titlectrl.hxx
index d76498a95871..75c8d3eeeceb 100644
--- a/padmin/source/titlectrl.hxx
+++ b/padmin/source/titlectrl.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: titlectrl.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/psprint_config/configuration/ppds/SGENPRT.PS b/psprint_config/configuration/ppds/SGENPRT.PS
index 38c1619d8795..79eead5f329a 100644
--- a/psprint_config/configuration/ppds/SGENPRT.PS
+++ b/psprint_config/configuration/ppds/SGENPRT.PS
@@ -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/psprint_config/configuration/ppds/SGENT42.PS b/psprint_config/configuration/ppds/SGENT42.PS
index ce8fdb0666c3..3f61379a2269 100644
--- a/psprint_config/configuration/ppds/SGENT42.PS
+++ b/psprint_config/configuration/ppds/SGENT42.PS
@@ -1,14 +1,10 @@
 *PPD-Adobe: "4.0"
 *% DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/psprint_config/configuration/ppds/makefile.mk b/psprint_config/configuration/ppds/makefile.mk
index d24aefe043b4..f2908bfae09b 100644
--- a/psprint_config/configuration/ppds/makefile.mk
+++ b/psprint_config/configuration/ppds/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/regexp/inc/makefile.mk b/regexp/inc/makefile.mk
index 18c265557487..b65b126709e7 100644
--- a/regexp/inc/makefile.mk
+++ b/regexp/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/regexp/inc/pch/precompiled_regexp.cxx b/regexp/inc/pch/precompiled_regexp.cxx
index 490b865ff101..2adcb54dccdb 100644
--- a/regexp/inc/pch/precompiled_regexp.cxx
+++ b/regexp/inc/pch/precompiled_regexp.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: precompiled_regexp.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/regexp/inc/pch/precompiled_regexp.hxx b/regexp/inc/pch/precompiled_regexp.hxx
index 7c8cc4ac9cd7..5b02201128a6 100644
--- a/regexp/inc/pch/precompiled_regexp.hxx
+++ b/regexp/inc/pch/precompiled_regexp.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_regexp.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/regexp/source/makefile.mk b/regexp/source/makefile.mk
index 40c98d777a19..7aa2a2eaa03b 100644
--- a/regexp/source/makefile.mk
+++ b/regexp/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/regexp/source/reclass.cxx b/regexp/source/reclass.cxx
index 104fe04fbaab..b376c2d05881 100644
--- a/regexp/source/reclass.cxx
+++ b/regexp/source/reclass.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: reclass.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/rsc/inc/pch/precompiled_rsc.cxx b/rsc/inc/pch/precompiled_rsc.cxx
index 2f62f82c5896..ca6005d3aed8 100644
--- a/rsc/inc/pch/precompiled_rsc.cxx
+++ b/rsc/inc/pch/precompiled_rsc.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: precompiled_rsc.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/rsc/inc/pch/precompiled_rsc.hxx b/rsc/inc/pch/precompiled_rsc.hxx
index 01886ac647cf..829e1e736b93 100644
--- a/rsc/inc/pch/precompiled_rsc.hxx
+++ b/rsc/inc/pch/precompiled_rsc.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_rsc.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/rsc/inc/rscall.h b/rsc/inc/rscall.h
index e3abe2673de7..e556758054b8 100644
--- a/rsc/inc/rscall.h
+++ b/rsc/inc/rscall.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: rscall.h,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/rsc/inc/rscarray.hxx b/rsc/inc/rscarray.hxx
index b9269d6460a8..e47c11e03777 100644
--- a/rsc/inc/rscarray.hxx
+++ b/rsc/inc/rscarray.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: rscarray.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/rsc/inc/rscclass.hxx b/rsc/inc/rscclass.hxx
index ad077b4233a4..67cc59628fd0 100644
--- a/rsc/inc/rscclass.hxx
+++ b/rsc/inc/rscclass.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: rscclass.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/rsc/inc/rscclobj.hxx b/rsc/inc/rscclobj.hxx
index ab31de2eaf32..34bc38350399 100644
--- a/rsc/inc/rscclobj.hxx
+++ b/rsc/inc/rscclobj.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: rscclobj.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/rsc/inc/rscconst.hxx b/rsc/inc/rscconst.hxx
index 27a0b5453326..70612310fbab 100644
--- a/rsc/inc/rscconst.hxx
+++ b/rsc/inc/rscconst.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: rscconst.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/rsc/inc/rsccont.hxx b/rsc/inc/rsccont.hxx
index e5a509205afc..49d2600d91df 100644
--- a/rsc/inc/rsccont.hxx
+++ b/rsc/inc/rsccont.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: rsccont.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/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index 53bde7298485..1d5af35de9ff 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.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: rscdb.hxx,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/rsc/inc/rscdef.hxx b/rsc/inc/rscdef.hxx
index dc0e79cd4514..a21b03685325 100644
--- a/rsc/inc/rscdef.hxx
+++ b/rsc/inc/rscdef.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: rscdef.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/rsc/inc/rscerror.h b/rsc/inc/rscerror.h
index a957e2c7b202..f3a4428127f3 100644
--- a/rsc/inc/rscerror.h
+++ b/rsc/inc/rscerror.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: rscerror.h,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/rsc/inc/rscflag.hxx b/rsc/inc/rscflag.hxx
index 7dfb78c953e1..d517e0e0d2b3 100644
--- a/rsc/inc/rscflag.hxx
+++ b/rsc/inc/rscflag.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: rscflag.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/rsc/inc/rschash.hxx b/rsc/inc/rschash.hxx
index a678bd9b5101..bb8b4670b11b 100644
--- a/rsc/inc/rschash.hxx
+++ b/rsc/inc/rschash.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: rschash.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/rsc/inc/rscinst.hxx b/rsc/inc/rscinst.hxx
index 85c641aa3333..6cdfac1173e7 100644
--- a/rsc/inc/rscinst.hxx
+++ b/rsc/inc/rscinst.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: rscinst.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/rsc/inc/rsckey.hxx b/rsc/inc/rsckey.hxx
index 0fc0ac0c1366..717be1009154 100644
--- a/rsc/inc/rsckey.hxx
+++ b/rsc/inc/rsckey.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: rsckey.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/rsc/inc/rsclst.hxx b/rsc/inc/rsclst.hxx
index df20562547e5..89e4bfda2402 100644
--- a/rsc/inc/rsclst.hxx
+++ b/rsc/inc/rsclst.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: rsclst.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/rsc/inc/rscmgr.hxx b/rsc/inc/rscmgr.hxx
index 2af5b01d115f..b8c0e43031ee 100644
--- a/rsc/inc/rscmgr.hxx
+++ b/rsc/inc/rscmgr.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: rscmgr.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/rsc/inc/rscpar.hxx b/rsc/inc/rscpar.hxx
index d390153e8232..989ec924550c 100644
--- a/rsc/inc/rscpar.hxx
+++ b/rsc/inc/rscpar.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: rscpar.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/rsc/inc/rscrange.hxx b/rsc/inc/rscrange.hxx
index d702bef12586..96559037e51f 100644
--- a/rsc/inc/rscrange.hxx
+++ b/rsc/inc/rscrange.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: rscrange.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/rsc/inc/rscrsc.hxx b/rsc/inc/rscrsc.hxx
index 128a956e51f5..c2b0a70a1b66 100644
--- a/rsc/inc/rscrsc.hxx
+++ b/rsc/inc/rscrsc.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: rscrsc.hxx,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/rsc/inc/rscsfx.hxx b/rsc/inc/rscsfx.hxx
index e46a0225e394..830bbcf37baa 100644
--- a/rsc/inc/rscsfx.hxx
+++ b/rsc/inc/rscsfx.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: rscsfx.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/rsc/inc/rscstr.hxx b/rsc/inc/rscstr.hxx
index 0a6efbac4979..6d32a437b09e 100644
--- a/rsc/inc/rscstr.hxx
+++ b/rsc/inc/rscstr.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: rscstr.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/rsc/inc/rsctools.hxx b/rsc/inc/rsctools.hxx
index fd8e49135eb0..287a079f63c8 100644
--- a/rsc/inc/rsctools.hxx
+++ b/rsc/inc/rsctools.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: rsctools.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/rsc/inc/rsctop.hxx b/rsc/inc/rsctop.hxx
index c651ae9d8a78..85aa06614574 100644
--- a/rsc/inc/rsctop.hxx
+++ b/rsc/inc/rsctop.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: rsctop.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/rsc/inc/rsctree.hxx b/rsc/inc/rsctree.hxx
index 4893ad3fd292..0ee0f3b5056f 100644
--- a/rsc/inc/rsctree.hxx
+++ b/rsc/inc/rsctree.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: rsctree.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/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx
index 2704fced5c01..19677171dcb2 100644
--- a/rsc/inc/vclrsc.hxx
+++ b/rsc/inc/vclrsc.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: vclrsc.hxx,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/rsc/source/misc/makefile.mk b/rsc/source/misc/makefile.mk
index b639e70317a9..d447770878a5 100644
--- a/rsc/source/misc/makefile.mk
+++ b/rsc/source/misc/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/rsc/source/misc/rscdbl.cxx b/rsc/source/misc/rscdbl.cxx
index 7fdadc7419ef..591f6b3fd4f6 100644
--- a/rsc/source/misc/rscdbl.cxx
+++ b/rsc/source/misc/rscdbl.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: rscdbl.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/rsc/source/misc/rsclst.cxx b/rsc/source/misc/rsclst.cxx
index f2b549e84049..ee2d4a14f328 100644
--- a/rsc/source/misc/rsclst.cxx
+++ b/rsc/source/misc/rsclst.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: rsclst.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/rsc/source/parser/erscerr.cxx b/rsc/source/parser/erscerr.cxx
index 818e2066c221..11aaf9cce85f 100644
--- a/rsc/source/parser/erscerr.cxx
+++ b/rsc/source/parser/erscerr.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: erscerr.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/rsc/source/parser/makefile.mk b/rsc/source/parser/makefile.mk
index 68c12479261b..1254bee932f6 100644
--- a/rsc/source/parser/makefile.mk
+++ b/rsc/source/parser/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/rsc/source/parser/parser.cxx b/rsc/source/parser/parser.cxx
index a5b6da55d1f3..1ba974a4778d 100644
--- a/rsc/source/parser/parser.cxx
+++ b/rsc/source/parser/parser.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: parser.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/rsc/source/parser/parser.hxx b/rsc/source/parser/parser.hxx
index 10651edd76c1..274b720b1e2d 100644
--- a/rsc/source/parser/parser.hxx
+++ b/rsc/source/parser/parser.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: parser.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/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx
index 65ad139963eb..97d23d4e3b53 100644
--- a/rsc/source/parser/rscdb.cxx
+++ b/rsc/source/parser/rscdb.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: rscdb.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/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx
index 75f558398bb5..1a896c897e27 100644
--- a/rsc/source/parser/rscibas.cxx
+++ b/rsc/source/parser/rscibas.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: rscibas.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/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 9ae58087a335..625417769f45 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.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: rscicpx.cxx,v $
- * $Revision: 1.17 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2281,6 +2278,7 @@ RscTop * RscTypCont::InitClassTabControl( RscTop * pSuper,
                                        RSC_TABCONTROL_ITEMLIST );
 
         INS_WINBIT( pClassTabControl, SingleLine );
+        INS_WINBIT( pClassTabControl, DropDown );
     }
 
     return pClassTabControl;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index c2908cafe95a..a763b92f0bb1 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.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: rscinit.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/rsc/source/parser/rsckey.cxx b/rsc/source/parser/rsckey.cxx
index 5baba631174e..4a42bea138bf 100644
--- a/rsc/source/parser/rsckey.cxx
+++ b/rsc/source/parser/rsckey.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: rsckey.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/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx
index 8c34637fa304..e0df5de254f9 100644
--- a/rsc/source/parser/rsclex.cxx
+++ b/rsc/source/parser/rsclex.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: rsclex.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/rsc/source/parser/rsclex.hxx b/rsc/source/parser/rsclex.hxx
index 63afd0b208c7..06c04f4126a3 100644
--- a/rsc/source/parser/rsclex.hxx
+++ b/rsc/source/parser/rsclex.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: rsclex.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/rsc/source/parser/rscpar.cxx b/rsc/source/parser/rscpar.cxx
index dcee424bfdce..22606e2f8bf2 100644
--- a/rsc/source/parser/rscpar.cxx
+++ b/rsc/source/parser/rscpar.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: rscpar.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/rsc/source/parser/rscyacc.cxx b/rsc/source/parser/rscyacc.cxx
index 8da3de9bf2b3..89891581d9ba 100644
--- a/rsc/source/parser/rscyacc.cxx
+++ b/rsc/source/parser/rscyacc.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: rscyacc.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/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y
index 032e77517799..a522d7416782 100644
--- a/rsc/source/parser/rscyacc.y
+++ b/rsc/source/parser/rscyacc.y
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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/rsc/source/prj/gui.cxx b/rsc/source/prj/gui.cxx
index 6bf466348d1b..0ff0549d161f 100644
--- a/rsc/source/prj/gui.cxx
+++ b/rsc/source/prj/gui.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: gui.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/rsc/source/prj/makefile.mk b/rsc/source/prj/makefile.mk
index 1e58270aa67c..89b00a779d3b 100644
--- a/rsc/source/prj/makefile.mk
+++ b/rsc/source/prj/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/rsc/source/prj/start.cxx b/rsc/source/prj/start.cxx
index df4ce12200c5..b36614cec8c4 100644
--- a/rsc/source/prj/start.cxx
+++ b/rsc/source/prj/start.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: start.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/rsc/source/res/makefile.mk b/rsc/source/res/makefile.mk
index adae87f4954b..af63fdd0789a 100644
--- a/rsc/source/res/makefile.mk
+++ b/rsc/source/res/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx
index de5850c48d9c..d04903ea8692 100644
--- a/rsc/source/res/rscall.cxx
+++ b/rsc/source/res/rscall.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: rscall.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/rsc/source/res/rscarray.cxx b/rsc/source/res/rscarray.cxx
index 78a9ea488042..5e9023a83e83 100644
--- a/rsc/source/res/rscarray.cxx
+++ b/rsc/source/res/rscarray.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: rscarray.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/rsc/source/res/rscclass.cxx b/rsc/source/res/rscclass.cxx
index 0ce745ec1640..877d11afee83 100644
--- a/rsc/source/res/rscclass.cxx
+++ b/rsc/source/res/rscclass.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: rscclass.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/rsc/source/res/rscclobj.cxx b/rsc/source/res/rscclobj.cxx
index d114ae534f5d..b2632a73857c 100644
--- a/rsc/source/res/rscclobj.cxx
+++ b/rsc/source/res/rscclobj.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: rscclobj.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/rsc/source/res/rscconst.cxx b/rsc/source/res/rscconst.cxx
index 75d5cd4bb609..3961cbd539de 100644
--- a/rsc/source/res/rscconst.cxx
+++ b/rsc/source/res/rscconst.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: rscconst.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/rsc/source/res/rsccont.cxx b/rsc/source/res/rsccont.cxx
index ffaac1c458a9..072c5feaa31d 100644
--- a/rsc/source/res/rsccont.cxx
+++ b/rsc/source/res/rsccont.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: rsccont.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/rsc/source/res/rscflag.cxx b/rsc/source/res/rscflag.cxx
index e57501069c7a..e742b806408e 100644
--- a/rsc/source/res/rscflag.cxx
+++ b/rsc/source/res/rscflag.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: rscflag.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/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx
index c756fc894b57..3e3d29372fe7 100644
--- a/rsc/source/res/rscmgr.cxx
+++ b/rsc/source/res/rscmgr.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: rscmgr.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/rsc/source/res/rscrange.cxx b/rsc/source/res/rscrange.cxx
index 4e265eeb3df7..5ade3936bdf8 100644
--- a/rsc/source/res/rscrange.cxx
+++ b/rsc/source/res/rscrange.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: rscrange.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/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx
index 5130bb126b58..6bf25cf4dd58 100644
--- a/rsc/source/res/rscstr.cxx
+++ b/rsc/source/res/rscstr.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: rscstr.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/rsc/source/res/rsctop.cxx b/rsc/source/res/rsctop.cxx
index fd30e5218042..4b7887ebf298 100644
--- a/rsc/source/res/rsctop.cxx
+++ b/rsc/source/res/rsctop.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: rsctop.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/rsc/source/rsc/makefile.mk b/rsc/source/rsc/makefile.mk
index 89abd22207d9..95f7c84c9de7 100644
--- a/rsc/source/rsc/makefile.mk
+++ b/rsc/source/rsc/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/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx
index 934c41d5e9a9..40d589aea359 100644
--- a/rsc/source/rsc/rsc.cxx
+++ b/rsc/source/rsc/rsc.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: rsc.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/rsc/source/rscpp/cpp.h b/rsc/source/rscpp/cpp.h
index 18f7336cf50d..11327d4fb9d1 100644
--- a/rsc/source/rscpp/cpp.h
+++ b/rsc/source/rscpp/cpp.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: cpp.h,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/rsc/source/rscpp/cpp1.c b/rsc/source/rscpp/cpp1.c
index e3ac953a83c7..1eb7561a2db0 100644
--- a/rsc/source/rscpp/cpp1.c
+++ b/rsc/source/rscpp/cpp1.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cpp1.c,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/rsc/source/rscpp/cpp2.c b/rsc/source/rscpp/cpp2.c
index de2664c3a7a7..68d1d2dc72ba 100644
--- a/rsc/source/rscpp/cpp2.c
+++ b/rsc/source/rscpp/cpp2.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cpp2.c,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/rsc/source/rscpp/cpp3.c b/rsc/source/rscpp/cpp3.c
index 2ae1265d630f..e9c03cdd4874 100644
--- a/rsc/source/rscpp/cpp3.c
+++ b/rsc/source/rscpp/cpp3.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cpp3.c,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/rsc/source/rscpp/cpp4.c b/rsc/source/rscpp/cpp4.c
index f449f03c904b..b8f90ab4f7ed 100644
--- a/rsc/source/rscpp/cpp4.c
+++ b/rsc/source/rscpp/cpp4.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cpp4.c,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/rsc/source/rscpp/cpp5.c b/rsc/source/rscpp/cpp5.c
index 2828a7a19055..70f05543c465 100644
--- a/rsc/source/rscpp/cpp5.c
+++ b/rsc/source/rscpp/cpp5.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cpp5.c,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/rsc/source/rscpp/cpp6.c b/rsc/source/rscpp/cpp6.c
index 4af7cd79c4c7..fd2a2a9a0dd7 100644
--- a/rsc/source/rscpp/cpp6.c
+++ b/rsc/source/rscpp/cpp6.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cpp6.c,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/rsc/source/rscpp/cppdef.h b/rsc/source/rscpp/cppdef.h
index 270cee88b2ba..cdbf07766c8f 100644
--- a/rsc/source/rscpp/cppdef.h
+++ b/rsc/source/rscpp/cppdef.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: cppdef.h,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/rsc/source/rscpp/cppmain.c b/rsc/source/rscpp/cppmain.c
index 5cf0b3a13b8c..3060a6d6be9a 100644
--- a/rsc/source/rscpp/cppmain.c
+++ b/rsc/source/rscpp/cppmain.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: cppmain.c,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/rsc/source/rscpp/makefile.mk b/rsc/source/rscpp/makefile.mk
index 0cdcecdbbeb1..ca62bb37792c 100644
--- a/rsc/source/rscpp/makefile.mk
+++ b/rsc/source/rscpp/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/rsc/source/tools/makefile.mk b/rsc/source/tools/makefile.mk
index afb4949abfc3..74024ca599d8 100644
--- a/rsc/source/tools/makefile.mk
+++ b/rsc/source/tools/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/rsc/source/tools/rscchar.cxx b/rsc/source/tools/rscchar.cxx
index 4f6c4ed7be5e..ca421dde372a 100644
--- a/rsc/source/tools/rscchar.cxx
+++ b/rsc/source/tools/rscchar.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: rscchar.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/rsc/source/tools/rscdef.cxx b/rsc/source/tools/rscdef.cxx
index 8ce58cd56c48..eb714bbcc3c2 100644
--- a/rsc/source/tools/rscdef.cxx
+++ b/rsc/source/tools/rscdef.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: rscdef.cxx,v $
- * $Revision: 1.7.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/rsc/source/tools/rschash.cxx b/rsc/source/tools/rschash.cxx
index cd4e0c3a9e05..dc7d898fde7a 100644
--- a/rsc/source/tools/rschash.cxx
+++ b/rsc/source/tools/rschash.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: rschash.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/rsc/source/tools/rsctools.cxx b/rsc/source/tools/rsctools.cxx
index f0a8c578ae1f..9904cd20d4e7 100644
--- a/rsc/source/tools/rsctools.cxx
+++ b/rsc/source/tools/rsctools.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: rsctools.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/rsc/source/tools/rsctree.cxx b/rsc/source/tools/rsctree.cxx
index f1773fbdbb7f..991e32aa580c 100644
--- a/rsc/source/tools/rsctree.cxx
+++ b/rsc/source/tools/rsctree.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: rsctree.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/sax/inc/sax/dllapi.h b/sax/inc/sax/dllapi.h
index 9f6a5713d847..e9aca11fb0bd 100644
--- a/sax/inc/sax/dllapi.h
+++ b/sax/inc/sax/dllapi.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: dllapi.h,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/sax/inc/sax/fastattribs.hxx b/sax/inc/sax/fastattribs.hxx
index e7c42c55bafd..9a968982d39e 100644
--- a/sax/inc/sax/fastattribs.hxx
+++ b/sax/inc/sax/fastattribs.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: fastattribs.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/sax/inc/sax/fshelper.hxx b/sax/inc/sax/fshelper.hxx
index 5223c253af91..f816e3edc1c3 100644
--- a/sax/inc/sax/fshelper.hxx
+++ b/sax/inc/sax/fshelper.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$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/inc/sax/parser/saxparser.hxx b/sax/inc/sax/parser/saxparser.hxx
index 84b5eaa9af3b..dde71accd680 100644
--- a/sax/inc/sax/parser/saxparser.hxx
+++ b/sax/inc/sax/parser/saxparser.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: saxparser.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/sax/inc/sax/tools/attributemap.hxx b/sax/inc/sax/tools/attributemap.hxx
index cd67536e7747..ea8f55a9b626 100644
--- a/sax/inc/sax/tools/attributemap.hxx
+++ b/sax/inc/sax/tools/attributemap.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: attributemap.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/sax/inc/sax/tools/converter.hxx b/sax/inc/sax/tools/converter.hxx
index f8c988d2fceb..1e783b4a4ec9 100644
--- a/sax/inc/sax/tools/converter.hxx
+++ b/sax/inc/sax/tools/converter.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: converter.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/sax/inc/sax/tools/saxobject.hxx b/sax/inc/sax/tools/saxobject.hxx
index 7865ec7f7d2a..56b901d9579f 100644
--- a/sax/inc/sax/tools/saxobject.hxx
+++ b/sax/inc/sax/tools/saxobject.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: saxobject.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/sax/inc/sax/tools/tokenmap.hxx b/sax/inc/sax/tools/tokenmap.hxx
index 2937acbf1ae6..42add0690e9a 100644
--- a/sax/inc/sax/tools/tokenmap.hxx
+++ b/sax/inc/sax/tools/tokenmap.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: tokenmap.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/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 98d601009d22..1a0640f5a687 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.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: xml2utf.hxx,v $
- * $Revision: 1.3.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/source/expatwrap/attrlistimpl.cxx b/sax/source/expatwrap/attrlistimpl.cxx
index 4eb07be50311..114eb653f648 100644
--- a/sax/source/expatwrap/attrlistimpl.cxx
+++ b/sax/source/expatwrap/attrlistimpl.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: attrlistimpl.cxx,v $
- * $Revision: 1.8.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/source/expatwrap/attrlistimpl.hxx b/sax/source/expatwrap/attrlistimpl.hxx
index 481d9527ffb7..aaf6cf84b359 100644
--- a/sax/source/expatwrap/attrlistimpl.hxx
+++ b/sax/source/expatwrap/attrlistimpl.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: attrlistimpl.hxx,v $
- * $Revision: 1.5.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/source/expatwrap/factory.hxx b/sax/source/expatwrap/factory.hxx
index fd89eed3c32a..c6a566781044 100644
--- a/sax/source/expatwrap/factory.hxx
+++ b/sax/source/expatwrap/factory.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: factory.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/sax/source/expatwrap/makefile.mk b/sax/source/expatwrap/makefile.mk
index 5cbee4c94706..bcb73b0443ac 100644
--- a/sax/source/expatwrap/makefile.mk
+++ b/sax/source/expatwrap/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index b1726f750127..4ffebfa3590d 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.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: sax_expat.cxx,v $
- * $Revision: 1.18.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index 717767d86e11..ddc585ae38a4 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.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: saxwriter.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/sax/source/expatwrap/xml2utf.cxx b/sax/source/expatwrap/xml2utf.cxx
index 63332684889d..bbd72b2a0d8b 100644
--- a/sax/source/expatwrap/xml2utf.cxx
+++ b/sax/source/expatwrap/xml2utf.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: xml2utf.cxx,v $
- * $Revision: 1.11.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 2b2461c1173f..84941bee8e37 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.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: fastparser.cxx,v $
- * $Revision: 1.4.10.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/source/fastparser/fastparser.hxx b/sax/source/fastparser/fastparser.hxx
index 3e6220a0c782..236db124c99e 100644
--- a/sax/source/fastparser/fastparser.hxx
+++ b/sax/source/fastparser/fastparser.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$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/source/fastparser/makefile.mk b/sax/source/fastparser/makefile.mk
index 83c183212656..7f70b7aee7bf 100644
--- a/sax/source/fastparser/makefile.mk
+++ b/sax/source/fastparser/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index e13df493628a..9bdd91f4b5e4 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.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: converter.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/sax/source/tools/fastattribs.cxx b/sax/source/tools/fastattribs.cxx
index 43e5f75d2907..4bf9d55c75b8 100644
--- a/sax/source/tools/fastattribs.cxx
+++ b/sax/source/tools/fastattribs.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: fastattribs.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/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index da4fdfb261db..b0318516b72c 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.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: contexthandler2.cxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.1.2.2 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: dr $ $Date: 2008/02/11 10:43: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/sax/source/tools/fastserializer.hxx b/sax/source/tools/fastserializer.hxx
index b0baf8af5df8..a98a0ff7a67d 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.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: serializer.hxx,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.2.4.1 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: dr $ $Date: 2008/02/15 12:56:11 $
+ * 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/sax/source/tools/makefile.mk b/sax/source/tools/makefile.mk
index 80f51d8dc806..5923fc5a7785 100644
--- a/sax/source/tools/makefile.mk
+++ b/sax/source/tools/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/test/makefile.mk b/sax/test/makefile.mk
index 7bb3944f12e6..7fb7837a4ff3 100644
--- a/sax/test/makefile.mk
+++ b/sax/test/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/test/sax/factory.hxx b/sax/test/sax/factory.hxx
index b2db268c7c67..4ab5553a8b78 100644
--- a/sax/test/sax/factory.hxx
+++ b/sax/test/sax/factory.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: factory.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/sax/test/sax/makefile.mk b/sax/test/sax/makefile.mk
index ce48a0c3a980..b283366ff8a3 100644
--- a/sax/test/sax/makefile.mk
+++ b/sax/test/sax/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/test/sax/testsax.cxx b/sax/test/sax/testsax.cxx
index 8fe989676993..b51f4cb59181 100644
--- a/sax/test/sax/testsax.cxx
+++ b/sax/test/sax/testsax.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: testsax.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/sax/test/sax/testwriter.cxx b/sax/test/sax/testwriter.cxx
index ede5931f2a0a..27c8559d51d4 100644
--- a/sax/test/sax/testwriter.cxx
+++ b/sax/test/sax/testwriter.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: testwriter.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/sax/test/saxdemo.cxx b/sax/test/saxdemo.cxx
index 8e78b7df20a5..6023f09ac948 100644
--- a/sax/test/saxdemo.cxx
+++ b/sax/test/saxdemo.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: saxdemo.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/sax/test/testcomponent.cxx b/sax/test/testcomponent.cxx
index 121c25a446fb..f22366092b67 100644
--- a/sax/test/testcomponent.cxx
+++ b/sax/test/testcomponent.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: testcomponent.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/sax/util/makefile.mk b/sax/util/makefile.mk
index 01e2e3bd8d03..5e2f378603e9 100644
--- a/sax/util/makefile.mk
+++ b/sax/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sax/util/makefile.pmk b/sax/util/makefile.pmk
index cfb446dde5d4..1c044bb10ff0 100644
--- a/sax/util/makefile.pmk
+++ b/sax/util/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: makefile.pmk,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/sot/inc/absdev.hxx b/sot/inc/absdev.hxx
index 5c0fe75e6401..3d251d98e0b6 100644
--- a/sot/inc/absdev.hxx
+++ b/sot/inc/absdev.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: absdev.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/sot/inc/agg.hxx b/sot/inc/agg.hxx
index 6b0be72834a2..2f8cc7587458 100644
--- a/sot/inc/agg.hxx
+++ b/sot/inc/agg.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: agg.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/sot/inc/clsids.hxx b/sot/inc/clsids.hxx
index 819182fcedb9..a64df510dd07 100644
--- a/sot/inc/clsids.hxx
+++ b/sot/inc/clsids.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: clsids.hxx,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/sot/inc/filelist.hxx b/sot/inc/filelist.hxx
index 72e4d1a4bc04..4c6c55534319 100644
--- a/sot/inc/filelist.hxx
+++ b/sot/inc/filelist.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: filelist.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/sot/inc/makefile.mk b/sot/inc/makefile.mk
index 0f6420375333..bc31cd07e06b 100644
--- a/sot/inc/makefile.mk
+++ b/sot/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sot/inc/pch/precompiled_sot.cxx b/sot/inc/pch/precompiled_sot.cxx
index 9719ac2a63a1..fea8683f8074 100644
--- a/sot/inc/pch/precompiled_sot.cxx
+++ b/sot/inc/pch/precompiled_sot.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: precompiled_sot.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/sot/inc/pch/precompiled_sot.hxx b/sot/inc/pch/precompiled_sot.hxx
index 61ea3ce4c590..4edee1275640 100644
--- a/sot/inc/pch/precompiled_sot.hxx
+++ b/sot/inc/pch/precompiled_sot.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_sot.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/sot/inc/sot/exchange.hxx b/sot/inc/sot/exchange.hxx
index 0c235fffcdbb..dc67e72a4f82 100644
--- a/sot/inc/sot/exchange.hxx
+++ b/sot/inc/sot/exchange.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: exchange.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/sot/inc/sot/factory.hxx b/sot/inc/sot/factory.hxx
index 097df72ec1d9..08dd21a88aa5 100644
--- a/sot/inc/sot/factory.hxx
+++ b/sot/inc/sot/factory.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: factory.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/sot/inc/sot/formats.hxx b/sot/inc/sot/formats.hxx
index d977ec91600e..c9d7a3e69d78 100644
--- a/sot/inc/sot/formats.hxx
+++ b/sot/inc/sot/formats.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: formats.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/sot/inc/sot/object.hxx b/sot/inc/sot/object.hxx
index 433b5469431e..db2ac3b30ffc 100644
--- a/sot/inc/sot/object.hxx
+++ b/sot/inc/sot/object.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: object.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/sot/inc/sot/sotdata.hxx b/sot/inc/sot/sotdata.hxx
index fb7694240288..8d8775b5e181 100644
--- a/sot/inc/sot/sotdata.hxx
+++ b/sot/inc/sot/sotdata.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: sotdata.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/sot/inc/sot/sotdllapi.h b/sot/inc/sot/sotdllapi.h
index 324bcc81538d..032fef762715 100644
--- a/sot/inc/sot/sotdllapi.h
+++ b/sot/inc/sot/sotdllapi.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: sotdllapi.h,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/sot/inc/sot/sotref.hxx b/sot/inc/sot/sotref.hxx
index 34f4f8fd8faf..ae03032e286e 100644
--- a/sot/inc/sot/sotref.hxx
+++ b/sot/inc/sot/sotref.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: sotref.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/sot/inc/sot/storage.hxx b/sot/inc/sot/storage.hxx
index c678d2997d93..572e100c7299 100644
--- a/sot/inc/sot/storage.hxx
+++ b/sot/inc/sot/storage.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: storage.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/sot/inc/stg.hxx b/sot/inc/stg.hxx
index 68f397491957..84373e26d596 100644
--- a/sot/inc/stg.hxx
+++ b/sot/inc/stg.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: stg.hxx,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/sot/inc/storinfo.hxx b/sot/inc/storinfo.hxx
index a3b10bbc8c0e..dab1f6d4540e 100644
--- a/sot/inc/storinfo.hxx
+++ b/sot/inc/storinfo.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: storinfo.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/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
index 8494f3fb0ba3..054480d377d1 100644
--- a/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.java
+++ b/sot/qa/complex/olesimplestorage/OLESimpleStorageUnitTest.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: OLESimpleStorageUnitTest.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/sot/qa/complex/olesimplestorage/makefile.mk b/sot/qa/complex/olesimplestorage/makefile.mk
index baee53428854..3420d798c9bc 100644
--- a/sot/qa/complex/olesimplestorage/makefile.mk
+++ b/sot/qa/complex/olesimplestorage/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.3.10.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 6dedd84cdaeb..67c2b64f105f 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.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: exchange.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/sot/source/base/factory.cxx b/sot/source/base/factory.cxx
index 31afe62efd09..4934f99e78c6 100644
--- a/sot/source/base/factory.cxx
+++ b/sot/source/base/factory.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: factory.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/sot/source/base/filelist.cxx b/sot/source/base/filelist.cxx
index 15bbb8b1569e..4f854add304d 100644
--- a/sot/source/base/filelist.cxx
+++ b/sot/source/base/filelist.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: filelist.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/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index fafee57472df..baddde6e716f 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.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: formats.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/sot/source/base/makefile.mk b/sot/source/base/makefile.mk
index 4faac7787145..861b7cc5969b 100644
--- a/sot/source/base/makefile.mk
+++ b/sot/source/base/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sot/source/base/object.cxx b/sot/source/base/object.cxx
index 0062b7a7fb1c..403a1c6bb61d 100644
--- a/sot/source/base/object.cxx
+++ b/sot/source/base/object.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: object.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/sot/source/sdstor/makefile.mk b/sot/source/sdstor/makefile.mk
index 5aac69f73641..f5c6d81548c9 100644
--- a/sot/source/sdstor/makefile.mk
+++ b/sot/source/sdstor/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sot/source/sdstor/stg.cxx b/sot/source/sdstor/stg.cxx
index a246eefafb8f..1c749aa05cb8 100644
--- a/sot/source/sdstor/stg.cxx
+++ b/sot/source/sdstor/stg.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: stg.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/sot/source/sdstor/stgavl.cxx b/sot/source/sdstor/stgavl.cxx
index 090ca71a1b7f..3542a965da33 100644
--- a/sot/source/sdstor/stgavl.cxx
+++ b/sot/source/sdstor/stgavl.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: stgavl.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/sot/source/sdstor/stgavl.hxx b/sot/source/sdstor/stgavl.hxx
index 5680fd716070..66f424888e6d 100644
--- a/sot/source/sdstor/stgavl.hxx
+++ b/sot/source/sdstor/stgavl.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: stgavl.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/sot/source/sdstor/stgcache.cxx b/sot/source/sdstor/stgcache.cxx
index 1d2973782223..88a8187ee9dd 100644
--- a/sot/source/sdstor/stgcache.cxx
+++ b/sot/source/sdstor/stgcache.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: stgcache.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/sot/source/sdstor/stgcache.hxx b/sot/source/sdstor/stgcache.hxx
index e75e6988777d..5379f837b8b1 100644
--- a/sot/source/sdstor/stgcache.hxx
+++ b/sot/source/sdstor/stgcache.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: stgcache.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/sot/source/sdstor/stgdir.cxx b/sot/source/sdstor/stgdir.cxx
index 4daa409f7a3a..f093dc60cbe7 100644
--- a/sot/source/sdstor/stgdir.cxx
+++ b/sot/source/sdstor/stgdir.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: stgdir.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/sot/source/sdstor/stgdir.hxx b/sot/source/sdstor/stgdir.hxx
index 0b31e0c919bd..3ef510a12e50 100644
--- a/sot/source/sdstor/stgdir.hxx
+++ b/sot/source/sdstor/stgdir.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: stgdir.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/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx
index ed29ca8305a8..46d7f1803140 100644
--- a/sot/source/sdstor/stgelem.cxx
+++ b/sot/source/sdstor/stgelem.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: stgelem.cxx,v $
- * $Revision: 1.12.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx
index b8cada6b1355..7a5b7bc52b26 100644
--- a/sot/source/sdstor/stgelem.hxx
+++ b/sot/source/sdstor/stgelem.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: stgelem.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/sot/source/sdstor/stgio.cxx b/sot/source/sdstor/stgio.cxx
index 526f0f357f32..00dd454233e2 100644
--- a/sot/source/sdstor/stgio.cxx
+++ b/sot/source/sdstor/stgio.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: stgio.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/sot/source/sdstor/stgio.hxx b/sot/source/sdstor/stgio.hxx
index f7ffbb16c7b3..db1c00b8d521 100644
--- a/sot/source/sdstor/stgio.hxx
+++ b/sot/source/sdstor/stgio.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: stgio.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/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index da3d50385b5d..148f1e87585c 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.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: stgole.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/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index 2cd6eb0582e6..346f21035f06 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.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: stgole.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/sot/source/sdstor/stgstrms.cxx b/sot/source/sdstor/stgstrms.cxx
index 46ae3529439c..07711133bf4b 100644
--- a/sot/source/sdstor/stgstrms.cxx
+++ b/sot/source/sdstor/stgstrms.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: stgstrms.cxx,v $
- * $Revision: 1.11.8.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1104,7 +1101,7 @@ StgTmpStrm::~StgTmpStrm()
     }
 }
 
-ULONG StgTmpStrm::GetSize()
+ULONG StgTmpStrm::GetSize() const
 {
     ULONG n;
     if( pStrm )
diff --git a/sot/source/sdstor/stgstrms.hxx b/sot/source/sdstor/stgstrms.hxx
index 806d562af6d0..9b09f51db43f 100644
--- a/sot/source/sdstor/stgstrms.hxx
+++ b/sot/source/sdstor/stgstrms.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: stgstrms.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -167,8 +164,7 @@ public:
    ~StgTmpStrm();
     BOOL Copy( StgTmpStrm& );
     void SetSize( ULONG );
-    using SvMemoryStream::GetSize;
-    ULONG GetSize();
+    ULONG GetSize() const;
 };
 
 #endif
diff --git a/sot/source/sdstor/storage.cxx b/sot/source/sdstor/storage.cxx
index 26ad41285251..136abb29a98e 100644
--- a/sot/source/sdstor/storage.cxx
+++ b/sot/source/sdstor/storage.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: storage.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/sot/source/sdstor/storinfo.cxx b/sot/source/sdstor/storinfo.cxx
index ce754349a079..2aaaadd5a151 100644
--- a/sot/source/sdstor/storinfo.cxx
+++ b/sot/source/sdstor/storinfo.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: storinfo.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/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx
index d7e797c681f3..ea3b656272db 100644
--- a/sot/source/sdstor/ucbstorage.cxx
+++ b/sot/source/sdstor/ucbstorage.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: ucbstorage.cxx,v $
- * $Revision: 1.97 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,21 +40,17 @@
 #include <com/sun/star/ucb/InsertCommandArgument.hpp>
 #include <com/sun/star/ucb/ResultSetException.hpp>
 #include <com/sun/star/uno/Sequence.h>
-#ifndef _COM_SUN_STAR_SDBC_XRESULTSET_HDL_
 #include <com/sun/star/sdbc/XResultSet.hdl>
-#endif
 #include <com/sun/star/ucb/XContentAccess.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
-#include <com/sun/star/ucb/XContentCreator.hpp>
+#include <com/sun/star/ucb/ContentInfo.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
 #include <com/sun/star/beans/Property.hpp>
 #include <com/sun/star/packages/manifest/XManifestWriter.hpp>
 #include <com/sun/star/packages/manifest/XManifestReader.hpp>
-#ifndef _COM_SUN_STAR_UCB_INTERACTIVEIODEXCEPTION_HPP_
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
-#endif
 
 #include <rtl/digest.h>
 #include <tools/ref.hxx>
@@ -113,11 +106,11 @@ public:
     virtual void SAL_CALL seek( sal_Int64 _nLocation ) throw ( IllegalArgumentException, IOException, RuntimeException);
     virtual sal_Int64 SAL_CALL getPosition(  ) throw ( IOException, RuntimeException);
     virtual sal_Int64 SAL_CALL getLength(  ) throw ( IOException, RuntimeException);
-    virtual sal_Int32   SAL_CALL    readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException );
-    virtual sal_Int32   SAL_CALL    readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException );
-    virtual void        SAL_CALL    skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, RuntimeException);
-    virtual sal_Int32   SAL_CALL    available() throw( NotConnectedException, RuntimeException );
-    virtual void        SAL_CALL    closeInput() throw( NotConnectedException, RuntimeException );
+    virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException );
+    virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( NotConnectedException, BufferSizeExceededException, RuntimeException );
+    virtual void      SAL_CALL skipBytes(sal_Int32 nBytesToSkip) throw( NotConnectedException, BufferSizeExceededException, RuntimeException);
+    virtual sal_Int32 SAL_CALL available() throw( NotConnectedException, RuntimeException );
+    virtual void      SAL_CALL closeInput() throw( NotConnectedException, RuntimeException );
 
 protected:
     void checkConnected();
@@ -540,7 +533,7 @@ public:
                                                 // this means that the root storage does an autocommit when its external
                                                 // reference is destroyed
     BOOL                        m_bIsRoot;      // marks this storage as root storages that manages all oommits and reverts
-    BOOL                        m_bDirty;       // ???
+    BOOL                        m_bDirty;           // ???
     BOOL                        m_bIsLinked;
     BOOL                        m_bListCreated;
     ULONG                       m_nFormat;
@@ -575,12 +568,12 @@ public:
                                   ReadContent();
                                   if ( m_nMode & STREAM_WRITE )
                                   {
-                                      m_nError = nError;
-                                      if ( m_pAntiImpl )
-                                      {
-                                          m_pAntiImpl->ResetError();
-                                          m_pAntiImpl->SetError( nError );
-                                      }
+                                    m_nError = nError;
+                                    if ( m_pAntiImpl )
+                                    {
+                                        m_pAntiImpl->ResetError();
+                                        m_pAntiImpl->SetError( nError );
+                                    }
                                   }
 
                                   return m_aChildrenList;
@@ -867,7 +860,7 @@ BOOL UCBStorageStream_Impl::Init()
             // usually means that stream could not be opened
         }
 
-           if( m_rSource.is() )
+            if( m_rSource.is() )
         {
             m_pStream->Seek( STREAM_SEEK_TO_END );
 
@@ -894,7 +887,7 @@ BOOL UCBStorageStream_Impl::Init()
         {
             // if the new file is edited than no source exist
             m_bSourceRead = FALSE;
-               //SetError( SVSTREAM_CANNOT_MAKE );
+                //SetError( SVSTREAM_CANNOT_MAKE );
         }
     }
 
@@ -1107,7 +1100,7 @@ ULONG UCBStorageStream_Impl::SeekPos( ULONG nPos )
         else
         {
             // the temp stream pointer points to the end now
-                aResult = m_pStream->Tell();
+            aResult = m_pStream->Tell();
 
             if( aResult < nPos )
             {
@@ -1886,7 +1879,7 @@ void UCBStorage_Impl::Init()
                     {
                         if ( !pStream->GetError() )
                         {
-                              ::utl::OInputStreamWrapper* pHelper = new ::utl::OInputStreamWrapper( *pStream );
+                            ::utl::OInputStreamWrapper* pHelper = new ::utl::OInputStreamWrapper( *pStream );
                             com::sun::star::uno::Reference < ::com::sun::star::io::XInputStream > xInputStream( pHelper );
 
                             // create a manifest reader object that will read in the manifest from the stream
@@ -2042,8 +2035,8 @@ void UCBStorage_Impl::ReadContent()
                     if ( m_bRepairPackage )
                     {
                         xComEnv = new ::ucbhelper::CommandEnvironment( Reference< ::com::sun::star::task::XInteractionHandler >(),
-                                                                 m_xProgressHandler );
-                           aName += String( RTL_CONSTASCII_USTRINGPARAM( "?repairpackage" ) );
+                                                                m_xProgressHandler );
+                            aName += String( RTL_CONSTASCII_USTRINGPARAM( "?repairpackage" ) );
                     }
 
                     ::ucbhelper::Content aContent( aName, xComEnv );
@@ -2281,13 +2274,10 @@ BOOL UCBStorage_Impl::Insert( ::ucbhelper::Content *pContent )
     // a new substorage is inserted into a UCBStorage ( given by the parameter pContent )
     // it must be inserted with a title and a type
     BOOL bRet = FALSE;
-    Reference< XContentCreator > xCreator = Reference< XContentCreator >( pContent->get(), UNO_QUERY );
-    if ( !xCreator.is() )
-        return sal_False;
 
     try
     {
-        Sequence< ContentInfo > aInfo = xCreator->queryCreatableContentsInfo();
+        Sequence< ContentInfo > aInfo = pContent->queryCreatableContentsInfo();
         sal_Int32 nCount = aInfo.getLength();
         if ( nCount == 0 )
             return sal_False;
@@ -2639,7 +2629,7 @@ BOOL UCBStorage_Impl::Revert()
             }
             else if ( pElement->m_xStorage.Is() )
             {
-                 pElement->m_xStorage->m_bCommited = sal_False;
+                pElement->m_xStorage->m_bCommited = sal_False;
                 pElement->m_xStorage->Revert();
             }
 
@@ -2655,7 +2645,7 @@ BOOL UCBStorage_Impl::Revert()
 
 const String& UCBStorage::GetName() const
 {
-    return pImp->m_aName;               // pImp->m_aURL ?!
+    return pImp->m_aName; // pImp->m_aURL ?!
 }
 
 BOOL UCBStorage::IsRoot() const
@@ -2893,7 +2883,7 @@ BOOL UCBStorage::CopyTo( const String& rElemName, BaseStorage* pDest, const Stri
     else
     {
         // for copying no optimization is usefull, because in every case the stream data must be copied
-           UCBStorageElement_Impl* pElement = FindElement_Impl( rElemName );
+            UCBStorageElement_Impl* pElement = FindElement_Impl( rElemName );
         if ( pElement )
             return CopyStorageElement_Impl( *pElement, pDest, rNew );
         else
@@ -3256,10 +3246,10 @@ BOOL UCBStorage::MoveTo( const String& rEleName, BaseStorage* pNewSt, const Stri
         {
             // because the element is moved, not copied, a special optimization is possible :
             // first copy the UCBStorageElement; flag old element as "Removed" and new as "Inserted",
-             // clear original name/type of the new element
-             // if moved element is open: copy content, but change absolute URL ( and those of all children of the element! ),
+            // clear original name/type of the new element
+            // if moved element is open: copy content, but change absolute URL ( and those of all children of the element! ),
             // clear original name/type of new content, keep the old original stream/storage, but forget its working streams,
-               // close original UCBContent and original stream, only the TempFile and its stream may remain unchanged, but now
+                // close original UCBContent and original stream, only the TempFile and its stream may remain unchanged, but now
             // belong to the new content
             // if original and editable stream are identical ( readonly element ), it has to be copied to the editable
             // stream of the destination object
diff --git a/sot/source/sdstor/unostorageholder.cxx b/sot/source/sdstor/unostorageholder.cxx
index f42915589373..55c205557648 100644
--- a/sot/source/sdstor/unostorageholder.cxx
+++ b/sot/source/sdstor/unostorageholder.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: unostorageholder.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/sot/source/sdstor/unostorageholder.hxx b/sot/source/sdstor/unostorageholder.hxx
index b1e3c896c24a..5e70804745a8 100644
--- a/sot/source/sdstor/unostorageholder.hxx
+++ b/sot/source/sdstor/unostorageholder.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: unostorageholder.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/sot/source/unoolestorage/makefile.mk b/sot/source/unoolestorage/makefile.mk
index 6d7af5f59c12..d88f72f14e51 100644
--- a/sot/source/unoolestorage/makefile.mk
+++ b/sot/source/unoolestorage/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sot/source/unoolestorage/register.cxx b/sot/source/unoolestorage/register.cxx
index dca4e88b23cb..00326333546d 100644
--- a/sot/source/unoolestorage/register.cxx
+++ b/sot/source/unoolestorage/register.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: register.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/sot/source/unoolestorage/xolesimplestorage.cxx b/sot/source/unoolestorage/xolesimplestorage.cxx
index 4d63aa908afa..68686ff8c8f5 100644
--- a/sot/source/unoolestorage/xolesimplestorage.cxx
+++ b/sot/source/unoolestorage/xolesimplestorage.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: xolesimplestorage.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/sot/source/unoolestorage/xolesimplestorage.hxx b/sot/source/unoolestorage/xolesimplestorage.hxx
index 551849a736f3..c9f1b5c68b0a 100644
--- a/sot/source/unoolestorage/xolesimplestorage.hxx
+++ b/sot/source/unoolestorage/xolesimplestorage.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: xolesimplestorage.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/sot/util/makefile.mk b/sot/util/makefile.mk
index 0de549a1be0d..60b34c356217 100644
--- a/sot/util/makefile.mk
+++ b/sot/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.23 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sot/util/makefile.pmk b/sot/util/makefile.pmk
index 939d66818cd0..2d79b8068815 100644
--- a/sot/util/makefile.pmk
+++ b/sot/util/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: makefile.pmk,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/sot/workben/makefile.mk b/sot/workben/makefile.mk
index 42344fe7af95..c1c8a8d0a2ca 100644
--- a/sot/workben/makefile.mk
+++ b/sot/workben/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/sot/workben/testsot.cxx b/sot/workben/testsot.cxx
index 28a355878ac5..0bdc3113870f 100644
--- a/sot/workben/testsot.cxx
+++ b/sot/workben/testsot.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: testsot.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/svl/inc/PasswordHelper.hxx b/svl/inc/PasswordHelper.hxx
index c915ebe3854a..da9bc5da99ea 100644
--- a/svl/inc/PasswordHelper.hxx
+++ b/svl/inc/PasswordHelper.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: PasswordHelper.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/svl/inc/adrparse.hxx b/svl/inc/adrparse.hxx
index a317e27b2779..f2a85b9cacd5 100644
--- a/svl/inc/adrparse.hxx
+++ b/svl/inc/adrparse.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: adrparse.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/svl/inc/broadcast.hxx b/svl/inc/broadcast.hxx
index e80a2e446ebf..2acddb5e4f6b 100644
--- a/svl/inc/broadcast.hxx
+++ b/svl/inc/broadcast.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: broadcast.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/svl/inc/cntnrsrt.hxx b/svl/inc/cntnrsrt.hxx
index 13553f7f16fd..48ebef50ea58 100644
--- a/svl/inc/cntnrsrt.hxx
+++ b/svl/inc/cntnrsrt.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: cntnrsrt.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/svl/inc/cntwids.hrc b/svl/inc/cntwids.hrc
index fcb9f855453b..01a965c38652 100644
--- a/svl/inc/cntwids.hrc
+++ b/svl/inc/cntwids.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: cntwids.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/svl/inc/converter.hxx b/svl/inc/converter.hxx
index d012a56e7416..062feafe6f29 100644
--- a/svl/inc/converter.hxx
+++ b/svl/inc/converter.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: converter.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/svl/inc/filenotation.hxx b/svl/inc/filenotation.hxx
index c74c6c39c803..65f28659e056 100644
--- a/svl/inc/filenotation.hxx
+++ b/svl/inc/filenotation.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: filenotation.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/svl/inc/folderrestriction.hxx b/svl/inc/folderrestriction.hxx
index 82fb4e1efef5..66a99a4d49d1 100644
--- a/svl/inc/folderrestriction.hxx
+++ b/svl/inc/folderrestriction.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: folderrestriction.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/svl/inc/fstathelper.hxx b/svl/inc/fstathelper.hxx
index 1e613782b4e6..17fa62c5bbeb 100644
--- a/svl/inc/fstathelper.hxx
+++ b/svl/inc/fstathelper.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: fstathelper.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/svl/inc/inetdef.hxx b/svl/inc/inetdef.hxx
index 6ea380529147..533530838700 100644
--- a/svl/inc/inetdef.hxx
+++ b/svl/inc/inetdef.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: inetdef.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/svl/inc/inetmsg.hxx b/svl/inc/inetmsg.hxx
index f011102a79e2..bcfc4ad714ad 100644
--- a/svl/inc/inetmsg.hxx
+++ b/svl/inc/inetmsg.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: inetmsg.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/svl/inc/inetstrm.hxx b/svl/inc/inetstrm.hxx
index 46e15d5e4cf4..efb6c35a1b68 100644
--- a/svl/inc/inetstrm.hxx
+++ b/svl/inc/inetstrm.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: inetstrm.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/svl/inc/instrm.hxx b/svl/inc/instrm.hxx
index add43d4cc380..d7585c13c3b7 100644
--- a/svl/inc/instrm.hxx
+++ b/svl/inc/instrm.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: instrm.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/svl/inc/listener.hxx b/svl/inc/listener.hxx
index a121197b1dd0..3107f5ceee56 100644
--- a/svl/inc/listener.hxx
+++ b/svl/inc/listener.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: listener.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/svl/inc/listeneriter.hxx b/svl/inc/listeneriter.hxx
index a2ac5693f741..3bfb6380acaa 100644
--- a/svl/inc/listeneriter.hxx
+++ b/svl/inc/listeneriter.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: listeneriter.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/svl/inc/lngmisc.hxx b/svl/inc/lngmisc.hxx
index 55322246f773..d85de673c4c9 100644
--- a/svl/inc/lngmisc.hxx
+++ b/svl/inc/lngmisc.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: lngmisc.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/svl/inc/makefile.mk b/svl/inc/makefile.mk
index 9368bce7cde1..a99cf8acc0d2 100644
--- a/svl/inc/makefile.mk
+++ b/svl/inc/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/inc/nfsymbol.hxx b/svl/inc/nfsymbol.hxx
index 46fe47599359..8886f0e47f85 100644
--- a/svl/inc/nfsymbol.hxx
+++ b/svl/inc/nfsymbol.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: nfsymbol.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/svl/inc/numuno.hxx b/svl/inc/numuno.hxx
index d243c49a3113..425cff60763d 100644
--- a/svl/inc/numuno.hxx
+++ b/svl/inc/numuno.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: numuno.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/svl/inc/outstrm.hxx b/svl/inc/outstrm.hxx
index c01d8f460c58..f80f6f2c9616 100644
--- a/svl/inc/outstrm.hxx
+++ b/svl/inc/outstrm.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: outstrm.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/svl/inc/pch/precompiled_svl.cxx b/svl/inc/pch/precompiled_svl.cxx
index 27b37170856c..5e606a09f5f8 100644
--- a/svl/inc/pch/precompiled_svl.cxx
+++ b/svl/inc/pch/precompiled_svl.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: precompiled_svl.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/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx
index 3a813a2db2dd..b2ca22672cc6 100644
--- a/svl/inc/pch/precompiled_svl.hxx
+++ b/svl/inc/pch/precompiled_svl.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_svl.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/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx
index e8ef23e145d4..307031b578d1 100644
--- a/svl/inc/pickerhelper.hxx
+++ b/svl/inc/pickerhelper.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: pickerhelper.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/svl/inc/pickerhistory.hxx b/svl/inc/pickerhistory.hxx
index e67729a1bbd8..af282e72513d 100644
--- a/svl/inc/pickerhistory.hxx
+++ b/svl/inc/pickerhistory.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: pickerhistory.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/svl/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx
index 210fd9b92139..1a4e8ced8381 100644
--- a/svl/inc/pickerhistoryaccess.hxx
+++ b/svl/inc/pickerhistoryaccess.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: pickerhistoryaccess.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/svl/inc/poolcach.hxx b/svl/inc/poolcach.hxx
index 21cfec4662a0..949c0aee5bad 100644
--- a/svl/inc/poolcach.hxx
+++ b/svl/inc/poolcach.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: poolcach.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/svl/inc/strmadpt.hxx b/svl/inc/strmadpt.hxx
index 2fd190f9adef..76ecf0223543 100644
--- a/svl/inc/strmadpt.hxx
+++ b/svl/inc/strmadpt.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: strmadpt.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/svl/inc/stylepool.hxx b/svl/inc/stylepool.hxx
index d69bb928e432..b820c9442229 100644
--- a/svl/inc/stylepool.hxx
+++ b/svl/inc/stylepool.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: stylepool.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/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx
index 446d9b8aeeb7..34029c7563f4 100644
--- a/svl/inc/svl/aeitem.hxx
+++ b/svl/inc/svl/aeitem.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: aeitem.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/svl/inc/svl/asiancfg.hxx b/svl/inc/svl/asiancfg.hxx
new file mode 100644
index 000000000000..4dfac8df524d
--- /dev/null
+++ b/svl/inc/svl/asiancfg.hxx
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * 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_ASIANCFG_HXX
+#define _SVX_ASIANCFG_HXX
+
+#include <unotools/configitem.hxx>
+#include <com/sun/star/uno/Sequence.h>
+#include <svl/svldllapi.h>
+
+namespace com{namespace sun{namespace star{
+namespace lang{
+    struct Locale;
+}}}}
+//-----------------------------------------------------------------------------
+struct SvxAsianConfig_Impl;
+class SVL_DLLPUBLIC SvxAsianConfig : public utl::ConfigItem
+{
+    SvxAsianConfig_Impl* pImpl;
+
+public:
+    SvxAsianConfig(sal_Bool bEnableNotify = sal_True);
+    virtual ~SvxAsianConfig();
+
+    void            Load();
+    virtual void    Commit();
+    virtual void    Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+
+    sal_Bool    IsKerningWesternTextOnly() const;
+    void        SetKerningWesternTextOnly(sal_Bool bSet);
+
+    sal_Int16   GetCharDistanceCompression() const;
+    void        SetCharDistanceCompression(sal_Int16 nSet);
+
+    com::sun::star::uno::Sequence<com::sun::star::lang::Locale>
+                GetStartEndCharLocales();
+
+    sal_Bool    GetStartEndChars( const com::sun::star::lang::Locale& rLocale,
+                                    rtl::OUString& rStartChars,
+                                    rtl::OUString& rEndChars );
+    void        SetStartEndChars( const com::sun::star::lang::Locale& rLocale,
+                                    const rtl::OUString* pStartChars,
+                                    const rtl::OUString* pEndChars );
+};
+
+#endif
diff --git a/svl/inc/svl/brdcst.hxx b/svl/inc/svl/brdcst.hxx
index cfa45d5aa89a..b55d78f99540 100644
--- a/svl/inc/svl/brdcst.hxx
+++ b/svl/inc/svl/brdcst.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: brdcst.hxx,v $
- * $Revision: 1.3.60.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/inc/svl/cancel.hxx b/svl/inc/svl/cancel.hxx
index 2808b77d3139..d268044a611d 100644
--- a/svl/inc/svl/cancel.hxx
+++ b/svl/inc/svl/cancel.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: cancel.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/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx
index 3d354899cd9d..42c9d60373db 100644
--- a/svl/inc/svl/cenumitm.hxx
+++ b/svl/inc/svl/cenumitm.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: cenumitm.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/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx
index 72421f93e0cb..929521d57cb1 100644
--- a/svl/inc/svl/cintitem.hxx
+++ b/svl/inc/svl/cintitem.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: cintitem.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/svl/inc/svl/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx
index 720ead5422f0..07310c22994a 100644
--- a/svl/inc/svl/cjkoptions.hxx
+++ b/svl/inc/svl/cjkoptions.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: cjkoptions.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/svl/inc/svl/cnclhint.hxx b/svl/inc/svl/cnclhint.hxx
index a2ce75ac1a4b..17a6627f31b6 100644
--- a/svl/inc/svl/cnclhint.hxx
+++ b/svl/inc/svl/cnclhint.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: cnclhint.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/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx
index dca27f2284e6..a7f3dd0111a6 100644
--- a/svl/inc/svl/cntwall.hxx
+++ b/svl/inc/svl/cntwall.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: cntwall.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/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx
index 28b2191cad94..1f597a293983 100644
--- a/svl/inc/svl/ctloptions.hxx
+++ b/svl/inc/svl/ctloptions.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: ctloptions.hxx,v $
- * $Revision: 1.3.164.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx
index 808596397aa0..e83d37b8925e 100644
--- a/svl/inc/svl/ctypeitm.hxx
+++ b/svl/inc/svl/ctypeitm.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: ctypeitm.hxx,v $
- * $Revision: 1.3.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx
index 8a3344f6dc0b..a24135e392c2 100644
--- a/svl/inc/svl/custritm.hxx
+++ b/svl/inc/svl/custritm.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: custritm.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/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx
index c66c9a84285d..3ae5506d809a 100644
--- a/svl/inc/svl/dateitem.hxx
+++ b/svl/inc/svl/dateitem.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: dateitem.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/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx
index c62f81bc77ef..071a43861bf8 100644
--- a/svl/inc/svl/documentlockfile.hxx
+++ b/svl/inc/svl/documentlockfile.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: documentlockfile.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/svl/inc/svl/eitem.hxx b/svl/inc/svl/eitem.hxx
index 55ed3c47ee33..bc65db9c31dc 100644
--- a/svl/inc/svl/eitem.hxx
+++ b/svl/inc/svl/eitem.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: eitem.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/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx
index d28bb3033b56..d0cc27b94b96 100644
--- a/svl/inc/svl/filerec.hxx
+++ b/svl/inc/svl/filerec.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: filerec.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/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx
index fa056bb00488..f7fd52d2e714 100644
--- a/svl/inc/svl/flagitem.hxx
+++ b/svl/inc/svl/flagitem.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: flagitem.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/svl/inc/svl/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx
index 4422220fe640..727f06681b45 100644
--- a/svl/inc/svl/globalnameitem.hxx
+++ b/svl/inc/svl/globalnameitem.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: globalnameitem.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/svl/inc/svl/hint.hxx b/svl/inc/svl/hint.hxx
index e2d43ea602ca..f8f64fbd759b 100644
--- a/svl/inc/svl/hint.hxx
+++ b/svl/inc/svl/hint.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: hint.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/svl/inc/svl/httpcook.hxx b/svl/inc/svl/httpcook.hxx
index 09769396eb11..b7b4a3cb0e90 100644
--- a/svl/inc/svl/httpcook.hxx
+++ b/svl/inc/svl/httpcook.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: httpcook.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/svl/inc/svl/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx
index c581f938197f..6ecc317f7299 100644
--- a/svl/inc/svl/ilstitem.hxx
+++ b/svl/inc/svl/ilstitem.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: ilstitem.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/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx
index bfd888bdd944..63dc4c470a55 100644
--- a/svl/inc/svl/imageitm.hxx
+++ b/svl/inc/svl/imageitm.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: imageitm.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/svl/inc/svl/inethist.hxx b/svl/inc/svl/inethist.hxx
index 7d4577897faf..aceac630924f 100644
--- a/svl/inc/svl/inethist.hxx
+++ b/svl/inc/svl/inethist.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: inethist.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/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx
index 5f3bfbaab225..24318af8fa57 100644
--- a/svl/inc/svl/inettype.hxx
+++ b/svl/inc/svl/inettype.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: inettype.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/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx
index 7bfa3433c6b6..f0fff8440518 100644
--- a/svl/inc/svl/intitem.hxx
+++ b/svl/inc/svl/intitem.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: intitem.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/svl/inc/svl/isethint.hxx b/svl/inc/svl/isethint.hxx
index d08819723f43..5ad244bfbd00 100644
--- a/svl/inc/svl/isethint.hxx
+++ b/svl/inc/svl/isethint.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: isethint.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/svl/inc/svl/itemiter.hxx b/svl/inc/svl/itemiter.hxx
index 50bbe7902e83..f80031871caf 100644
--- a/svl/inc/svl/itemiter.hxx
+++ b/svl/inc/svl/itemiter.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: itemiter.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/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx
index d99f29626d38..cbc6b7c4dd11 100644
--- a/svl/inc/svl/itempool.hxx
+++ b/svl/inc/svl/itempool.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: itempool.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/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx
index 873c34785d5f..3a993b47ed47 100644
--- a/svl/inc/svl/itemprop.hxx
+++ b/svl/inc/svl/itemprop.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: itemprop.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/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx
index a09cfbc2bbb2..30c4cc411fad 100644
--- a/svl/inc/svl/itemset.hxx
+++ b/svl/inc/svl/itemset.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: itemset.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/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx
index 0cba5235674a..198455f423b3 100644
--- a/svl/inc/svl/languageoptions.hxx
+++ b/svl/inc/svl/languageoptions.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: languageoptions.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/svl/inc/svl/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx
index 77cb63414f4e..2204a57c17d4 100644
--- a/svl/inc/svl/lckbitem.hxx
+++ b/svl/inc/svl/lckbitem.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: lckbitem.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/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx
index c1e18aac7e14..03cffa90efd5 100644
--- a/svl/inc/svl/lockfilecommon.hxx
+++ b/svl/inc/svl/lockfilecommon.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: documentlockfile.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/svl/inc/svl/lstner.hxx b/svl/inc/svl/lstner.hxx
index c9993834b42a..bc95573228f5 100644
--- a/svl/inc/svl/lstner.hxx
+++ b/svl/inc/svl/lstner.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: lstner.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/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx
index 747b9ec0bf17..48bc55cd1aa0 100644
--- a/svl/inc/svl/macitem.hxx
+++ b/svl/inc/svl/macitem.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: macitem.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/goodies/inc/mailenum.hxx b/svl/inc/svl/mailenum.hxx
index ac6b78ac86a2..e25fd2cfdcd2 100644
--- a/goodies/inc/mailenum.hxx
+++ b/svl/inc/svl/mailenum.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: mailenum.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/svl/inc/svl/memberid.hrc b/svl/inc/svl/memberid.hrc
new file mode 100644
index 000000000000..9f5edeae9ebb
--- /dev/null
+++ b/svl/inc/svl/memberid.hrc
@@ -0,0 +1,69 @@
+/*************************************************************************
+ *
+ * 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 _MEMBERID_HRC
+#define _MEMBERID_HRC
+
+#define SFX_MEMBERID(nUserData) ( ( (nUserData) >> 20 ) & 0xFF )
+#define SFX_SLOTID(nUserData)   ( (nUserData) & 0xFFFF )
+
+#define MID_X       1
+#define MID_Y       2
+#define MID_RECT_LEFT    3
+#define MID_RECT_TOP     4
+#define MID_WIDTH   5
+#define MID_HEIGHT  6
+#define MID_RECT_RIGHT   7
+
+// SvxSizeItem
+#define MID_SIZE_SIZE       0
+#define MID_SIZE_WIDTH      1
+#define MID_SIZE_HEIGHT     2
+
+// SvxSearchItem
+#define MID_SEARCH_STYLEFAMILY          1
+#define MID_SEARCH_CELLTYPE             2
+#define MID_SEARCH_ROWDIRECTION         3
+#define MID_SEARCH_ALLTABLES            4
+#define MID_SEARCH_BACKWARD             5
+#define MID_SEARCH_PATTERN              6
+#define MID_SEARCH_CONTENT              7
+#define MID_SEARCH_ASIANOPTIONS         8
+#define MID_SEARCH_ALGORITHMTYPE        9
+#define MID_SEARCH_FLAGS                10
+#define MID_SEARCH_SEARCHSTRING         11
+#define MID_SEARCH_REPLACESTRING        12
+#define MID_SEARCH_LOCALE               13
+#define MID_SEARCH_CHANGEDCHARS         14
+#define MID_SEARCH_DELETEDCHARS         15
+#define MID_SEARCH_INSERTEDCHARS        16
+#define MID_SEARCH_TRANSLITERATEFLAGS   17
+#define MID_SEARCH_COMMAND              18
+
+
+#endif
+
diff --git a/svl/inc/svl/metitem.hxx b/svl/inc/svl/metitem.hxx
index 5a1e6627542f..5e7e792b61e7 100644
--- a/svl/inc/svl/metitem.hxx
+++ b/svl/inc/svl/metitem.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: metitem.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/svl/inc/svl/nfkeytab.hxx b/svl/inc/svl/nfkeytab.hxx
index ba8c24f319f6..7c3fef4b88cc 100644
--- a/svl/inc/svl/nfkeytab.hxx
+++ b/svl/inc/svl/nfkeytab.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: nfkeytab.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/svl/inc/svl/nfversi.hxx b/svl/inc/svl/nfversi.hxx
index 23375369ddb3..3cd8256c90d7 100644
--- a/svl/inc/svl/nfversi.hxx
+++ b/svl/inc/svl/nfversi.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: nfversi.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/svl/inc/svl/nranges.hxx b/svl/inc/svl/nranges.hxx
index e527a456a014..b04f131d6e89 100644
--- a/svl/inc/svl/nranges.hxx
+++ b/svl/inc/svl/nranges.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: nranges.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/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx
index 3369f286b2cd..eedb480857ae 100644
--- a/svl/inc/svl/ondemand.hxx
+++ b/svl/inc/svl/ondemand.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: ondemand.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/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx
index 21e9ffa74210..41f6cbff40d1 100644
--- a/svl/inc/svl/ownlist.hxx
+++ b/svl/inc/svl/ownlist.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: ownlist.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/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx
index 1d0a2e982fae..c0cf53fb6ded 100644
--- a/svl/inc/svl/poolitem.hxx
+++ b/svl/inc/svl/poolitem.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: poolitem.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/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx
index b0deff81e884..1911ac997527 100644
--- a/svl/inc/svl/ptitem.hxx
+++ b/svl/inc/svl/ptitem.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: ptitem.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/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx
index 1f944bab4102..da080ac95e11 100644
--- a/svl/inc/svl/rectitem.hxx
+++ b/svl/inc/svl/rectitem.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: rectitem.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/svl/inc/svl/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx
index a3ced1b93019..11d57af35ce0 100644
--- a/svl/inc/svl/restrictedpaths.hxx
+++ b/svl/inc/svl/restrictedpaths.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: restrictedpaths.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/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx
index d55ba25a06c2..890c9d4438c0 100644
--- a/svl/inc/svl/rngitem.hxx
+++ b/svl/inc/svl/rngitem.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: rngitem.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/svl/inc/svl/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx
index a12466519d1b..e7a6ecb366d0 100644
--- a/svl/inc/svl/sfontitm.hxx
+++ b/svl/inc/svl/sfontitm.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: sfontitm.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/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx
index 1febb4e77583..9ca8eb3222d0 100644
--- a/svl/inc/svl/sharecontrolfile.hxx
+++ b/svl/inc/svl/sharecontrolfile.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: sharecontrolfile.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/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx
index 9b1c0050cf6b..0936524c298a 100644
--- a/svl/inc/svl/slstitm.hxx
+++ b/svl/inc/svl/slstitm.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: slstitm.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/svl/inc/svl/smplhint.hxx b/svl/inc/svl/smplhint.hxx
index 089a86dae3f2..baf3c85222b4 100644
--- a/svl/inc/svl/smplhint.hxx
+++ b/svl/inc/svl/smplhint.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: smplhint.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/svl/inc/svl/solar.hrc b/svl/inc/svl/solar.hrc
index 96149b89131c..b559766b982b 100644
--- a/svl/inc/svl/solar.hrc
+++ b/svl/inc/svl/solar.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: solar.hrc,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,6 +30,9 @@
 
 // defines ------------------------------------------------------------------
 
+#define OWN_ATTR_VALUE_START                    3900
+#define OWN_ATTR_VALUE_END                      3988
+
 #define CREATERESMGR_NAME( Name )   #Name
 #define CREATERESMGR( Name )        ResMgr::CreateResMgr( CREATERESMGR_NAME( Name ) )
 
@@ -76,42 +76,33 @@
 #define RID_EXTENSIONS_END          (RID_LIB_START+5799)
 
 #define RID_EDIT_START              (RID_LIB_START+5800)
-#define RID_EDIT_END                (RID_LIB_START+5899)
-
-#define RID_EDIT_START              (RID_LIB_START+5800)
-#define RID_EDIT_END                (RID_LIB_START+5899)
+#define RID_EDIT_END                (RID_LIB_START+6369)
 
-#define RID_OUTL_START              (RID_LIB_START+5900)
-#define RID_OUTL_END                (RID_LIB_START+5919)
+#define RID_SVTOOLS_START           (RID_LIB_START+6370)
+#define RID_SVTOOLS_END             (RID_LIB_START+6499)
 
-#define RID_SVTOOLS_START           (RID_LIB_START+5920)
-#define RID_SVTOOLS_END             (RID_LIB_START+5999)
+#define RID_INET_START              (RID_LIB_START+6500)
+#define RID_INET_END                (RID_LIB_START+6559)
 
-#define RID_INET_START              (RID_LIB_START+6000)
-#define RID_INET_END                (RID_LIB_START+6059)
+#define RID_SO2_START               (RID_LIB_START+6560)
+#define RID_SO2_END                 (RID_LIB_START+6599)
 
-#define RID_SO2_START               (RID_LIB_START+6060)
-#define RID_SO2_END                 (RID_LIB_START+6099)
+#define RID_SI_START                (RID_LIB_START+6600)
+#define RID_SI_END                  (RID_LIB_START+6799)
 
-#define RID_GOODIES_START           (RID_LIB_START+6100)
-#define RID_GOODIES_END             (RID_LIB_START+6149)
+#define RID_DLG_START               (RID_LIB_START+6800)
+#define RID_DLG_END                 (RID_LIB_START+6899)
 
-#define RID_SJ_START                (RID_LIB_START+6150)
-#define RID_SJ_END                  (RID_LIB_START+6199)
+#define RID_OFA_START               (RID_LIB_START+6900)
+#define RID_OFA_END                 (RID_LIB_START+7399)
 
-#define RID_SI_START                (RID_LIB_START+6200)
-#define RID_SI_END                  (RID_LIB_START+6399)
+#define RID_GOODIES_START           (RID_LIB_START+7400)
+#define RID_GOODIES_END             (RID_LIB_START+7449)
 
-#define RID_DLG_START               (RID_LIB_START+6400)
-#define RID_DLG_END                 (RID_LIB_START+6499)
+#define RID_CHANNEL_START           (RID_LIB_START+7450)
+#define RID_CHANNEL_END             (RID_LIB_START+7899)
 
-#define RID_OFA_START               (RID_LIB_START+6500)
-#define RID_OFA_END                 (RID_LIB_START+6999)
-
-#define RID_CHANNEL_START           (RID_LIB_START+7000)
-#define RID_CHANNEL_END             (RID_LIB_START+7499)
-
-#define RID_CHAOS_START             (RID_LIB_START+7500)
+#define RID_CHAOS_START             (RID_LIB_START+7900)
 #define RID_CHAOS_END               (RID_LIB_START+7999)
 
 #define RID_FORMS_START             (RID_LIB_START+8000)
@@ -171,6 +162,9 @@
 
 #define HID_START                   32768
 
+#define HID_VCL_START               (HID_START+100)
+#define HID_VCL_END                 (HID_START+150)
+
 #define HID_SVTOOLS_START           (HID_START+200)
 #define HID_SVTOOLS_END             (HID_START+299)
 
@@ -207,8 +201,8 @@
 #define HID_GOODIES_START           (HID_LIB_START+2100)
 #define HID_GOODIES_END             (HID_LIB_START+2199)
 
-#define HID_SCHEDULE_START          (HID_LIB_START+2200)
-#define HID_SCHEDULE_END            (HID_LIB_START+3399)
+#define HID_EDIT_START          (HID_LIB_START+2200)
+#define HID_EDIT_END            (HID_LIB_START+3399)
 
 #define HID_CHANNEL_START           (HID_LIB_START+3400)
 #define HID_CHANNEL_END             (HID_LIB_START+3499)
@@ -300,6 +294,48 @@
 #define HID_EXTENSIONS_START        (HID_OBJ_START+2281)
 #define HID_EXTENSIONS_END          (HID_OBJ_START+2800)
 
+// Slot Ids
+
+#define SID_SFX_START                5000
+#define SID_SFX_END                  8999
+#define SID_DOCKWIN_START            9800
+#define SID_DOCKWIN_END              9999
+
+#define SID_LIB_START               10000
+#define SID_LIB_END                 19999
+#define SID_APP_START               20000
+#define SID_APP_END                 29999
+#define SID_OBJ_START               30000
+
+#define SID_SW_START                20000
+#define SID_SW_END                  25999
+#define SID_SC_START                26000
+#define SID_SC_END                  26999
+#define SID_SD_START                27000
+#define SID_SD_END                  27999
+
+#define SID_OBJ0_START              (SID_OBJ_START +    0)
+#define SID_OBJ2_START              (SID_OBJ_START +  256)
+#define SID_OBJ1_START              (SID_OBJ_START +  512)
+#define SID_OBJ3_START              (SID_OBJ_START +  768)
+
+#define SID_SMA_START               SID_OBJ2_START
+#define SID_SMA_END                 (SID_SMA_START + 255 )
+#define SID_BASICIDE_START          (SID_OBJ3_START)
+#define SID_BASICIDE_END            (SID_BASICIDE_START + 255)
+
+#define SID_SVX_START               SID_LIB_START               // 10000
+#define SID_SVX_END                 (SID_SVX_START + 1499)
+#define SID_EDIT_START              (SID_SVX_END + 1)           // 11500
+#define SID_EDIT_END                (SID_EDIT_START + 499)
+#define SID_OPTIONS_START           (SID_EDIT_END + 1)          // 12000
+#define SID_OPTIONS_END             (SID_OPTIONS_START + 100)
+#define SID_SBA_START               (SID_OPTIONS_END + 1)       // 12101
+#define SID_SBA_END                 (SID_SBA_START + 149)
+#define SID_DBACCESS_START          (SID_SBA_END + 1)           // 12251
+#define SID_DBACCESS_END            (SID_DBACCESS_START + 200)
+#define SID_RPTUI_START             (SID_DBACCESS_END + 1)      // 12452
+#define SID_RPTUI_END               (SID_RPTUI_START + 199)
 
 #endif
 
diff --git a/svl/inc/svl/srchcfg.hxx b/svl/inc/svl/srchcfg.hxx
new file mode 100644
index 000000000000..7f98010c3d08
--- /dev/null
+++ b/svl/inc/svl/srchcfg.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * 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_SRCHCFG_HXX
+#define _SVX_SRCHCFG_HXX
+
+#include <unotools/configitem.hxx>
+#include <com/sun/star/uno/Sequence.h>
+#include <svl/svldllapi.h>
+
+//-----------------------------------------------------------------------------
+struct SvxSearchConfig_Impl;
+struct SvxSearchEngineData
+{
+    rtl::OUString   sEngineName;
+
+    rtl::OUString   sAndPrefix;
+    rtl::OUString   sAndSuffix;
+    rtl::OUString   sAndSeparator;
+    sal_Int32       nAndCaseMatch;
+
+    rtl::OUString   sOrPrefix;
+    rtl::OUString   sOrSuffix;
+    rtl::OUString   sOrSeparator;
+    sal_Int32       nOrCaseMatch;
+
+    rtl::OUString   sExactPrefix;
+    rtl::OUString   sExactSuffix;
+    rtl::OUString   sExactSeparator;
+    sal_Int32       nExactCaseMatch;
+
+    SvxSearchEngineData() :
+        nAndCaseMatch(0),
+        nOrCaseMatch(0),
+        nExactCaseMatch(0){}
+
+    sal_Bool operator==(const SvxSearchEngineData& rData);
+};
+class SVL_DLLPUBLIC SvxSearchConfig : public utl::ConfigItem
+{
+    SvxSearchConfig_Impl* pImpl;
+
+public:
+    SvxSearchConfig(sal_Bool bEnableNotify = sal_True);
+    virtual ~SvxSearchConfig();
+
+    void            Load();
+    virtual void    Commit();
+    virtual void    Notify( const com::sun::star::uno::Sequence<rtl::OUString>& aPropertyNames);
+
+    sal_uInt16                  Count();
+    const SvxSearchEngineData&  GetData(sal_uInt16 nPos);
+    const SvxSearchEngineData*  GetData(const rtl::OUString& rEngineName);
+    void                        SetData(const SvxSearchEngineData& rData);
+    void                        RemoveData(const rtl::OUString& rEngineName);
+};
+
+#endif
+
diff --git a/goodies/source/inv/score.hxx b/svl/inc/svl/srchdefs.hxx
index ec09135550f0..a6cdf56f8665 100644
--- a/goodies/source/inv/score.hxx
+++ b/svl/inc/svl/srchdefs.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: score.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,35 +24,26 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _SCORE_HXX
-#define _SCORE_HXX
-
 
-#include <vcl/window.hxx>
+#ifndef _SFX_SRCHDEFS_HXX_
+#define _SFX_SRCHDEFS_HXX_
 
-class ScoreWindow : public Window
-{
-    private:
-        long            nHero;
-        long            nRockets;
-        long            nLives;
-        long            nScore;
-        long            nLevel;
-        ResMgr*         pRes;
 
-        BOOL            bPaintBack;
+#define SEARCH_OPTIONS_SEARCH       ((sal_uInt16)0x0001)
+#define SEARCH_OPTIONS_SEARCH_ALL   ((sal_uInt16)0x0002)
+#define SEARCH_OPTIONS_REPLACE      ((sal_uInt16)0x0004)
+#define SEARCH_OPTIONS_REPLACE_ALL  ((sal_uInt16)0x0008)
+#define SEARCH_OPTIONS_WHOLE_WORDS  ((sal_uInt16)0x0010)
+#define SEARCH_OPTIONS_BACKWARDS    ((sal_uInt16)0x0020)
+#define SEARCH_OPTIONS_REG_EXP      ((sal_uInt16)0x0040)
+#define SEARCH_OPTIONS_EXACT        ((sal_uInt16)0x0080)
+#define SEARCH_OPTIONS_SELECTION    ((sal_uInt16)0x0100)
+#define SEARCH_OPTIONS_FAMILIES     ((sal_uInt16)0x0200)
+#define SEARCH_OPTIONS_FORMAT       ((sal_uInt16)0x0400)
+#define SEARCH_OPTIONS_MORE         ((sal_uInt16)0x0800)
+#define SEARCH_OPTIONS_SIMILARITY   ((sal_uInt16)0x1000)
+#define SEARCH_OPTIONS_CONTENT      ((sal_uInt16)0x2000)
 
-    public:
-                        ScoreWindow(Window* pParent, WinBits bits,ResMgr* pRes);
-                        ~ScoreWindow();
-        virtual void    Paint(const Rectangle& rRect);
-        void            SetHero(long nName);
-        void            SetRockets(long nWert);
-        void            SetLives(long nWert);
-        void            SetScore(long nWert);
-        void            SetLevel(long nWert);
-
-        void            ShowMe();
-};
 
 #endif
+
diff --git a/svl/inc/svl/srchitem.hxx b/svl/inc/svl/srchitem.hxx
new file mode 100644
index 000000000000..3974a8f57b80
--- /dev/null
+++ b/svl/inc/svl/srchitem.hxx
@@ -0,0 +1,293 @@
+/*************************************************************************
+ *
+ * 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 _SFX_SRCHITEM_HXX
+#define _SFX_SRCHITEM_HXX
+
+#include "sal/config.h"
+#include "svl/svldllapi.h"
+#include <com/sun/star/util/XSearchDescriptor.hpp>
+#include <com/sun/star/util/SearchOptions.hpp>
+#include <com/sun/star/util/SearchFlags.hpp>
+#include <com/sun/star/i18n/TransliterationModules.hpp>
+#include <unotools/configitem.hxx>
+#include <rsc/rscsfx.hxx>
+#include <tools/string.hxx>
+#include <svl/poolitem.hxx>
+#include <svl/srchdefs.hxx>
+
+// defines ---------------------------------------------------------------
+
+// commands
+#define     SVX_SEARCHCMD_FIND          ((sal_uInt16)0)
+#define     SVX_SEARCHCMD_FIND_ALL      ((sal_uInt16)1)
+#define     SVX_SEARCHCMD_REPLACE       ((sal_uInt16)2)
+#define     SVX_SEARCHCMD_REPLACE_ALL   ((sal_uInt16)3)
+
+// search flags
+#define     SVX_SEARCHIN_FORMULA        ((sal_uInt16)0)
+#define     SVX_SEARCHIN_VALUE          ((sal_uInt16)1)
+#define     SVX_SEARCHIN_NOTE           ((sal_uInt16)2)
+#define     SVX_SEARCHAPP_WRITER        ((sal_uInt16)0)
+#define     SVX_SEARCHAPP_CALC          ((sal_uInt16)1)
+#define     SVX_SEARCHAPP_DRAW          ((sal_uInt16)2)
+#define     SVX_SEARCHAPP_BASE          ((sal_uInt16)3)
+
+// class SvxSearchItem ---------------------------------------------------
+
+class SVL_DLLPUBLIC SvxSearchItem :
+        public SfxPoolItem,
+        public utl::ConfigItem
+{
+    com::sun::star::util::SearchOptions aSearchOpt;
+
+    SfxStyleFamily  eFamily;            // Vorlagen-Familie
+
+    sal_uInt16      nCommand;           // Kommando (Suchen, Alle Suchen, Ersetzen, Alle Ersetzen)
+
+    // Calc-Spezifische Daten
+    sal_uInt16      nCellType;          // Suche in Formeln/Werten/Notizen
+    sal_uInt16      nAppFlag;           // Fuer welche Applikation ist der Dialog ueberhaupt
+    sal_Bool        bRowDirection;      // Suchrichtung Zeilenweise/Spaltenweise
+    sal_Bool        bAllTables;         // in alle Tabellen suchen
+
+    // Writer-spezifisch
+    sal_Bool        bNotes;
+
+    sal_Bool        bBackward;          // Suche Rueckwaerts
+    sal_Bool        bPattern;           // Suche nach Vorlagen
+    sal_Bool        bContent;           // Suche im Inhalt
+    sal_Bool        bAsianOptions;      // use asian options?
+
+public:
+    TYPEINFO();
+
+    SvxSearchItem( const sal_uInt16 nId );
+    SvxSearchItem( const SvxSearchItem& rItem );
+    virtual ~SvxSearchItem();
+
+    virtual sal_Bool             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
+    virtual sal_Bool             PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
+    virtual int              operator == ( const SfxPoolItem& ) const;
+    virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
+    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+                                    SfxMapUnit eCoreMetric,
+                                    SfxMapUnit ePresMetric,
+                                    String &rText, const IntlWrapper * = 0 ) const;
+
+    // ConfigItem
+    virtual void            Notify( const com::sun::star::uno::Sequence< rtl::OUString > &rPropertyNames );
+    virtual void            Commit();
+
+            sal_uInt16      GetCommand() const { return nCommand; }
+            void            SetCommand(sal_uInt16 nNewCommand) { nCommand = nNewCommand; }
+
+    inline  const String    GetSearchString() const;
+    inline  void            SetSearchString(const String& rNewString);
+
+    inline  const String    GetReplaceString() const;
+    inline  void            SetReplaceString(const String& rNewString);
+
+    inline  sal_Bool        GetWordOnly() const;
+            void            SetWordOnly(sal_Bool bNewWordOnly);
+
+    inline  sal_Bool        GetExact() const;
+            void            SetExact(sal_Bool bNewExact);
+
+            sal_Bool        GetBackward() const { return bBackward; }
+            void            SetBackward(sal_Bool bNewBackward) { bBackward = bNewBackward; }
+
+    inline sal_Bool         GetSelection() const;
+            void            SetSelection(sal_Bool bNewSelection);
+
+    inline  sal_Bool        GetRegExp() const;
+            void            SetRegExp( sal_Bool bVal );
+
+            sal_Bool        GetPattern() const { return bPattern; }
+            void            SetPattern(sal_Bool bNewPattern) { bPattern = bNewPattern; }
+
+            sal_Bool        IsContent() const { return bContent; }
+            void            SetContent( sal_Bool bNew ) { bContent = bNew; }
+
+            SfxStyleFamily  GetFamily() const { return eFamily; }
+            void            SetFamily( SfxStyleFamily eNewFamily )
+                                { eFamily = eNewFamily; }
+
+            sal_Bool        GetRowDirection() const { return bRowDirection; }
+            void            SetRowDirection(sal_Bool bNewRowDirection) { bRowDirection = bNewRowDirection; }
+
+            sal_Bool        IsAllTables() const { return bAllTables; }
+            void            SetAllTables(sal_Bool bNew) { bAllTables = bNew; }
+
+            sal_uInt16      GetCellType() const { return nCellType; }
+            void            SetCellType(sal_uInt16 nNewCellType) { nCellType = nNewCellType; }
+
+            sal_Bool        GetNotes() const { return bNotes; }
+            void            SetNotes(sal_Bool bNew) { bNotes = bNew; }
+
+            sal_uInt16      GetAppFlag() const { return nAppFlag; }
+            void            SetAppFlag(sal_uInt16 nNewAppFlag) { nAppFlag = nNewAppFlag; }
+
+    inline  sal_Bool        IsLevenshtein() const;
+            void            SetLevenshtein( sal_Bool bVal );
+
+    inline  sal_Bool        IsLEVRelaxed() const;
+            void            SetLEVRelaxed(sal_Bool bSet);
+
+    inline  sal_uInt16      GetLEVOther() const;
+    inline  void            SetLEVOther(sal_uInt16 nSet);
+
+    inline  sal_uInt16      GetLEVShorter() const;
+    inline  void            SetLEVShorter(sal_uInt16 nSet);
+
+    inline  sal_uInt16      GetLEVLonger() const;
+    inline  void            SetLEVLonger(sal_uInt16 nSet);
+
+            void            GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
+            void            SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr );
+
+    inline const com::sun::star::util::SearchOptions &
+                GetSearchOptions() const;
+    inline void SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt );
+
+    inline  sal_Int32       GetTransliterationFlags() const;
+            void            SetTransliterationFlags( sal_Int32 nFlags );
+
+    inline  sal_Bool        IsMatchFullHalfWidthForms() const;
+    void                    SetMatchFullHalfWidthForms( sal_Bool bVal );
+
+    inline  sal_Bool        IsUseAsianOptions() const           { return bAsianOptions; }
+    inline  void            SetUseAsianOptions( sal_Bool bVal ) { bAsianOptions = bVal; }
+};
+
+const String SvxSearchItem::GetSearchString() const
+{
+    return aSearchOpt.searchString;
+}
+
+void SvxSearchItem::SetSearchString(const String& rNewString)
+{
+    aSearchOpt.searchString = rNewString;
+}
+
+const String SvxSearchItem::GetReplaceString() const
+{
+    return aSearchOpt.replaceString;
+}
+
+void SvxSearchItem::SetReplaceString(const String& rNewString)
+{
+    aSearchOpt.replaceString = rNewString;
+}
+
+sal_Bool SvxSearchItem::GetWordOnly() const
+{
+    return 0 != (aSearchOpt.searchFlag &
+                        com::sun::star::util::SearchFlags::NORM_WORD_ONLY);
+}
+
+sal_Bool SvxSearchItem::GetExact() const
+{
+    return 0 == (aSearchOpt.transliterateFlags &
+                        com::sun::star::i18n::TransliterationModules_IGNORE_CASE);
+}
+
+sal_Bool SvxSearchItem::GetSelection() const
+{
+    return 0 != (aSearchOpt.searchFlag &
+                        com::sun::star::util::SearchFlags::REG_NOT_BEGINOFLINE);
+}
+
+sal_Bool SvxSearchItem::GetRegExp() const
+{
+    return aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_REGEXP ;
+}
+
+sal_Bool SvxSearchItem::IsLEVRelaxed() const
+{
+    return 0 != (aSearchOpt.searchFlag &
+                        com::sun::star::util::SearchFlags::LEV_RELAXED);
+}
+
+sal_uInt16 SvxSearchItem::GetLEVOther() const
+{
+    return (INT16) aSearchOpt.changedChars;
+}
+
+void SvxSearchItem::SetLEVOther( sal_uInt16 nVal )
+{
+    aSearchOpt.changedChars = nVal;
+}
+
+sal_uInt16 SvxSearchItem::GetLEVShorter() const
+{
+    return (INT16) aSearchOpt.insertedChars;
+}
+
+void SvxSearchItem::SetLEVShorter( sal_uInt16 nVal )
+{
+    aSearchOpt.insertedChars = nVal;
+}
+
+sal_uInt16 SvxSearchItem::GetLEVLonger() const
+{
+    return (INT16) aSearchOpt.deletedChars;
+}
+
+void SvxSearchItem::SetLEVLonger( sal_uInt16 nVal )
+{
+    aSearchOpt.deletedChars = nVal;
+}
+
+sal_Bool SvxSearchItem::IsLevenshtein() const
+{
+    return aSearchOpt.algorithmType == com::sun::star::util::SearchAlgorithms_APPROXIMATE;
+}
+
+const com::sun::star::util::SearchOptions & SvxSearchItem::GetSearchOptions() const
+{
+    return aSearchOpt;
+}
+
+void SvxSearchItem::SetSearchOptions( const com::sun::star::util::SearchOptions &rOpt )
+{
+    aSearchOpt = rOpt;
+}
+
+sal_Int32 SvxSearchItem::GetTransliterationFlags() const
+{
+    return aSearchOpt.transliterateFlags;
+}
+
+sal_Bool SvxSearchItem::IsMatchFullHalfWidthForms() const
+{
+    return 0 != (aSearchOpt.transliterateFlags &
+                        com::sun::star::i18n::TransliterationModules_IGNORE_WIDTH);
+}
+
+#endif
+
+
diff --git a/svl/inc/svl/stritem.hxx b/svl/inc/svl/stritem.hxx
index 21ee9fadd1ec..5604eb3de6ed 100644
--- a/svl/inc/svl/stritem.hxx
+++ b/svl/inc/svl/stritem.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: stritem.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/svl/inc/svl/style.hrc b/svl/inc/svl/style.hrc
index ed4db1bf46d0..f49a95e48f67 100644
--- a/svl/inc/svl/style.hrc
+++ b/svl/inc/svl/style.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: style.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/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx
index 66c130d346dd..b3138309293f 100644
--- a/svl/inc/svl/style.hxx
+++ b/svl/inc/svl/style.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: style.hxx,v $
- * $Revision: 1.5.60.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx
index 555b7ad5fe84..99b2901b95f9 100644
--- a/svl/inc/svl/svarray.hxx
+++ b/svl/inc/svl/svarray.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: svarray.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/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx
index 96a1ffa6bf22..bb14d0fcdcdf 100644
--- a/svl/inc/svl/svdde.hxx
+++ b/svl/inc/svl/svdde.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: svdde.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/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx
index 468e6025cb5a..24aef1fdf6d0 100644
--- a/svl/inc/svl/svldata.hxx
+++ b/svl/inc/svl/svldata.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: svldata.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/svl/inc/svl/svldllapi.h b/svl/inc/svl/svldllapi.h
index 29b2ae29100a..0616a6fa59a9 100644
--- a/svl/inc/svl/svldllapi.h
+++ b/svl/inc/svl/svldllapi.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: svldllapi.h,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/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx
index 869c70e1cac6..fa3c94034256 100644
--- a/svl/inc/svl/svstdarr.hxx
+++ b/svl/inc/svl/svstdarr.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: svstdarr.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/svl/inc/svl/svtools.hrc b/svl/inc/svl/svtools.hrc
index e4cc91cfcb49..738bee6cbf21 100644
--- a/svl/inc/svl/svtools.hrc
+++ b/svl/inc/svl/svtools.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: svtools.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/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx
index c4b52d4939c0..31878aa34be5 100644
--- a/svl/inc/svl/szitem.hxx
+++ b/svl/inc/svl/szitem.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: szitem.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/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx
index 354de8b451c7..5aea03207626 100644
--- a/svl/inc/svl/undo.hxx
+++ b/svl/inc/svl/undo.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: undo.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/svl/inc/svl/urlfilter.hxx b/svl/inc/svl/urlfilter.hxx
index 6370a75a1fd7..d8c053ab573e 100644
--- a/svl/inc/svl/urlfilter.hxx
+++ b/svl/inc/svl/urlfilter.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: urlfilter.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/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx
index 1a3918526def..9e9a0fcf4126 100644
--- a/svl/inc/svl/visitem.hxx
+++ b/svl/inc/svl/visitem.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: visitem.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/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx
index 4e653caf0238..00f2dbe92b4c 100644
--- a/svl/inc/svl/zforlist.hxx
+++ b/svl/inc/svl/zforlist.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: zforlist.hxx,v $
- * $Revision: 1.3.148.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx
index 991460015e6d..7cdcf4db518d 100644
--- a/svl/inc/svl/zformat.hxx
+++ b/svl/inc/svl/zformat.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: zformat.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/svl/inc/urihelper.hxx b/svl/inc/urihelper.hxx
index 8be500e438ce..ab2ae5878cc2 100644
--- a/svl/inc/urihelper.hxx
+++ b/svl/inc/urihelper.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: urihelper.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/svl/inc/urlbmk.hxx b/svl/inc/urlbmk.hxx
index d3342b398878..9a37184c8ec1 100644
--- a/svl/inc/urlbmk.hxx
+++ b/svl/inc/urlbmk.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: urlbmk.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/svl/inc/whiter.hxx b/svl/inc/whiter.hxx
index d2bd7c88d521..83a3e21e2b0e 100644
--- a/svl/inc/whiter.hxx
+++ b/svl/inc/whiter.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: whiter.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/svl/inc/xmlement.hxx b/svl/inc/xmlement.hxx
index ed0e4dafc57a..d2680fbbf404 100644
--- a/svl/inc/xmlement.hxx
+++ b/svl/inc/xmlement.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: xmlement.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/svl/qa/complex/ConfigItems/CheckConfigItems.java b/svl/qa/complex/ConfigItems/CheckConfigItems.java
index 6f4d0ba3d945..4afa2bf33f55 100644
--- a/svl/qa/complex/ConfigItems/CheckConfigItems.java
+++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: CheckConfigItems.java,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/19 11:09: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/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
index d853bf926467..10112c07ac8c 100644
--- a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.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: AccessibilityOptTest.cxx,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/19 11:09: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/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
index 58bb58f8c215..cf2146f54e49 100644
--- a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.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: AccessibilityOptTest.hxx,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/19 11:09: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/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
index ad9dda313a5c..f9840605a6d5 100644
--- a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.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: ConfigItemTest.cxx,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/19 11:09: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/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
index 082328835fca..4f8e2159847d 100644
--- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.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: HistoryOptTest.cxx,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/19 11:09: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/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
index 8415d9f989b9..05ea7edb01cc 100644
--- a/svl/qa/complex/ConfigItems/helper/HistoryOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/HistoryOptTest.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: HistoryOptTest.hxx,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/19 11:09:24 $
+ * 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/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
index 69504e4d5d7e..0731aa2a4253 100644
--- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.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: PrintOptTest.cxx,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/19 11:09:24 $
+ * 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/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
index 79505a4e6faf..7d366dc38090 100644
--- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.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: PrintOptTest.hxx,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/19 11:09:24 $
+ * 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/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
index 14ee513ee0cb..b14d20a76694 100644
--- a/svl/qa/complex/ConfigItems/helper/UserOptTest.cxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.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: UserOptTest.cxx,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/19 11:09:24 $
+ * 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/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx b/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
index 72ff71cafe2d..8fc63a58a9cc 100644
--- a/svl/qa/complex/ConfigItems/helper/UserOptTest.hxx
+++ b/svl/qa/complex/ConfigItems/helper/UserOptTest.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: UserOptTest.hxx,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/19 11:09:25 $
+ * 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/svl/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk
index d41fe6c129c6..2c949da7b168 100644
--- a/svl/qa/complex/ConfigItems/helper/makefile.mk
+++ b/svl/qa/complex/ConfigItems/helper/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.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.1.4.2 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: as $ $Date: 2008/03/19 11:09:25 $
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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/svl/qa/complex/ConfigItems/makefile.mk b/svl/qa/complex/ConfigItems/makefile.mk
index 1291184346bc..6838cc79a660 100644
--- a/svl/qa/complex/ConfigItems/makefile.mk
+++ b/svl/qa/complex/ConfigItems/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.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile: makefile.mk,v $
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision: 1.1.4.2 $
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author: as $ $Date: 2008/03/19 11:09:22 $
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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/svl/qa/complex/passwordcontainer/PasswordContainerTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
index 5da0676f8bb9..0f4d97f28d56 100644
--- a/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
+++ b/svl/qa/complex/passwordcontainer/PasswordContainerTest.java
@@ -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: PasswordContainerTest.java,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/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
index aee1c9355a3f..2e3bada4d1bc 100644
--- a/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
+++ b/svl/qa/complex/passwordcontainer/PasswordContainerUnitTest.java
@@ -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: PasswordContainerUnitTest.java,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/svl/qa/complex/passwordcontainer/Test01.java b/svl/qa/complex/passwordcontainer/Test01.java
index 6de96de05ec9..1ca17c922669 100644
--- a/svl/qa/complex/passwordcontainer/Test01.java
+++ b/svl/qa/complex/passwordcontainer/Test01.java
@@ -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: Test01.java,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/svl/qa/complex/passwordcontainer/Test02.java b/svl/qa/complex/passwordcontainer/Test02.java
index 5d65d8090cf9..b77b0fe9bf48 100644
--- a/svl/qa/complex/passwordcontainer/Test02.java
+++ b/svl/qa/complex/passwordcontainer/Test02.java
@@ -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: Test02.java,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/svl/qa/complex/passwordcontainer/Test03.java b/svl/qa/complex/passwordcontainer/Test03.java
index 69de8b88578b..9e38a55893e0 100644
--- a/svl/qa/complex/passwordcontainer/Test03.java
+++ b/svl/qa/complex/passwordcontainer/Test03.java
@@ -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: Test03.java,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/svl/qa/complex/passwordcontainer/TestHelper.java b/svl/qa/complex/passwordcontainer/TestHelper.java
index 0f83a9ef9963..1971b61098f5 100644
--- a/svl/qa/complex/passwordcontainer/TestHelper.java
+++ b/svl/qa/complex/passwordcontainer/TestHelper.java
@@ -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: TestHelper.java,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/svl/qa/complex/passwordcontainer/makefile.mk b/svl/qa/complex/passwordcontainer/makefile.mk
index c3ff7538af0f..57fd4d560f8d 100644
--- a/svl/qa/complex/passwordcontainer/makefile.mk
+++ b/svl/qa/complex/passwordcontainer/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.2.38.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/qa/export.map b/svl/qa/export.map
index 80373c145ac1..7321bbca16ad 100755..100644
--- a/svl/qa/export.map
+++ b/svl/qa/export.map
@@ -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: export.map,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/svl/qa/makefile.mk b/svl/qa/makefile.mk
index 439277ea62b0..4e107e31f924 100644
--- a/svl/qa/makefile.mk
+++ b/svl/qa/makefile.mk
@@ -1,15 +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: makefile.mk,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/svl/qa/test_URIHelper.cxx b/svl/qa/test_URIHelper.cxx
index 3cf6d30d1813..cdf6b1780884 100644
--- a/svl/qa/test_URIHelper.cxx
+++ b/svl/qa/test_URIHelper.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: test_URIHelper.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/svl/source/config/asiancfg.cxx b/svl/source/config/asiancfg.cxx
new file mode 100644
index 000000000000..02da1db70d63
--- /dev/null
+++ b/svl/source/config/asiancfg.cxx
@@ -0,0 +1,291 @@
+/*************************************************************************
+ *
+ * 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_svl.hxx"
+
+#include <svl/asiancfg.hxx>
+#include <svl/svarray.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <tools/debug.hxx>
+
+//-----------------------------------------------------------------------------
+using namespace utl;
+using namespace rtl;
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::lang;
+
+#define C2U(cChar) OUString::createFromAscii(cChar)
+const sal_Char sStartEndCharacters[] = "StartEndCharacters";
+const sal_Char sStartCharacters[] = "StartCharacters";
+const sal_Char sEndCharacters[] = "EndCharacters";
+
+//-----------------------------------------------------------------------------
+struct SvxForbiddenStruct_Impl
+{
+    Locale      aLocale;
+    OUString    sStartChars;
+    OUString    sEndChars;
+};
+//-----------------------------------------------------------------------------
+typedef SvxForbiddenStruct_Impl* SvxForbiddenStruct_ImplPtr;
+SV_DECL_PTRARR_DEL(SvxForbiddenStructArr, SvxForbiddenStruct_ImplPtr, 2, 2)
+SV_IMPL_PTRARR(SvxForbiddenStructArr, SvxForbiddenStruct_ImplPtr);
+//-----------------------------------------------------------------------------
+struct SvxAsianConfig_Impl
+{
+    sal_Bool    bKerningWesternTextOnly;
+    sal_Int16   nCharDistanceCompression;
+
+    SvxForbiddenStructArr   aForbiddenArr;
+
+    SvxAsianConfig_Impl() :
+        bKerningWesternTextOnly(sal_True),
+        nCharDistanceCompression(0) {}
+};
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+Sequence<OUString> lcl_GetPropertyNames()
+{
+    Sequence<OUString> aNames(2);
+    OUString* pNames = aNames.getArray();
+    pNames[0] = C2U("IsKerningWesternTextOnly");
+    pNames[1] = C2U("CompressCharacterDistance");
+    return aNames;;
+}
+// ---------------------------------------------------------------------------
+SvxAsianConfig::SvxAsianConfig(sal_Bool bEnableNotify) :
+    utl::ConfigItem(C2U("Office.Common/AsianLayout")),
+    pImpl(new SvxAsianConfig_Impl)
+{
+    if(bEnableNotify)
+        EnableNotification(lcl_GetPropertyNames());
+    Load();
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+SvxAsianConfig::~SvxAsianConfig()
+{
+    delete pImpl;
+}
+/* -----------------------------17.01.01 09:57--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void SvxAsianConfig::Load()
+{
+    Sequence<Any> aValues = GetProperties(lcl_GetPropertyNames());
+    const Any* pValues = aValues.getConstArray();
+    if(pValues[0].hasValue())
+        pImpl->bKerningWesternTextOnly = *(sal_Bool*) pValues[0].getValue();
+    pValues[1] >>= pImpl->nCharDistanceCompression;
+
+    pImpl->aForbiddenArr.DeleteAndDestroy(0, pImpl->aForbiddenArr.Count());
+    OUString sPropPrefix(C2U(sStartEndCharacters));
+    Sequence<OUString> aNodes = GetNodeNames(sPropPrefix);
+
+    Sequence<OUString> aPropNames(aNodes.getLength() * 2);
+    OUString* pNames = aPropNames.getArray();
+    sal_Int32 nName = 0;
+    sPropPrefix += C2U("/");
+    sal_Int32 nNode;
+    const OUString* pNodes = aNodes.getConstArray();
+    for(nNode = 0; nNode < aNodes.getLength(); nNode++)
+    {
+        OUString sStart(sPropPrefix);
+        sStart += pNodes[nNode];
+        sStart += C2U("/");
+        pNames[nName] = sStart;     pNames[nName++] += C2U("StartCharacters");
+        pNames[nName] = sStart;     pNames[nName++] += C2U("EndCharacters");
+    }
+    Sequence<Any> aNodeValues = GetProperties(aPropNames);
+    const Any* pNodeValues = aNodeValues.getConstArray();
+    nName = 0;
+    for(nNode = 0; nNode < aNodes.getLength(); nNode++)
+    {
+        SvxForbiddenStruct_ImplPtr pInsert = new SvxForbiddenStruct_Impl;
+        pInsert->aLocale.Language = pNodes[nNode].copy(0, 2);
+        DBG_ASSERT(pInsert->aLocale.Language.getLength(), "illegal language");
+        pInsert->aLocale.Country = pNodes[nNode].copy(3, 2);
+
+        pNodeValues[nName++] >>= pInsert->sStartChars;
+        pNodeValues[nName++] >>= pInsert->sEndChars;
+        pImpl->aForbiddenArr.Insert(pInsert, pImpl->aForbiddenArr.Count());
+    }
+}
+/* -----------------------------17.01.01 09:57--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void    SvxAsianConfig::Notify( const Sequence<OUString>& )
+{
+    Load();
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void SvxAsianConfig::Commit()
+{
+    Sequence<Any> aValues(2);
+    Any* pValues = aValues.getArray();
+    pValues[0].setValue(&pImpl->bKerningWesternTextOnly, ::getBooleanCppuType());
+    pValues[1] <<= pImpl->nCharDistanceCompression;
+    PutProperties(lcl_GetPropertyNames(), aValues);
+
+
+    OUString sNode(C2U(sStartEndCharacters));
+    if(!pImpl->aForbiddenArr.Count())
+        ClearNodeSet(sNode);
+    else
+    {
+        Sequence<PropertyValue> aSetValues(2 * pImpl->aForbiddenArr.Count());
+        PropertyValue* pSetValues = aSetValues.getArray();
+        sal_Int32 nSetValue = 0;
+        const OUString sStartChars(C2U(sStartCharacters));
+        const OUString sEndChars(C2U(sEndCharacters));
+        for(sal_uInt16 i = 0; i < pImpl->aForbiddenArr.Count(); i++)
+        {
+            OUString sPrefix(sNode);
+            sPrefix += C2U("/");
+            sPrefix += pImpl->aForbiddenArr[i]->aLocale.Language;
+            DBG_ASSERT(pImpl->aForbiddenArr[i]->aLocale.Language.getLength(), "illegal language");
+            sPrefix += C2U("-");
+            sPrefix += pImpl->aForbiddenArr[i]->aLocale.Country;
+            sPrefix += C2U("/");
+            pSetValues[nSetValue].Name = sPrefix; pSetValues[nSetValue].Name += sStartChars;
+            pSetValues[nSetValue++].Value <<= pImpl->aForbiddenArr[i]->sStartChars;
+            pSetValues[nSetValue].Name = sPrefix; pSetValues[nSetValue].Name += sEndChars;
+            pSetValues[nSetValue++].Value <<= pImpl->aForbiddenArr[i]->sEndChars;
+        }
+        ReplaceSetProperties(sNode, aSetValues);
+    }
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+sal_Bool    SvxAsianConfig::IsKerningWesternTextOnly() const
+{
+    return pImpl->bKerningWesternTextOnly;
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void        SvxAsianConfig::SetKerningWesternTextOnly(sal_Bool bSet)
+{
+    pImpl->bKerningWesternTextOnly = bSet;
+    SetModified();
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+sal_Int16   SvxAsianConfig::GetCharDistanceCompression() const
+{
+    return pImpl->nCharDistanceCompression;
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void        SvxAsianConfig::SetCharDistanceCompression(sal_Int16 nSet)
+{
+    DBG_ASSERT(nSet >= 0 && nSet < 3, "compression value illegal");
+    SetModified();
+    pImpl->nCharDistanceCompression = nSet;
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+uno::Sequence<lang::Locale> SvxAsianConfig::GetStartEndCharLocales()
+{
+    Sequence<Locale> aRet(pImpl->aForbiddenArr.Count());
+    Locale* pRet = aRet.getArray();
+    for(sal_uInt16 i = 0; i < pImpl->aForbiddenArr.Count(); i++)
+    {
+        pRet[i] = pImpl->aForbiddenArr[i]->aLocale;
+    }
+    return aRet;
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+sal_Bool    SvxAsianConfig::GetStartEndChars( const Locale& rLocale,
+                                    OUString& rStartChars,
+                                    OUString& rEndChars )
+{
+    for(sal_uInt16 i = 0; i < pImpl->aForbiddenArr.Count(); i++)
+    {
+        if(rLocale.Language == pImpl->aForbiddenArr[i]->aLocale.Language &&
+            rLocale.Country == pImpl->aForbiddenArr[i]->aLocale.Country)
+        {
+            rStartChars = pImpl->aForbiddenArr[i]->sStartChars;
+            rEndChars = pImpl->aForbiddenArr[i]->sEndChars;
+            return sal_True;
+        }
+    }
+    return sal_False;
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void SvxAsianConfig::SetStartEndChars( const Locale& rLocale,
+                                    const OUString* pStartChars,
+                                    const OUString* pEndChars )
+{
+    sal_Bool bFound = sal_False;
+    for(sal_uInt16 i = 0; i < pImpl->aForbiddenArr.Count(); i++)
+    {
+        if(rLocale.Language == pImpl->aForbiddenArr[i]->aLocale.Language &&
+            rLocale.Country == pImpl->aForbiddenArr[i]->aLocale.Country)
+        {
+            if(pStartChars && pEndChars)
+            {
+                pImpl->aForbiddenArr[i]->sStartChars = *pStartChars;
+                pImpl->aForbiddenArr[i]->sEndChars = *pEndChars;
+            }
+            else
+                pImpl->aForbiddenArr.DeleteAndDestroy(i, 1);
+            bFound = sal_True;
+        }
+    }
+    if(!bFound && pStartChars && pEndChars)
+    {
+        SvxForbiddenStruct_ImplPtr pInsert = new SvxForbiddenStruct_Impl;
+        pInsert->aLocale = rLocale;
+        pInsert->sStartChars = *pStartChars;
+        pInsert->sEndChars = *pEndChars;
+        pImpl->aForbiddenArr.Insert(pInsert, pImpl->aForbiddenArr.Count());
+    }
+#ifdef DBG_UTIL
+    else if(!bFound)
+        DBG_ERROR("attempt to clear unavailable data");
+#endif
+    SetModified();
+}
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index c149c91c86f5..cb332ac579f1 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.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: cjkoptions.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/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index a776bc4b807c..983c202cb709 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.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: ctloptions.cxx,v $
- * $Revision: 1.18.140.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx
index 695c6598140c..b0ec824f2b17 100644
--- a/svl/source/config/itemholder2.cxx
+++ b/svl/source/config/itemholder2.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: itemholder2.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/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx
index 192df8f746c9..9314021b5750 100644
--- a/svl/source/config/itemholder2.hxx
+++ b/svl/source/config/itemholder2.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: itemholder2.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/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index f16c0b6add49..8f9aabd59500 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.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: languageoptions.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/svl/source/config/makefile.mk b/svl/source/config/makefile.mk
index 82c4ae12828f..beb696c0feaf 100644
--- a/svl/source/config/makefile.mk
+++ b/svl/source/config/makefile.mk
@@ -1,15 +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: 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
@@ -43,8 +39,10 @@ ENABLE_EXCEPTIONS := TRUE
 # --- Files --------------------------------------------------------
 
 SLOFILES=  \
+        $(SLO)$/asiancfg.obj \
         $(SLO)$/cjkoptions.obj          \
         $(SLO)$/ctloptions.obj          \
+        $(SLO)$/srchcfg.obj \
         $(SLO)$/itemholder2.obj \
         $(SLO)$/languageoptions.obj  
 
diff --git a/svl/source/config/srchcfg.cxx b/svl/source/config/srchcfg.cxx
new file mode 100644
index 000000000000..cf9fd1799650
--- /dev/null
+++ b/svl/source/config/srchcfg.cxx
@@ -0,0 +1,287 @@
+/*************************************************************************
+ *
+ * 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_svl.hxx"
+
+#include <svl/srchcfg.hxx>
+#include <svl/svarray.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <tools/debug.hxx>
+#include <unotools/configpathes.hxx>
+
+//-----------------------------------------------------------------------------
+using namespace utl;
+using namespace rtl;
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::beans;
+
+#define C2U(cChar) OUString::createFromAscii(cChar)
+
+//-----------------------------------------------------------------------------
+typedef SvxSearchEngineData* SvxSearchEngineDataPtr;
+SV_DECL_PTRARR_DEL(SvxSearchEngineArr, SvxSearchEngineDataPtr, 2, 2)
+SV_IMPL_PTRARR(SvxSearchEngineArr, SvxSearchEngineDataPtr);
+//-----------------------------------------------------------------------------
+struct SvxSearchConfig_Impl
+{
+    SvxSearchEngineArr   aEngineArr;
+};
+/* -----------------------------19.03.01 14:00--------------------------------
+
+ ---------------------------------------------------------------------------*/
+sal_Bool SvxSearchEngineData::operator==(const SvxSearchEngineData& rData)
+{
+    return sEngineName      == rData.sEngineName     &&
+            sAndPrefix       == rData.sAndPrefix      &&
+            sAndSuffix       == rData.sAndSuffix      &&
+            sAndSeparator    == rData.sAndSeparator   &&
+            nAndCaseMatch    == rData.nAndCaseMatch   &&
+            sOrPrefix        == rData.sOrPrefix       &&
+            sOrSuffix        == rData.sOrSuffix       &&
+            sOrSeparator     == rData.sOrSeparator    &&
+            nOrCaseMatch     == rData.nOrCaseMatch    &&
+            sExactPrefix     == rData.sExactPrefix    &&
+            sExactSuffix     == rData.sExactSuffix    &&
+            sExactSeparator  == rData.sExactSeparator &&
+            nExactCaseMatch  == rData.nExactCaseMatch;
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+const Sequence<OUString>& lcl_GetSearchPropertyNames_Impl()
+{
+    static Sequence<OUString> aNames;
+    if(!aNames.getLength())
+    {
+        aNames.realloc(12);
+        OUString* pNames = aNames.getArray();
+        pNames[0] = C2U("And/ooInetPrefix");
+        pNames[1] = C2U("And/ooInetSuffix");
+        pNames[2] = C2U("And/ooInetSeparator");
+        pNames[3] = C2U("And/ooInetCaseMatch");
+        pNames[4] = C2U("Or/ooInetPrefix");
+        pNames[5] = C2U("Or/ooInetSuffix");
+        pNames[6] = C2U("Or/ooInetSeparator");
+        pNames[7] = C2U("Or/ooInetCaseMatch");
+        pNames[8] = C2U("Exact/ooInetPrefix");
+        pNames[9] = C2U("Exact/ooInetSuffix");
+        pNames[10] = C2U("Exact/ooInetSeparator");
+        pNames[11] = C2U("Exact/ooInetCaseMatch");
+    }
+    return aNames;
+}
+// ---------------------------------------------------------------------------
+SvxSearchConfig::SvxSearchConfig(sal_Bool bEnableNotify) :
+    utl::ConfigItem(C2U("Inet/SearchEngines"), CONFIG_MODE_DELAYED_UPDATE),
+    pImpl(new SvxSearchConfig_Impl)
+{
+    if(bEnableNotify)
+    {
+        //request notifications from the node
+        Sequence<OUString> aEnable(1);
+        EnableNotification(aEnable);
+    }
+    Load();
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+SvxSearchConfig::~SvxSearchConfig()
+{
+    delete pImpl;
+}
+/* -----------------------------17.01.01 09:57--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void SvxSearchConfig::Load()
+{
+    pImpl->aEngineArr.DeleteAndDestroy(0, pImpl->aEngineArr.Count());
+    Sequence<OUString> aNodeNames = GetNodeNames(OUString());
+    const OUString* pNodeNames = aNodeNames.getConstArray();
+    for(sal_Int32 nNode = 0; nNode < aNodeNames.getLength(); nNode++)
+    {
+        SvxSearchEngineDataPtr pNew = new SvxSearchEngineData;
+        pNew->sEngineName = pNodeNames[nNode];
+        const Sequence<OUString>& rPropNames = lcl_GetSearchPropertyNames_Impl();
+        const OUString* pPropNames = rPropNames.getConstArray();
+        Sequence<OUString> aPropertyNames(rPropNames.getLength());
+        OUString* pPropertyNames = aPropertyNames.getArray();
+        const OUString sSlash(C2U("/"));
+        sal_Int32 nProp;
+        for(nProp = 0; nProp < rPropNames.getLength(); nProp++)
+        {
+            pPropertyNames[nProp] = wrapConfigurationElementName(pNodeNames[nNode]);
+            pPropertyNames[nProp] += sSlash;
+            pPropertyNames[nProp] += pPropNames[nProp];
+        }
+        Sequence<Any> aValues = GetProperties(aPropertyNames);
+        const Any* pValues = aValues.getConstArray();
+        for(nProp = 0; nProp < rPropNames.getLength(); nProp++)
+        {
+            switch(nProp)
+            {
+                case 0 : pValues[nProp] >>= pNew->sAndPrefix;      break;
+                case 1 : pValues[nProp] >>= pNew->sAndSuffix;      break;
+                case 2 : pValues[nProp] >>= pNew->sAndSeparator;   break;
+                case 3 : pValues[nProp] >>= pNew->nAndCaseMatch;   break;
+
+                case 4 : pValues[nProp] >>= pNew->sOrPrefix;       break;
+                case 5 : pValues[nProp] >>= pNew->sOrSuffix;       break;
+                case 6 : pValues[nProp] >>= pNew->sOrSeparator;    break;
+                case 7 : pValues[nProp] >>= pNew->nOrCaseMatch;    break;
+
+                case 8 : pValues[nProp] >>= pNew->sExactPrefix;    break;
+                case 9 : pValues[nProp] >>= pNew->sExactSuffix;    break;
+                case 10: pValues[nProp] >>= pNew->sExactSeparator; break;
+                case 11: pValues[nProp] >>= pNew->nExactCaseMatch; break;
+            }
+        }
+        pImpl->aEngineArr.Insert(pNew, pImpl->aEngineArr.Count());
+    }
+}
+/* -----------------------------17.01.01 09:57--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void    SvxSearchConfig::Notify( const Sequence<OUString>& )
+{
+    Load();
+}
+/* -----------------------------16.01.01 15:36--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void SvxSearchConfig::Commit()
+{
+    OUString sNode;
+    if(!pImpl->aEngineArr.Count())
+        ClearNodeSet(sNode);
+    else
+    {
+        Sequence<PropertyValue> aSetValues(12 * pImpl->aEngineArr.Count());
+        PropertyValue* pSetValues = aSetValues.getArray();
+
+        const Sequence<OUString>& rPropNames = lcl_GetSearchPropertyNames_Impl();
+        const OUString* pPropNames = rPropNames.getConstArray();
+        const OUString sSlash(C2U("/"));
+        for(sal_uInt16 i = 0; i < pImpl->aEngineArr.Count(); i++)
+        {
+            SvxSearchEngineDataPtr pSave = pImpl->aEngineArr[i];
+            for(sal_Int16 nProp = 0; nProp < rPropNames.getLength(); nProp++)
+            {
+                OUString sTmpName = sSlash;
+                sTmpName += wrapConfigurationElementName(pSave->sEngineName);
+                sTmpName += sSlash;
+                sTmpName += pPropNames[nProp];
+                pSetValues[nProp].Name = sTmpName;
+                switch(nProp)
+                {
+                    case 0 : pSetValues[nProp].Value <<= pSave->sAndPrefix;      break;
+                    case 1 : pSetValues[nProp].Value <<= pSave->sAndSuffix;      break;
+                    case 2 : pSetValues[nProp].Value <<= pSave->sAndSeparator;   break;
+                    case 3 : pSetValues[nProp].Value <<= pSave->nAndCaseMatch;   break;
+
+                    case 4 : pSetValues[nProp].Value <<= pSave->sOrPrefix;       break;
+                    case 5 : pSetValues[nProp].Value <<= pSave->sOrSuffix;       break;
+                    case 6 : pSetValues[nProp].Value <<= pSave->sOrSeparator;    break;
+                    case 7 : pSetValues[nProp].Value <<= pSave->nOrCaseMatch;    break;
+
+                    case 8 : pSetValues[nProp].Value <<= pSave->sExactPrefix;    break;
+                    case 9 : pSetValues[nProp].Value <<= pSave->sExactSuffix;    break;
+                    case 10: pSetValues[nProp].Value <<= pSave->sExactSeparator; break;
+                    case 11: pSetValues[nProp].Value <<= pSave->nExactCaseMatch; break;
+                }
+            }
+            pSetValues+= 12;
+        }
+        ReplaceSetProperties(sNode, aSetValues);
+    }
+}
+/* -----------------------------19.03.01 10:02--------------------------------
+
+ ---------------------------------------------------------------------------*/
+sal_uInt16 SvxSearchConfig::Count()
+{
+    return pImpl->aEngineArr.Count();
+}
+/* -----------------------------19.03.01 10:02--------------------------------
+
+ ---------------------------------------------------------------------------*/
+const SvxSearchEngineData&  SvxSearchConfig::GetData(sal_uInt16 nPos)
+{
+    DBG_ASSERT(nPos < pImpl->aEngineArr.Count(), "wrong array index");
+    return *pImpl->aEngineArr[nPos];
+}
+/* -----------------------------19.03.01 10:38--------------------------------
+
+ ---------------------------------------------------------------------------*/
+const SvxSearchEngineData*  SvxSearchConfig::GetData(const rtl::OUString& rEngineName)
+{
+    for(sal_uInt16 nPos = 0; nPos < pImpl->aEngineArr.Count(); nPos++)
+    {
+        if(pImpl->aEngineArr[nPos]->sEngineName == rEngineName)
+            return pImpl->aEngineArr[nPos];
+    }
+    return 0;
+}
+/* -----------------------------19.03.01 10:02--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void  SvxSearchConfig::SetData(const SvxSearchEngineData& rData)
+{
+    for(sal_uInt16 nPos = 0; nPos < pImpl->aEngineArr.Count(); nPos++)
+    {
+        if(pImpl->aEngineArr[nPos]->sEngineName == rData.sEngineName)
+        {
+            if((*pImpl->aEngineArr[nPos]) == rData)
+                return;
+            pImpl->aEngineArr.DeleteAndDestroy(nPos, 1);
+            break;
+        }
+    }
+    SvxSearchEngineDataPtr pInsert = new SvxSearchEngineData(rData);
+    pImpl->aEngineArr.Insert(pInsert, pImpl->aEngineArr.Count());
+    SetModified();
+}
+/* -----------------------------19.03.01 10:38--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void SvxSearchConfig::RemoveData(const rtl::OUString& rEngineName)
+{
+    for(sal_uInt16 nPos = 0; nPos < pImpl->aEngineArr.Count(); nPos++)
+    {
+        if(pImpl->aEngineArr[nPos]->sEngineName == rEngineName)
+        {
+            pImpl->aEngineArr.DeleteAndDestroy(nPos, 1);
+            SetModified();
+            return ;
+        }
+    }
+}
+
diff --git a/svl/source/filepicker/makefile.mk b/svl/source/filepicker/makefile.mk
index 644c70af0b1a..a4c97ea41aa1 100644
--- a/svl/source/filepicker/makefile.mk
+++ b/svl/source/filepicker/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx
index cda263338d5d..72096c1bc56a 100644
--- a/svl/source/filepicker/pickerhelper.cxx
+++ b/svl/source/filepicker/pickerhelper.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: pickerhelper.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/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx
index 5cc12779f0b5..4c372c48163d 100644
--- a/svl/source/filepicker/pickerhistory.cxx
+++ b/svl/source/filepicker/pickerhistory.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: pickerhistory.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/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx
index ac35a748eef7..0d1b06be5d11 100644
--- a/svl/source/filerec/filerec.cxx
+++ b/svl/source/filerec/filerec.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: filerec.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/svl/source/filerec/makefile.mk b/svl/source/filerec/makefile.mk
index c590e38a7ea1..ea2b88d8d493 100644
--- a/svl/source/filerec/makefile.mk
+++ b/svl/source/filerec/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx
index e47593ba8f8b..298b6f555e2a 100644
--- a/svl/source/fsstor/fsfactory.cxx
+++ b/svl/source/fsstor/fsfactory.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: fsfactory.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/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx
index bae02feae1dd..73460ef3d277 100644
--- a/svl/source/fsstor/fsstorage.cxx
+++ b/svl/source/fsstor/fsstorage.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: fsstorage.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/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx
index 670a6917dd40..04bd3dead578 100644
--- a/svl/source/fsstor/fsstorage.hxx
+++ b/svl/source/fsstor/fsstorage.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: fsstorage.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/svl/source/fsstor/makefile.mk b/svl/source/fsstor/makefile.mk
index 7f46009750fd..43515155d63d 100644
--- a/svl/source/fsstor/makefile.mk
+++ b/svl/source/fsstor/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx
index 53be03699ba0..ffa86cdb981d 100644
--- a/svl/source/fsstor/oinputstreamcontainer.cxx
+++ b/svl/source/fsstor/oinputstreamcontainer.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: oinputstreamcontainer.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/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx
index 308f4283b430..939eb16c05af 100644
--- a/svl/source/fsstor/oinputstreamcontainer.hxx
+++ b/svl/source/fsstor/oinputstreamcontainer.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: oinputstreamcontainer.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/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx
index dac7c9c31375..b9210f685014 100644
--- a/svl/source/fsstor/ostreamcontainer.cxx
+++ b/svl/source/fsstor/ostreamcontainer.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: ostreamcontainer.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/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx
index 6198587c3d35..67fbf88b64c6 100644
--- a/svl/source/fsstor/ostreamcontainer.hxx
+++ b/svl/source/fsstor/ostreamcontainer.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: ostreamcontainer.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/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx
index 5954ecebabc2..d5e4e1d56373 100644
--- a/svl/source/inc/fsfactory.hxx
+++ b/svl/source/inc/fsfactory.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: fsfactory.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/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx
index a067672f3cf6..375632801368 100644
--- a/svl/source/inc/passwordcontainer.hxx
+++ b/svl/source/inc/passwordcontainer.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: passwordcontainer.hxx,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/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx
index 0018b403796f..70122a5b1998 100644
--- a/svl/source/inc/poolio.hxx
+++ b/svl/source/inc/poolio.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: poolio.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/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index 55dc818d0160..36445162424b 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.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: aeitem.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/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx
index 3c2f7764a351..c5e1a09ec324 100644
--- a/svl/source/items/cenumitm.cxx
+++ b/svl/source/items/cenumitm.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: cenumitm.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/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index 9d9d58421fc4..dd22ab757fe7 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.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: cintitem.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/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx
index 824ad6b2b5b0..56632c675d01 100644
--- a/svl/source/items/cntwall.cxx
+++ b/svl/source/items/cntwall.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: cntwall.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/svl/source/items/cstitem.src b/svl/source/items/cstitem.src
index 54951dd3761e..b3511ffb302b 100644
--- a/svl/source/items/cstitem.src
+++ b/svl/source/items/cstitem.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: cstitem.src,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/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx
index 69302ebdb868..576071b56e1c 100644
--- a/svl/source/items/ctypeitm.cxx
+++ b/svl/source/items/ctypeitm.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: ctypeitm.cxx,v $
- * $Revision: 1.7.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx
index 8687aafbae49..9d192cc7e7b8 100644
--- a/svl/source/items/custritm.cxx
+++ b/svl/source/items/custritm.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: custritm.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/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
index d6ef8fdc7c9e..3c8e85c461f2 100644
--- a/svl/source/items/dateitem.cxx
+++ b/svl/source/items/dateitem.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: dateitem.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/svl/source/items/eitem.cxx b/svl/source/items/eitem.cxx
index 16d5aae5a16f..c8b7f3db287f 100644
--- a/svl/source/items/eitem.cxx
+++ b/svl/source/items/eitem.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: eitem.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/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx
index 537632db04ff..93d88889daef 100644
--- a/svl/source/items/flagitem.cxx
+++ b/svl/source/items/flagitem.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: flagitem.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/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx
index 1b676a95bf71..a0ebd97c89b6 100644
--- a/svl/source/items/globalnameitem.cxx
+++ b/svl/source/items/globalnameitem.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: globalnameitem.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/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx
index 4d2cb0a3b5b9..691fa7d131be 100644
--- a/svl/source/items/ilstitem.cxx
+++ b/svl/source/items/ilstitem.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: ilstitem.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/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx
index dec2626472cc..88c3daa137dc 100644
--- a/svl/source/items/imageitm.cxx
+++ b/svl/source/items/imageitm.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: imageitm.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/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx
index 1133cdf553d1..0342af15e8cb 100644
--- a/svl/source/items/intitem.cxx
+++ b/svl/source/items/intitem.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: intitem.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/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx
index c8c6eea67c82..57b5dc8e727c 100644
--- a/svl/source/items/itemiter.cxx
+++ b/svl/source/items/itemiter.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: itemiter.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/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx
index 5f34560e8471..5c5f106a1c36 100644
--- a/svl/source/items/itempool.cxx
+++ b/svl/source/items/itempool.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: itempool.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/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index 3add3f466495..b3be80bc3d0b 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.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: itemprop.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/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx
index 45516660ee21..a79e5195187a 100644
--- a/svl/source/items/itemset.cxx
+++ b/svl/source/items/itemset.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: itemset.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/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx
index 04e2edb70026..f1845fc251ee 100644
--- a/svl/source/items/lckbitem.cxx
+++ b/svl/source/items/lckbitem.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: lckbitem.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/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx
index 511ca2bba57c..acaa66839981 100644
--- a/svl/source/items/macitem.cxx
+++ b/svl/source/items/macitem.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: macitem.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/svl/source/items/makefile.mk b/svl/source/items/makefile.mk
index d779e16e24d1..da602391239a 100644
--- a/svl/source/items/makefile.mk
+++ b/svl/source/items/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.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,6 +66,7 @@ SLOFILES=\
     $(SLO)$/sfontitm.obj	\
     $(SLO)$/sitem.obj	    \
     $(SLO)$/slstitm.obj	\
+    $(SLO)$/srchitem.obj \
     $(SLO)$/stritem.obj	\
     $(SLO)$/style.obj	\
     $(SLO)$/stylepool.obj	\
diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index 789da8dc5ff9..284bc251a3a4 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.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: nranges.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/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx
index e64325213ff4..b918add10f0f 100644
--- a/svl/source/items/poolcach.cxx
+++ b/svl/source/items/poolcach.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: poolcach.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/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx
index 4383ac99d2ed..6aeb64d76d1a 100644
--- a/svl/source/items/poolio.cxx
+++ b/svl/source/items/poolio.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: poolio.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/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx
index 4957c5c16945..77cf3dfff014 100644
--- a/svl/source/items/poolitem.cxx
+++ b/svl/source/items/poolitem.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: poolitem.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/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 30fef0227397..3c12745e5967 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.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: ptitem.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,7 +34,7 @@
 #include <tools/stream.hxx>
 
 #include <svl/poolitem.hxx>
-#include "memberid.hrc"
+#include <svl/memberid.hrc>
 
 using namespace ::com::sun::star;
 // STATIC DATA -----------------------------------------------------------
diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx
index 26c4876d8c2c..893ac3c125b0 100644
--- a/svl/source/items/rectitem.cxx
+++ b/svl/source/items/rectitem.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: rectitem.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,7 +34,7 @@
 #include <tools/stream.hxx>
 
 #include <svl/poolitem.hxx>
-#include "memberid.hrc"
+#include <svl/memberid.hrc>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx
index b6340d662112..2f9c58a362f6 100644
--- a/svl/source/items/rngitem.cxx
+++ b/svl/source/items/rngitem.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: rngitem.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/svl/source/items/rngitem_inc.cxx b/svl/source/items/rngitem_inc.cxx
index d8cc7ed185ae..ab8852756f7d 100755..100644
--- a/svl/source/items/rngitem_inc.cxx
+++ b/svl/source/items/rngitem_inc.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: rngitem_inc.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/svl/source/items/sfontitm.cxx b/svl/source/items/sfontitm.cxx
index 9ec06bc5a105..e76b3854c6be 100644
--- a/svl/source/items/sfontitm.cxx
+++ b/svl/source/items/sfontitm.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: sfontitm.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/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx
index 52f0931c9eae..4a9c0af096ea 100644
--- a/svl/source/items/sitem.cxx
+++ b/svl/source/items/sitem.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: sitem.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/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx
index d0dd801bb6f9..ec9757e278a8 100644
--- a/svl/source/items/slstitm.cxx
+++ b/svl/source/items/slstitm.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: slstitm.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/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
new file mode 100644
index 000000000000..b7422c56224b
--- /dev/null
+++ b/svl/source/items/srchitem.cxx
@@ -0,0 +1,649 @@
+/*************************************************************************
+ *
+ * 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_svl.hxx"
+
+// include ---------------------------------------------------------------
+
+#include <svl/srchitem.hxx>
+
+#include <unotools/searchopt.hxx>
+#include <com/sun/star/util/XReplaceable.hpp>
+#include <com/sun/star/util/XSearchable.hpp>
+#include <com/sun/star/util/XSearchDescriptor.hpp>
+#include <com/sun/star/util/XPropertyReplace.hpp>
+#include <com/sun/star/util/XReplaceDescriptor.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+#include <svl/memberid.hrc>
+#include <i18npool/mslangid.hxx>
+
+using namespace utl;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::i18n;
+using namespace com::sun::star::lang;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::util;
+
+#define CFG_ROOT_NODE       "Office.Common/SearchOptions"
+
+#define SRCH_PARAMS         11
+#define SRCH_PARA_OPTIONS   "Options"
+#define SRCH_PARA_FAMILY    "Family"
+#define SRCH_PARA_COMMAND   "Command"
+#define SRCH_PARA_CELLTYPE  "CellType"
+#define SRCH_PARA_APPFLAG   "AppFlag"
+#define SRCH_PARA_ROWDIR    "RowDirection"
+#define SRCH_PARA_ALLTABLES "AllTables"
+#define SRCH_PARA_BACKWARD  "Backward"
+#define SRCH_PARA_PATTERN   "Pattern"
+#define SRCH_PARA_CONTENT   "Content"
+#define SRCH_PARA_ASIANOPT  "AsianOptions"
+
+// STATIC DATA -----------------------------------------------------------
+
+TYPEINIT1_FACTORY(SvxSearchItem, SfxPoolItem, new SvxSearchItem(0));
+
+// -----------------------------------------------------------------------
+
+static Sequence< ::rtl::OUString > lcl_GetNotifyNames()
+{
+    // names of transliteration relevant properties
+    static const char* aTranslitNames[] =
+    {
+        "IsMatchCase",                          //  0
+        "Japanese/IsMatchFullHalfWidthForms",   //  1
+        "Japanese/IsMatchHiraganaKatakana",     //  2
+        "Japanese/IsMatchContractions",         //  3
+        "Japanese/IsMatchMinusDashCho-on",      //  4
+        "Japanese/IsMatchRepeatCharMarks",      //  5
+        "Japanese/IsMatchVariantFormKanji",     //  6
+        "Japanese/IsMatchOldKanaForms",         //  7
+        "Japanese/IsMatch_DiZi_DuZu",           //  8
+        "Japanese/IsMatch_BaVa_HaFa",           //  9
+        "Japanese/IsMatch_TsiThiChi_DhiZi",     // 10
+        "Japanese/IsMatch_HyuIyu_ByuVyu",       // 11
+        "Japanese/IsMatch_SeShe_ZeJe",          // 12
+        "Japanese/IsMatch_IaIya",               // 13
+        "Japanese/IsMatch_KiKu",                // 14
+        "Japanese/IsIgnorePunctuation",         // 15
+        "Japanese/IsIgnoreWhitespace",          // 16
+        "Japanese/IsIgnoreProlongedSoundMark",  // 17
+        "Japanese/IsIgnoreMiddleDot"            // 18
+    };
+
+    const int nCount = sizeof( aTranslitNames ) / sizeof( aTranslitNames[0] );
+    Sequence< ::rtl::OUString > aNames( nCount );
+    ::rtl::OUString* pNames = aNames.getArray();
+    for (INT32 i = 0;  i < nCount;  ++i)
+        pNames[i] = ::rtl::OUString::createFromAscii( aTranslitNames[i] );
+
+    return aNames;
+}
+
+// -----------------------------------------------------------------------
+SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
+
+    SfxPoolItem( nId ),
+    ConfigItem( ::rtl::OUString::createFromAscii( CFG_ROOT_NODE ) ),
+
+    aSearchOpt      (   SearchAlgorithms_ABSOLUTE,
+                        SearchFlags::LEV_RELAXED,
+                        ::rtl::OUString(),
+                        ::rtl::OUString(),
+                          Locale(),
+                          2, 2, 2,
+                          TransliterationModules_IGNORE_CASE ),
+    eFamily         ( SFX_STYLE_FAMILY_PARA ),
+    nCommand        ( 0 ),
+    nCellType       ( SVX_SEARCHIN_FORMULA ),
+    nAppFlag        ( SVX_SEARCHAPP_WRITER ),
+    bRowDirection   ( sal_True ),
+    bAllTables      ( sal_False ),
+    bNotes          ( sal_False),
+    bBackward       ( sal_False ),
+    bPattern        ( sal_False ),
+    bContent        ( sal_False ),
+    bAsianOptions   ( FALSE )
+{
+    EnableNotification( lcl_GetNotifyNames() );
+
+    SvtSearchOptions aOpt;
+
+    bBackward       = aOpt.IsBackwards();
+    bAsianOptions   = aOpt.IsUseAsianOptions();
+    bNotes = aOpt.IsNotes();
+
+    if (aOpt.IsUseRegularExpression())
+        aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
+    if (aOpt.IsSimilaritySearch())
+        aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
+    if (aOpt.IsWholeWordsOnly())
+        aSearchOpt.searchFlag |= SearchFlags::NORM_WORD_ONLY;
+
+    INT32 &rFlags = aSearchOpt.transliterateFlags;
+
+    if (!aOpt.IsMatchCase())
+        rFlags |= TransliterationModules_IGNORE_CASE;
+    if ( aOpt.IsMatchFullHalfWidthForms())
+        rFlags |= TransliterationModules_IGNORE_WIDTH;
+    if ( aOpt.IsMatchHiraganaKatakana())
+        rFlags |= TransliterationModules_IGNORE_KANA;
+    if ( aOpt.IsMatchContractions())
+        rFlags |= TransliterationModules_ignoreSize_ja_JP;
+    if ( aOpt.IsMatchMinusDashChoon())
+        rFlags |= TransliterationModules_ignoreMinusSign_ja_JP;
+    if ( aOpt.IsMatchRepeatCharMarks())
+        rFlags |= TransliterationModules_ignoreIterationMark_ja_JP;
+    if ( aOpt.IsMatchVariantFormKanji())
+        rFlags |= TransliterationModules_ignoreTraditionalKanji_ja_JP;
+    if ( aOpt.IsMatchOldKanaForms())
+        rFlags |= TransliterationModules_ignoreTraditionalKana_ja_JP;
+    if ( aOpt.IsMatchDiziDuzu())
+        rFlags |= TransliterationModules_ignoreZiZu_ja_JP;
+    if ( aOpt.IsMatchBavaHafa())
+        rFlags |= TransliterationModules_ignoreBaFa_ja_JP;
+    if ( aOpt.IsMatchTsithichiDhizi())
+        rFlags |= TransliterationModules_ignoreTiJi_ja_JP;
+    if ( aOpt.IsMatchHyuiyuByuvyu())
+        rFlags |= TransliterationModules_ignoreHyuByu_ja_JP;
+    if ( aOpt.IsMatchSesheZeje())
+        rFlags |= TransliterationModules_ignoreSeZe_ja_JP;
+    if ( aOpt.IsMatchIaiya())
+        rFlags |= TransliterationModules_ignoreIandEfollowedByYa_ja_JP;
+    if ( aOpt.IsMatchKiku())
+        rFlags |= TransliterationModules_ignoreKiKuFollowedBySa_ja_JP;
+    if ( aOpt.IsIgnorePunctuation())
+        rFlags |= TransliterationModules_ignoreSeparator_ja_JP;
+    if ( aOpt.IsIgnoreWhitespace())
+        rFlags |= TransliterationModules_ignoreSpace_ja_JP;
+    if ( aOpt.IsIgnoreProlongedSoundMark())
+        rFlags |= TransliterationModules_ignoreProlongedSoundMark_ja_JP;
+    if ( aOpt.IsIgnoreMiddleDot())
+        rFlags |= TransliterationModules_ignoreMiddleDot_ja_JP;
+}
+
+// -----------------------------------------------------------------------
+
+SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
+
+    SfxPoolItem ( rItem ),
+    ConfigItem( ::rtl::OUString::createFromAscii( CFG_ROOT_NODE ) ),
+
+    aSearchOpt      ( rItem.aSearchOpt ),
+    eFamily         ( rItem.eFamily ),
+    nCommand        ( rItem.nCommand ),
+    nCellType       ( rItem.nCellType ),
+    nAppFlag        ( rItem.nAppFlag ),
+    bRowDirection   ( rItem.bRowDirection ),
+    bAllTables      ( rItem.bAllTables ),
+    bNotes          ( rItem.bNotes),
+    bBackward       ( rItem.bBackward ),
+    bPattern        ( rItem.bPattern ),
+    bContent        ( rItem.bContent ),
+    bAsianOptions   ( rItem.bAsianOptions )
+{
+    EnableNotification( lcl_GetNotifyNames() );
+}
+
+// -----------------------------------------------------------------------
+
+SvxSearchItem::~SvxSearchItem()
+{
+}
+
+// -----------------------------------------------------------------------
+SfxPoolItem* SvxSearchItem::Clone( SfxItemPool *) const
+{
+    return new SvxSearchItem(*this);
+}
+
+// -----------------------------------------------------------------------
+
+//! used below
+static BOOL operator == ( const SearchOptions& rItem1, const SearchOptions& rItem2 )
+{
+    return rItem1.algorithmType         == rItem2.algorithmType &&
+           rItem1.searchFlag            == rItem2.searchFlag    &&
+           rItem1.searchString          == rItem2.searchString  &&
+           rItem1.replaceString         == rItem2.replaceString &&
+           //rItem1.Locale              == rItem2.Locale        &&
+           rItem1.changedChars          == rItem2.changedChars  &&
+           rItem1.deletedChars          == rItem2.deletedChars  &&
+           rItem1.insertedChars         == rItem2.insertedChars &&
+           rItem1.transliterateFlags    == rItem2.transliterateFlags;
+}
+
+
+int SvxSearchItem::operator==( const SfxPoolItem& rItem ) const
+{
+    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal which or type" );
+    const SvxSearchItem &rSItem = (SvxSearchItem &) rItem;
+    return ( nCommand       == rSItem.nCommand )        &&
+           ( bBackward      == rSItem.bBackward )       &&
+           ( bPattern       == rSItem.bPattern )        &&
+           ( bContent       == rSItem.bContent )        &&
+           ( eFamily        == rSItem.eFamily )         &&
+           ( bRowDirection  == rSItem.bRowDirection )   &&
+           ( bAllTables     == rSItem.bAllTables )      &&
+           ( nCellType      == rSItem.nCellType )       &&
+           ( nAppFlag       == rSItem.nAppFlag )        &&
+           ( bAsianOptions  == rSItem.bAsianOptions )   &&
+           ( aSearchOpt     == rSItem.aSearchOpt )      &&
+           ( bNotes         == rSItem.bNotes );
+}
+
+
+//------------------------------------------------------------------------
+
+SfxItemPresentation SvxSearchItem::GetPresentation
+(
+    SfxItemPresentation ,
+    SfxMapUnit          ,
+    SfxMapUnit          ,
+    XubString&          ,
+    const IntlWrapper *
+)   const
+{
+    return SFX_ITEM_PRESENTATION_NONE;
+}
+
+void SvxSearchItem::GetFromDescriptor( const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >& rDescr )
+{
+    SetSearchString( rDescr->getSearchString() );
+    ::com::sun::star::uno::Any aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ) );
+    sal_Bool bTemp = false;
+    aAny >>= bTemp ;
+    SetWordOnly( bTemp );
+    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ) );
+    aAny >>= bTemp ;
+    SetExact( bTemp );
+    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ) );
+    aAny >>= bTemp ;
+    SetBackward( bTemp );
+    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchInSelection") ) );
+    aAny >>= bTemp ;
+    SetSelection( bTemp );
+    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ) );
+    aAny >>= bTemp ;
+    SetRegExp( bTemp );
+    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ) );
+    aAny >>= bTemp ;
+    SetLevenshtein( bTemp );
+    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ) );
+    aAny >>= bTemp ;
+    SetLEVRelaxed( bTemp );
+    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityExchange") ) );
+    sal_Int16 nTemp = 0;
+    aAny >>= nTemp ;
+    SetLEVOther( nTemp );
+    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRemove") ) );
+    aAny >>= nTemp ;
+    SetLEVShorter( nTemp );
+    aAny = rDescr->getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityAdd") ) );
+    aAny >>= nTemp ;
+    SetLEVLonger( nTemp );
+}
+
+void SvxSearchItem::SetToDescriptor( ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & rDescr )
+{
+    rDescr->setSearchString( GetSearchString() );
+    ::com::sun::star::uno::Any aAny;
+    aAny <<= GetWordOnly() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchWords") ), aAny );
+    aAny <<= GetExact() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchCaseSensitive") ), aAny );
+    aAny <<= GetBackward() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchBackwards") ), aAny );
+    aAny <<= GetSelection() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchInSelection") ), aAny );
+    aAny <<= GetRegExp() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchRegularExpression") ), aAny );
+    aAny <<= IsLevenshtein() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarity") ), aAny );
+    aAny <<= IsLEVRelaxed() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRelax") ), aAny );
+    aAny <<= GetLEVOther() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityExchange") ), aAny );
+    aAny <<= GetLEVShorter() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityRemove") ), aAny );
+    aAny <<= GetLEVLonger() ;
+    rDescr->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SearchSimilarityAdd") ), aAny );
+}
+
+
+void SvxSearchItem::Notify( const Sequence< ::rtl::OUString > & )
+{
+    // applies transliteration changes in the configuration database
+    // to the current SvxSearchItem
+    SetTransliterationFlags( SvtSearchOptions().GetTransliterationFlags() );
+}
+
+void SvxSearchItem::Commit()
+{
+}
+
+void SvxSearchItem::SetMatchFullHalfWidthForms( sal_Bool bVal )
+{
+    if (bVal)
+        aSearchOpt.transliterateFlags |=  TransliterationModules_IGNORE_WIDTH;
+    else
+        aSearchOpt.transliterateFlags &= ~TransliterationModules_IGNORE_WIDTH;
+}
+
+
+void SvxSearchItem::SetWordOnly( sal_Bool bVal )
+{
+    if (bVal)
+        aSearchOpt.searchFlag |=  SearchFlags::NORM_WORD_ONLY;
+    else
+        aSearchOpt.searchFlag &= ~SearchFlags::NORM_WORD_ONLY;
+}
+
+
+void SvxSearchItem::SetExact( sal_Bool bVal )
+{
+    if (!bVal)
+        aSearchOpt.transliterateFlags |=  TransliterationModules_IGNORE_CASE;
+    else
+        aSearchOpt.transliterateFlags &= ~TransliterationModules_IGNORE_CASE;
+}
+
+
+void SvxSearchItem::SetSelection( sal_Bool bVal )
+{
+    if (bVal)
+    {
+        aSearchOpt.searchFlag |=  (SearchFlags::REG_NOT_BEGINOFLINE |
+                                   SearchFlags::REG_NOT_ENDOFLINE);
+    }
+    else
+    {
+        aSearchOpt.searchFlag &= ~(SearchFlags::REG_NOT_BEGINOFLINE |
+                                   SearchFlags::REG_NOT_ENDOFLINE);
+    }
+}
+
+
+void SvxSearchItem::SetRegExp( sal_Bool bVal )
+{
+    if ( bVal )
+        aSearchOpt.algorithmType = SearchAlgorithms_REGEXP;
+    else if ( SearchAlgorithms_REGEXP == aSearchOpt.algorithmType )
+        aSearchOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
+}
+
+
+void SvxSearchItem::SetLEVRelaxed( sal_Bool bVal )
+{
+    if (bVal)
+        aSearchOpt.searchFlag |=  SearchFlags::LEV_RELAXED;
+    else
+        aSearchOpt.searchFlag &= ~SearchFlags::LEV_RELAXED;
+}
+
+
+void SvxSearchItem::SetLevenshtein( sal_Bool bVal )
+{
+    if ( bVal )
+        aSearchOpt.algorithmType = SearchAlgorithms_APPROXIMATE;
+    else if ( SearchAlgorithms_APPROXIMATE == aSearchOpt.algorithmType )
+        aSearchOpt.algorithmType = SearchAlgorithms_ABSOLUTE;
+}
+
+
+void SvxSearchItem::SetTransliterationFlags( sal_Int32 nFlags )
+{
+    aSearchOpt.transliterateFlags = nFlags;
+}
+
+sal_Bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
+{
+    nMemberId &= ~CONVERT_TWIPS;
+    switch ( nMemberId )
+    {
+        case 0 :
+        {
+            Sequence< PropertyValue > aSeq( SRCH_PARAMS );
+            aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_OPTIONS ) );
+            aSeq[0].Value <<= aSearchOpt;
+            aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_FAMILY ));
+            aSeq[1].Value <<= sal_Int16( eFamily );
+            aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_COMMAND ));
+            aSeq[2].Value <<= nCommand;
+            aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_CELLTYPE ));
+            aSeq[3].Value <<= nCellType;
+            aSeq[4].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_APPFLAG ));
+            aSeq[4].Value <<= nAppFlag;
+            aSeq[5].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ROWDIR ));
+            aSeq[5].Value <<= bRowDirection;
+            aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ALLTABLES ));
+            aSeq[6].Value <<= bAllTables;
+            aSeq[7].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_BACKWARD ));
+            aSeq[7].Value <<= bBackward;
+            aSeq[8].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_PATTERN ));
+            aSeq[8].Value <<= bPattern;
+            aSeq[9].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_CONTENT ));
+            aSeq[9].Value <<= bContent;
+            aSeq[10].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ASIANOPT ));
+            aSeq[10].Value <<= bAsianOptions;
+            rVal <<= aSeq;
+        }
+        break;
+        case MID_SEARCH_COMMAND:
+            rVal <<= (sal_Int16) nCommand; break;
+        case MID_SEARCH_STYLEFAMILY:
+            rVal <<= (sal_Int16) eFamily; break;
+        case MID_SEARCH_CELLTYPE:
+            rVal <<= (sal_Int32) nCellType; break;
+        case MID_SEARCH_ROWDIRECTION:
+            rVal <<= (sal_Bool) bRowDirection; break;
+        case MID_SEARCH_ALLTABLES:
+            rVal <<= (sal_Bool) bAllTables; break;
+        case MID_SEARCH_BACKWARD:
+            rVal <<= (sal_Bool) bBackward; break;
+        case MID_SEARCH_PATTERN:
+            rVal <<= (sal_Bool) bPattern; break;
+        case MID_SEARCH_CONTENT:
+            rVal <<= (sal_Bool) bContent; break;
+        case MID_SEARCH_ASIANOPTIONS:
+            rVal <<= (sal_Bool) bAsianOptions; break;
+        case MID_SEARCH_ALGORITHMTYPE:
+            rVal <<= (sal_Int16) aSearchOpt.algorithmType; break;
+        case MID_SEARCH_FLAGS:
+            rVal <<= aSearchOpt.searchFlag; break;
+        case MID_SEARCH_SEARCHSTRING:
+            rVal <<= aSearchOpt.searchString; break;
+        case MID_SEARCH_REPLACESTRING:
+            rVal <<= aSearchOpt.replaceString; break;
+        case MID_SEARCH_CHANGEDCHARS:
+            rVal <<= aSearchOpt.changedChars; break;
+        case MID_SEARCH_DELETEDCHARS:
+            rVal <<= aSearchOpt.deletedChars; break;
+        case MID_SEARCH_INSERTEDCHARS:
+            rVal <<= aSearchOpt.insertedChars; break;
+        case MID_SEARCH_TRANSLITERATEFLAGS:
+            rVal <<= aSearchOpt.transliterateFlags; break;
+        case MID_SEARCH_LOCALE:
+        {
+            sal_Int16 nLocale;
+            if (aSearchOpt.Locale.Language.getLength() || aSearchOpt.Locale.Country.getLength() )
+                nLocale = MsLangId::convertLocaleToLanguage( aSearchOpt.Locale );
+            else
+                nLocale = LANGUAGE_NONE;
+            rVal <<= nLocale;
+            break;
+        }
+
+        default:
+            DBG_ERRORFILE( "SvxSearchItem::QueryValue(): Unknown MemberId" );
+            return sal_False;
+    }
+
+    return sal_True;
+}
+
+// -----------------------------------------------------------------------
+
+sal_Bool SvxSearchItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId )
+{
+    nMemberId &= ~CONVERT_TWIPS;
+    sal_Bool bRet = sal_False;
+    sal_Int32 nInt = 0;
+    switch ( nMemberId )
+    {
+        case 0 :
+        {
+            Sequence< PropertyValue > aSeq;
+            if ( ( rVal >>= aSeq ) && ( aSeq.getLength() == SRCH_PARAMS ) )
+            {
+                sal_Int16 nConvertedCount( 0 );
+                for ( sal_Int32 i = 0; i < aSeq.getLength(); ++i )
+                {
+                    if ( aSeq[i].Name.equalsAscii( SRCH_PARA_OPTIONS ) )
+                    {
+                        if ( ( aSeq[i].Value >>= aSearchOpt ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_FAMILY ) )
+                    {
+                        sal_uInt16 nTemp( 0 );
+                        if ( ( aSeq[i].Value >>= nTemp ) == sal_True )
+                        {
+                            eFamily = SfxStyleFamily( nTemp );
+                            ++nConvertedCount;
+                        }
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_COMMAND ) )
+                    {
+                        if ( ( aSeq[i].Value >>= nCommand ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_CELLTYPE ) )
+                    {
+                        if ( ( aSeq[i].Value >>= nCellType ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_APPFLAG ) )
+                    {
+                        if ( ( aSeq[i].Value >>= nAppFlag ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_ROWDIR ) )
+                    {
+                        if ( ( aSeq[i].Value >>= bRowDirection ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_ALLTABLES ) )
+                    {
+                        if ( ( aSeq[i].Value >>= bAllTables ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_BACKWARD ) )
+                    {
+                        if ( ( aSeq[i].Value >>= bBackward ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_PATTERN ) )
+                    {
+                        if ( ( aSeq[i].Value >>= bPattern ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_CONTENT ) )
+                    {
+                        if ( ( aSeq[i].Value >>= bContent ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                    else if ( aSeq[i].Name.equalsAscii( SRCH_PARA_ASIANOPT ) )
+                    {
+                        if ( ( aSeq[i].Value >>= bAsianOptions ) == sal_True )
+                            ++nConvertedCount;
+                    }
+                }
+
+                bRet = ( nConvertedCount == SRCH_PARAMS );
+            }
+            break;
+        }
+        case MID_SEARCH_COMMAND:
+            bRet = (rVal >>= nInt); nCommand = (sal_uInt16) nInt; break;
+        case MID_SEARCH_STYLEFAMILY:
+            bRet = (rVal >>= nInt); eFamily =  (SfxStyleFamily) (sal_Int16) nInt; break;
+        case MID_SEARCH_CELLTYPE:
+            bRet = (rVal >>= nInt); nCellType = (sal_uInt16) nInt; break;
+        case MID_SEARCH_ROWDIRECTION:
+            bRet = (rVal >>= bRowDirection); break;
+        case MID_SEARCH_ALLTABLES:
+            bRet = (rVal >>= bAllTables); break;
+        case MID_SEARCH_BACKWARD:
+            bRet = (rVal >>= bBackward); break;
+        case MID_SEARCH_PATTERN:
+            bRet = (rVal >>= bPattern); break;
+        case MID_SEARCH_CONTENT:
+            bRet = (rVal >>= bContent); break;
+        case MID_SEARCH_ASIANOPTIONS:
+            bRet = (rVal >>= bAsianOptions); break;
+        case MID_SEARCH_ALGORITHMTYPE:
+            bRet = (rVal >>= nInt); aSearchOpt.algorithmType = (SearchAlgorithms)(sal_Int16)nInt; break;
+        case MID_SEARCH_FLAGS:
+            bRet = (rVal >>= aSearchOpt.searchFlag); break;
+        case MID_SEARCH_SEARCHSTRING:
+            bRet = (rVal >>= aSearchOpt.searchString); break;
+        case MID_SEARCH_REPLACESTRING:
+            bRet = (rVal >>= aSearchOpt.replaceString); break;
+        case MID_SEARCH_CHANGEDCHARS:
+            bRet = (rVal >>= aSearchOpt.changedChars); break;
+        case MID_SEARCH_DELETEDCHARS:
+            bRet = (rVal >>= aSearchOpt.deletedChars); break;
+        case MID_SEARCH_INSERTEDCHARS:
+            bRet = (rVal >>= aSearchOpt.insertedChars); break;
+        case MID_SEARCH_TRANSLITERATEFLAGS:
+            bRet = (rVal >>= aSearchOpt.transliterateFlags); break;
+        case MID_SEARCH_LOCALE:
+        {
+            bRet = (rVal >>= nInt);
+            if ( bRet )
+            {
+                if ( nInt == LANGUAGE_NONE )
+                {
+                    aSearchOpt.Locale = ::com::sun::star::lang::Locale();
+                }
+                else
+                {
+                    MsLangId::convertLanguageToLocale( (sal_Int16) nInt, aSearchOpt.Locale );
+                }
+            }
+            break;
+        }
+        default:
+            DBG_ERROR( "Unknown MemberId" );
+    }
+
+    return bRet;
+}
+
+
diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx
index 5f6b692106a3..6568dc3a99f5 100644
--- a/svl/source/items/stritem.cxx
+++ b/svl/source/items/stritem.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: stritem.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/svl/source/items/style.cxx b/svl/source/items/style.cxx
index 756a2f7edc21..b8bed49b603b 100644
--- a/svl/source/items/style.cxx
+++ b/svl/source/items/style.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: style.cxx,v $
- * $Revision: 1.19.60.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx
index 6d214b6b94dd..8a9f16052a8a 100644
--- a/svl/source/items/stylepool.cxx
+++ b/svl/source/items/stylepool.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: stylepool.cxx,v $
- * $Revision: 1.10.78.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx
index a7667a25a97c..6c5ab66b8422 100644
--- a/svl/source/items/szitem.cxx
+++ b/svl/source/items/szitem.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: szitem.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,7 +35,7 @@
 #include <tools/gen.hxx>
 
 #include <svl/poolitem.hxx>
-#include "memberid.hrc"
+#include <svl/memberid.hrc>
 
 // STATIC DATA -----------------------------------------------------------
 
diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx
index e4ff302541fe..94fdf167496e 100644
--- a/svl/source/items/visitem.cxx
+++ b/svl/source/items/visitem.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: visitem.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/svl/source/items/whassert.hxx b/svl/source/items/whassert.hxx
index fe9a834816c2..9933294b4d86 100644
--- a/svl/source/items/whassert.hxx
+++ b/svl/source/items/whassert.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: whassert.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/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx
index b5e53e0bc278..ec0e10d8e3d7 100644
--- a/svl/source/items/whiter.cxx
+++ b/svl/source/items/whiter.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: whiter.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/svl/source/memtools/makefile.mk b/svl/source/memtools/makefile.mk
index 8f59391a25ee..e19667214d13 100644
--- a/svl/source/memtools/makefile.mk
+++ b/svl/source/memtools/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx
index e2fa809c1b52..b2184442ea0e 100644
--- a/svl/source/memtools/svarray.cxx
+++ b/svl/source/memtools/svarray.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: svarray.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/svl/source/misc/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx
index a1125306eb7b..05e9e8a65897 100644
--- a/svl/source/misc/PasswordHelper.cxx
+++ b/svl/source/misc/PasswordHelper.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: PasswordHelper.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/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx
index b45650846df5..fc230856ef7d 100644
--- a/svl/source/misc/adrparse.cxx
+++ b/svl/source/misc/adrparse.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: adrparse.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/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx
index b0c4148749e7..0e04a3fd7ae0 100644
--- a/svl/source/misc/documentlockfile.cxx
+++ b/svl/source/misc/documentlockfile.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: documentlockfile.cxx,v $
- *
- * $Revision: 1.3.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx
index d50645c97439..abec6bb310fc 100644
--- a/svl/source/misc/filenotation.cxx
+++ b/svl/source/misc/filenotation.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: filenotation.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/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx
index 9ec7ead0a4be..ae50ed3cd55a 100644
--- a/svl/source/misc/folderrestriction.cxx
+++ b/svl/source/misc/folderrestriction.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: folderrestriction.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/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx
index 43619e879a91..329912f9d997 100644
--- a/svl/source/misc/fstathelper.cxx
+++ b/svl/source/misc/fstathelper.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: fstathelper.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/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx
index 290312c0efd8..28986aca1194 100644
--- a/svl/source/misc/inethist.cxx
+++ b/svl/source/misc/inethist.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: inethist.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/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx
index 47183be1d7b2..bec8b91e7c22 100644
--- a/svl/source/misc/inettype.cxx
+++ b/svl/source/misc/inettype.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: inettype.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/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx
index df7c28d22b1d..2203cc08458e 100644
--- a/svl/source/misc/lngmisc.cxx
+++ b/svl/source/misc/lngmisc.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: lngmisc.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/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx
index f13ed574a87f..aed62ce30737 100644
--- a/svl/source/misc/lockfilecommon.cxx
+++ b/svl/source/misc/lockfilecommon.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: ,v $
- *
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/misc/makefile.mk b/svl/source/misc/makefile.mk
index adc659a7b60b..a68cb396f22c 100644
--- a/svl/source/misc/makefile.mk
+++ b/svl/source/misc/makefile.mk
@@ -1,15 +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: makefile.mk,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/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src
index 63033af29d03..195b2c640d67 100644
--- a/svl/source/misc/mediatyp.src
+++ b/svl/source/misc/mediatyp.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: mediatyp.src,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/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx
index def341d57b7c..9fd767c2253f 100644
--- a/svl/source/misc/ownlist.cxx
+++ b/svl/source/misc/ownlist.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: ownlist.cxx,v $
- * $Revision: 1.6.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx
index 9eda454604b1..8c6f136f3eee 100644
--- a/svl/source/misc/restrictedpaths.cxx
+++ b/svl/source/misc/restrictedpaths.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: restrictedpaths.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/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx
index 9249fa3f33de..b7b4f24141dd 100644
--- a/svl/source/misc/sharecontrolfile.cxx
+++ b/svl/source/misc/sharecontrolfile.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: sharecontrolfile.cxx,v $
- * $Revision: 1.6.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx
index 9803f2bcc32f..9811618eb571 100644
--- a/svl/source/misc/strmadpt.cxx
+++ b/svl/source/misc/strmadpt.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: strmadpt.cxx,v $
- * $Revision: 1.5.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx
index 0ba8075069cd..35c9fca3aef2 100644
--- a/svl/source/misc/svldata.cxx
+++ b/svl/source/misc/svldata.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: svldata.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/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx
index 5473bf1c995d..a3a3f63367c1 100644
--- a/svl/source/misc/urihelper.cxx
+++ b/svl/source/misc/urihelper.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: urihelper.cxx,v $
- * $Revision: 1.22.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx
index 08562fe9fece..29983ecedc17 100644
--- a/svl/source/notify/brdcst.cxx
+++ b/svl/source/notify/brdcst.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: brdcst.cxx,v $
- * $Revision: 1.8.60.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx
index ede14e4171b2..0179ceaebc34 100644
--- a/svl/source/notify/broadcast.cxx
+++ b/svl/source/notify/broadcast.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: broadcast.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/svl/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx
index 1df3abb22776..ffa5c87a26be 100644
--- a/svl/source/notify/cancel.cxx
+++ b/svl/source/notify/cancel.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: cancel.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/svl/source/notify/hint.cxx b/svl/source/notify/hint.cxx
index 36bcfb9990d9..fd596d7663d8 100644
--- a/svl/source/notify/hint.cxx
+++ b/svl/source/notify/hint.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: hint.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/svl/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx
index 5138fb2a9ad9..23ae3f19b154 100644
--- a/svl/source/notify/isethint.cxx
+++ b/svl/source/notify/isethint.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: isethint.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/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx
index 7d9a223e1a73..0269894bff81 100644
--- a/svl/source/notify/listener.cxx
+++ b/svl/source/notify/listener.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: listener.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/svl/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx
index bb1569c128c5..ec899ee9d70b 100644
--- a/svl/source/notify/listenerbase.cxx
+++ b/svl/source/notify/listenerbase.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: listenerbase.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/svl/source/notify/listenerbase.hxx b/svl/source/notify/listenerbase.hxx
index e73f9dfc37c5..677cffe9b4bd 100644
--- a/svl/source/notify/listenerbase.hxx
+++ b/svl/source/notify/listenerbase.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: listenerbase.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/svl/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx
index 1f92eadfedbc..5dda8d0433b4 100644
--- a/svl/source/notify/listeneriter.cxx
+++ b/svl/source/notify/listeneriter.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: listeneriter.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/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx
index 4be2020967b5..3f003e6dde8f 100644
--- a/svl/source/notify/lstner.cxx
+++ b/svl/source/notify/lstner.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: lstner.cxx,v $
- * $Revision: 1.8.60.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/notify/makefile.mk b/svl/source/notify/makefile.mk
index 0d26860d02b5..bfccd06de853 100644
--- a/svl/source/notify/makefile.mk
+++ b/svl/source/notify/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx
index 454710a1b79f..98eecb91cfe2 100644
--- a/svl/source/notify/smplhint.cxx
+++ b/svl/source/notify/smplhint.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: smplhint.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/svl/source/numbers/makefile.mk b/svl/source/numbers/makefile.mk
index db4b30070ce8..87a367566a8b 100644
--- a/svl/source/numbers/makefile.mk
+++ b/svl/source/numbers/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.148.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/numbers/nbdll.cxx b/svl/source/numbers/nbdll.cxx
index 2bc5121e18fd..b93eda3e7f37 100644
--- a/svl/source/numbers/nbdll.cxx
+++ b/svl/source/numbers/nbdll.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: nbdll.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/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 23f627834955..f40b367ae2af 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.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: numfmuno.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/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx
index 4148069fb37e..09bc58a0b6ee 100644
--- a/svl/source/numbers/numfmuno.hxx
+++ b/svl/source/numbers/numfmuno.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: numfmuno.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/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx
index 99ff33433de3..adf42fe26f8f 100644
--- a/svl/source/numbers/numhead.cxx
+++ b/svl/source/numbers/numhead.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: numhead.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -139,7 +136,7 @@ ImpSvNumMultipleReadHeader::ImpSvNumMultipleReadHeader(SvStream& rNewStream) :
 
 ImpSvNumMultipleReadHeader::~ImpSvNumMultipleReadHeader()
 {
-    DBG_ASSERT( pMemStream->Tell() == pMemStream->GetSize(),
+    DBG_ASSERT( pMemStream->Tell() == pMemStream->GetEndOfData(),
                 "Sizes nicht vollstaendig gelesen" );
     delete pMemStream;
     delete [] pBuf;
diff --git a/svl/source/numbers/numhead.hxx b/svl/source/numbers/numhead.hxx
index de23b3cbccf4..7df06033e0d7 100644
--- a/svl/source/numbers/numhead.hxx
+++ b/svl/source/numbers/numhead.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: numhead.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/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index 3cc90998e2dc..a6208657406e 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.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: numuno.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/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx
index 7e4d8560dae7..90d41977e974 100644
--- a/svl/source/numbers/supservs.cxx
+++ b/svl/source/numbers/supservs.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: supservs.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/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx
index 7dbbfe27177d..45f6b3a8e285 100644
--- a/svl/source/numbers/supservs.hxx
+++ b/svl/source/numbers/supservs.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: supservs.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/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 372ae2b15abf..8c63ed903825 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.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: zforfind.cxx,v $
- * $Revision: 1.51.96.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/numbers/zforfind.hxx b/svl/source/numbers/zforfind.hxx
index 049925f2034f..42571f56dd92 100644
--- a/svl/source/numbers/zforfind.hxx
+++ b/svl/source/numbers/zforfind.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: zforfind.hxx,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/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index f03ef3f31140..05dab66754e1 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.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: zforlist.cxx,v $
- * $Revision: 1.72.60.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx
index 52d37b9cd26f..5b7821aa457e 100644
--- a/svl/source/numbers/zformat.cxx
+++ b/svl/source/numbers/zformat.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: zformat.cxx,v $
- * $Revision: 1.78.138.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 5c0d45a53ed2..5ed78bd69108 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/svl/source/numbers/zforscan.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: zforscan.cxx,v $
- * $Revision: 1.49.140.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx
index 300715dfeaa5..fb9e40488e24 100644
--- a/svl/source/numbers/zforscan.hxx
+++ b/svl/source/numbers/zforscan.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: zforscan.hxx,v $
- * $Revision: 1.24.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/passwordcontainer/makefile.mk b/svl/source/passwordcontainer/makefile.mk
index 3c74246ee3ed..92a9993fd251 100644
--- a/svl/source/passwordcontainer/makefile.mk
+++ b/svl/source/passwordcontainer/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx
index 4d629958e5bf..7db18c65db1f 100644
--- a/svl/source/passwordcontainer/passwordcontainer.cxx
+++ b/svl/source/passwordcontainer/passwordcontainer.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: passwordcontainer.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/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index faf086e369bd..fc70088bf371 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.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: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx
index 68de21049fdc..247ad31a00e5 100644
--- a/svl/source/passwordcontainer/syscreds.hxx
+++ b/svl/source/passwordcontainer/syscreds.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: $
- * $Revision: $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index dd3c9c237f9a..236f57824da2 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.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: ddecli.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/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index 8ae22a8cfb20..ba67d451be34 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.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: ddedata.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/svl/source/svdde/ddedll.cxx b/svl/source/svdde/ddedll.cxx
index b27272a2a910..a71662dd5e63 100644
--- a/svl/source/svdde/ddedll.cxx
+++ b/svl/source/svdde/ddedll.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: ddedll.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/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index dcdf5b3be33c..708b2736f9cf 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.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: ddeimp.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/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx
index b5154e1f7530..c8c015071a9b 100644
--- a/svl/source/svdde/ddeinf.cxx
+++ b/svl/source/svdde/ddeinf.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: ddeinf.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/svl/source/svdde/ddeml1.cxx b/svl/source/svdde/ddeml1.cxx
index 9d1351b17f16..dd9cc2abdaa7 100644
--- a/svl/source/svdde/ddeml1.cxx
+++ b/svl/source/svdde/ddeml1.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: ddeml1.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/svl/source/svdde/ddeml2.cxx b/svl/source/svdde/ddeml2.cxx
index e0cdee2d52d1..7de4602d12ff 100644
--- a/svl/source/svdde/ddeml2.cxx
+++ b/svl/source/svdde/ddeml2.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: ddeml2.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/svl/source/svdde/ddemldeb.cxx b/svl/source/svdde/ddemldeb.cxx
index 18da7c07fd3c..f921e93d2e9c 100644
--- a/svl/source/svdde/ddemldeb.cxx
+++ b/svl/source/svdde/ddemldeb.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: ddemldeb.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/svl/source/svdde/ddemldeb.hxx b/svl/source/svdde/ddemldeb.hxx
index 39d3d836882a..8654bbd3ca65 100644
--- a/svl/source/svdde/ddemldeb.hxx
+++ b/svl/source/svdde/ddemldeb.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: ddemldeb.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/svl/source/svdde/ddemlimp.hxx b/svl/source/svdde/ddemlimp.hxx
index 47ad53d0b9fe..28c4bf248bbe 100644
--- a/svl/source/svdde/ddemlimp.hxx
+++ b/svl/source/svdde/ddemlimp.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: ddemlimp.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/svl/source/svdde/ddemlos2.h b/svl/source/svdde/ddemlos2.h
index fe685e95fecf..bdd31e470bcd 100644
--- a/svl/source/svdde/ddemlos2.h
+++ b/svl/source/svdde/ddemlos2.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: ddemlos2.h,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/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx
index 9cd594a7920d..4f0e2464a276 100644
--- a/svl/source/svdde/ddestrg.cxx
+++ b/svl/source/svdde/ddestrg.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: ddestrg.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/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index ec718d4e56ee..c361f259d610 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.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: ddesvr.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/svl/source/svdde/ddewrap.cxx b/svl/source/svdde/ddewrap.cxx
index 650ec5b1b31f..7e75fef55898 100644
--- a/svl/source/svdde/ddewrap.cxx
+++ b/svl/source/svdde/ddewrap.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: ddewrap.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/svl/source/svdde/makefile.mk b/svl/source/svdde/makefile.mk
index 321a4b5ced03..d7f0a790486b 100644
--- a/svl/source/svdde/makefile.mk
+++ b/svl/source/svdde/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/svl/source/svsql/converter.cxx b/svl/source/svsql/converter.cxx
index 826b64adc48d..ee36914289a3 100644
--- a/svl/source/svsql/converter.cxx
+++ b/svl/source/svsql/converter.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: converter.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/svl/source/svsql/makefile.mk b/svl/source/svsql/makefile.mk
index ae3abf24db24..e837d022fb1e 100644
--- a/svl/source/svsql/makefile.mk
+++ b/svl/source/svsql/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/undo/makefile.mk b/svl/source/undo/makefile.mk
index 7c51df3f17fc..8a615d97a03b 100644
--- a/svl/source/undo/makefile.mk
+++ b/svl/source/undo/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx
index a8442098237e..fa5eca964a8c 100644
--- a/svl/source/undo/undo.cxx
+++ b/svl/source/undo/undo.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: undo.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/svl/source/uno/makefile.mk b/svl/source/uno/makefile.mk
index af26b20cd8df..3414871305d5 100644
--- a/svl/source/uno/makefile.mk
+++ b/svl/source/uno/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.21 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx
index 78c339773aec..1a3be47713a1 100644
--- a/svl/source/uno/pathservice.cxx
+++ b/svl/source/uno/pathservice.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: pathservice.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/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx
index 39be9e177fea..ab01d308c2da 100644
--- a/svl/source/uno/registerservices.cxx
+++ b/svl/source/uno/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.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/unx/inc/convert.hxx b/svl/unx/inc/convert.hxx
index e91ee4ed2791..c2184d5328f0 100644
--- a/svl/unx/inc/convert.hxx
+++ b/svl/unx/inc/convert.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: convert.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/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx
index 2aec705bc7ef..4f92c80e36f2 100644
--- a/svl/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.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: ddedummy.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/svl/unx/source/svdde/makefile.mk b/svl/unx/source/svdde/makefile.mk
index c6e89eaf2630..3d2ae4308821 100644
--- a/svl/unx/source/svdde/makefile.mk
+++ b/svl/unx/source/svdde/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/svl/util/makefile.mk b/svl/util/makefile.mk
index 47a37a6e9173..3cb87dcd33ad 100644
--- a/svl/util/makefile.mk
+++ b/svl/util/makefile.mk
@@ -1,15 +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: makefile.mk,v $
-#
-# $Revision: 1.67 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svl/util/svl.pmk b/svl/util/svl.pmk
index aec76257e743..854fb6d6d453 100644
--- a/svl/util/svl.pmk
+++ b/svl/util/svl.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: svl.pmk,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/svtools/bmpmaker/bmp.cxx b/svtools/bmpmaker/bmp.cxx
index b91dae79bbad..5b473b0289c2 100644
--- a/svtools/bmpmaker/bmp.cxx
+++ b/svtools/bmpmaker/bmp.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: bmp.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/svtools/bmpmaker/bmp.hrc b/svtools/bmpmaker/bmp.hrc
index 275f3c5a5c53..528b3e4462d9 100644
--- a/svtools/bmpmaker/bmp.hrc
+++ b/svtools/bmpmaker/bmp.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: bmp.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/svtools/bmpmaker/bmp.src b/svtools/bmpmaker/bmp.src
index 38307082345a..7431d2e335a4 100644
--- a/svtools/bmpmaker/bmp.src
+++ b/svtools/bmpmaker/bmp.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: bmp.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/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx
index 848b738b5f98..9e134c06a670 100644
--- a/svtools/bmpmaker/bmpcore.cxx
+++ b/svtools/bmpmaker/bmpcore.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: bmpcore.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/svtools/bmpmaker/bmpcore.hxx b/svtools/bmpmaker/bmpcore.hxx
index 1b0e24463f62..ece4fa09cf78 100644
--- a/svtools/bmpmaker/bmpcore.hxx
+++ b/svtools/bmpmaker/bmpcore.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: bmpcore.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/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx
index 3eee49ef695d..7c264e694a12 100644
--- a/svtools/bmpmaker/bmpsum.cxx
+++ b/svtools/bmpmaker/bmpsum.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: bmpsum.cxx,v $
- * $Revision: 1.13.150.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/bmpmaker/g2g.cxx b/svtools/bmpmaker/g2g.cxx
index 06b9ea1f5f8b..6f4ee0f86279 100644
--- a/svtools/bmpmaker/g2g.cxx
+++ b/svtools/bmpmaker/g2g.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: g2g.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/svtools/bmpmaker/makefile.mk b/svtools/bmpmaker/makefile.mk
index d5280a2ab500..a1303343a503 100644
--- a/svtools/bmpmaker/makefile.mk
+++ b/svtools/bmpmaker/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.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/DocumentInfoPreview.hxx b/svtools/inc/DocumentInfoPreview.hxx
index bbb8ab32c1a6..ae57b1a68b32 100644
--- a/svtools/inc/DocumentInfoPreview.hxx
+++ b/svtools/inc/DocumentInfoPreview.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: DocumentInfoPreview.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/svtools/inc/QueryFolderName.hxx b/svtools/inc/QueryFolderName.hxx
index eb092b5afc0b..971b4b26e13e 100644
--- a/svtools/inc/QueryFolderName.hxx
+++ b/svtools/inc/QueryFolderName.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: QueryFolderName.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/svtools/inc/acceleratorexecute.hxx b/svtools/inc/acceleratorexecute.hxx
index 744bc87f31c5..3ee79e1fca0c 100644
--- a/svtools/inc/acceleratorexecute.hxx
+++ b/svtools/inc/acceleratorexecute.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: acceleratorexecute.hxx,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/svtools/inc/addresstemplate.hxx b/svtools/inc/addresstemplate.hxx
index 0ece2d779056..f29ea2478b4e 100644
--- a/svtools/inc/addresstemplate.hxx
+++ b/svtools/inc/addresstemplate.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: addresstemplate.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/svtools/inc/apearcfg.hxx b/svtools/inc/apearcfg.hxx
index 412faab3107b..8e6018424c4c 100644
--- a/svtools/inc/apearcfg.hxx
+++ b/svtools/inc/apearcfg.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: apearcfg.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/svtools/inc/asynclink.hxx b/svtools/inc/asynclink.hxx
index 9f6b6c1117ec..41c6f3e92388 100644
--- a/svtools/inc/asynclink.hxx
+++ b/svtools/inc/asynclink.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: asynclink.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/svtools/inc/calendar.hxx b/svtools/inc/calendar.hxx
index 1c81945a669c..f85887873bb0 100644
--- a/svtools/inc/calendar.hxx
+++ b/svtools/inc/calendar.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: calendar.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/svtools/inc/cliplistener.hxx b/svtools/inc/cliplistener.hxx
index 566b5d98e4b1..ab20d6d7aa20 100644
--- a/svtools/inc/cliplistener.hxx
+++ b/svtools/inc/cliplistener.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: cliplistener.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/svtools/inc/contextmenuhelper.hxx b/svtools/inc/contextmenuhelper.hxx
index 59aa064b6b87..54d254309b1e 100644
--- a/svtools/inc/contextmenuhelper.hxx
+++ b/svtools/inc/contextmenuhelper.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: contextmenuhelper.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/svtools/inc/controldims.hrc b/svtools/inc/controldims.hrc
index 805e91e06486..5e26f132897d 100644
--- a/svtools/inc/controldims.hrc
+++ b/svtools/inc/controldims.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: controldims.hrc,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/svtools/inc/ctrlbox.hxx b/svtools/inc/ctrlbox.hxx
index a72fd6f2c25c..9e6e942daf1e 100644
--- a/svtools/inc/ctrlbox.hxx
+++ b/svtools/inc/ctrlbox.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: ctrlbox.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/svtools/inc/ctrltool.hxx b/svtools/inc/ctrltool.hxx
index 21a1fcab76d7..a0eb5db2b955 100644
--- a/svtools/inc/ctrltool.hxx
+++ b/svtools/inc/ctrltool.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: ctrltool.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/svtools/inc/dialogclosedlistener.hxx b/svtools/inc/dialogclosedlistener.hxx
index b2d0f68bf59d..3712d408af52 100644
--- a/svtools/inc/dialogclosedlistener.hxx
+++ b/svtools/inc/dialogclosedlistener.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: dialogclosedlistener.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/svtools/inc/dialogcontrolling.hxx b/svtools/inc/dialogcontrolling.hxx
index edb425f78b00..cd60736527f5 100644
--- a/svtools/inc/dialogcontrolling.hxx
+++ b/svtools/inc/dialogcontrolling.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: dialogcontrolling.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/svtools/inc/expander.hxx b/svtools/inc/expander.hxx
index 06a527195780..c0f3cfc7632a 100644
--- a/svtools/inc/expander.hxx
+++ b/svtools/inc/expander.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: expander.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/svtools/inc/extcolorcfg.hxx b/svtools/inc/extcolorcfg.hxx
index 228ef9823fd2..44167f63287c 100644
--- a/svtools/inc/extcolorcfg.hxx
+++ b/svtools/inc/extcolorcfg.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: extcolorcfg.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/svtools/inc/filectrl.hxx b/svtools/inc/filectrl.hxx
index a4ad0ad05dce..dd314bb23ca1 100644
--- a/svtools/inc/filectrl.hxx
+++ b/svtools/inc/filectrl.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: filectrl.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/svtools/inc/filedlg.hxx b/svtools/inc/filedlg.hxx
index 04cf41130bce..c04e48fc7658 100644
--- a/svtools/inc/filedlg.hxx
+++ b/svtools/inc/filedlg.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: filedlg.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/svtools/inc/filedlg2.hrc b/svtools/inc/filedlg2.hrc
index a75e9047eafb..a87bd6ebcad0 100644
--- a/svtools/inc/filedlg2.hrc
+++ b/svtools/inc/filedlg2.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: filedlg2.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/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx
index 7527436e0f38..74476541dcd8 100644
--- a/svtools/inc/fileview.hxx
+++ b/svtools/inc/fileview.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: fileview.hxx,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/svtools/inc/fltdefs.hxx b/svtools/inc/fltdefs.hxx
index d323dada3396..8ef3f2ab3740 100644
--- a/svtools/inc/fltdefs.hxx
+++ b/svtools/inc/fltdefs.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: fltdefs.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/svtools/inc/fontsubstconfig.hxx b/svtools/inc/fontsubstconfig.hxx
index 7ce7e64362b5..7bdb0dc412c3 100644
--- a/svtools/inc/fontsubstconfig.hxx
+++ b/svtools/inc/fontsubstconfig.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: fontsubstconfig.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/svtools/inc/framestatuslistener.hxx b/svtools/inc/framestatuslistener.hxx
index 63a2f296c753..fd068ac5f86b 100644
--- a/svtools/inc/framestatuslistener.hxx
+++ b/svtools/inc/framestatuslistener.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: framestatuslistener.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/svtools/inc/helpagentwindow.hxx b/svtools/inc/helpagentwindow.hxx
index b46f3a253f16..45b2917c500a 100644
--- a/svtools/inc/helpagentwindow.hxx
+++ b/svtools/inc/helpagentwindow.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: helpagentwindow.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/svtools/inc/htmlkywd.hxx b/svtools/inc/htmlkywd.hxx
index ce7cb4dd3e0f..13928eaeaa39 100644
--- a/svtools/inc/htmlkywd.hxx
+++ b/svtools/inc/htmlkywd.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: htmlkywd.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/svtools/inc/htmltokn.h b/svtools/inc/htmltokn.h
index 0719f34cd893..7c43c1463e25 100644
--- a/svtools/inc/htmltokn.h
+++ b/svtools/inc/htmltokn.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: htmltokn.h,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/svtools/inc/imagemgr.hrc b/svtools/inc/imagemgr.hrc
index a30660bba3b2..19cc2942d6f4 100644
--- a/svtools/inc/imagemgr.hrc
+++ b/svtools/inc/imagemgr.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: imagemgr.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/svtools/inc/imagemgr.hxx b/svtools/inc/imagemgr.hxx
index 67159de7450d..efd15c5f4cde 100644
--- a/svtools/inc/imagemgr.hxx
+++ b/svtools/inc/imagemgr.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: imagemgr.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/svtools/inc/imageresourceaccess.hxx b/svtools/inc/imageresourceaccess.hxx
index 5b6767c5f7c9..d77b1c97a512 100644
--- a/svtools/inc/imageresourceaccess.hxx
+++ b/svtools/inc/imageresourceaccess.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: imageresourceaccess.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/svtools/inc/imgdef.hxx b/svtools/inc/imgdef.hxx
index 2881fe5150bc..7cdcec0fd642 100644
--- a/svtools/inc/imgdef.hxx
+++ b/svtools/inc/imgdef.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: imgdef.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/svtools/inc/inetimg.hxx b/svtools/inc/inetimg.hxx
index 8068f4deda3f..924bbad831d6 100644
--- a/svtools/inc/inetimg.hxx
+++ b/svtools/inc/inetimg.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: inetimg.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/svtools/inc/itemdel.hxx b/svtools/inc/itemdel.hxx
index 1af9b6e55421..51af97730079 100644
--- a/svtools/inc/itemdel.hxx
+++ b/svtools/inc/itemdel.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: itemdel.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/svtools/inc/ivctrl.hxx b/svtools/inc/ivctrl.hxx
index 08fe6d57b652..5bea4675b62e 100644
--- a/svtools/inc/ivctrl.hxx
+++ b/svtools/inc/ivctrl.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: ivctrl.hxx,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/svtools/inc/localresaccess.hxx b/svtools/inc/localresaccess.hxx
index 4d2043d7b992..c72f68f64f03 100644
--- a/svtools/inc/localresaccess.hxx
+++ b/svtools/inc/localresaccess.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: localresaccess.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/svtools/inc/makefile.mk b/svtools/inc/makefile.mk
index a9974d75065c..cde85ffe82ca 100644
--- a/svtools/inc/makefile.mk
+++ b/svtools/inc/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/pch/precompiled_svtools.cxx b/svtools/inc/pch/precompiled_svtools.cxx
index 2346d52b68af..03fc0b4bb41d 100644
--- a/svtools/inc/pch/precompiled_svtools.cxx
+++ b/svtools/inc/pch/precompiled_svtools.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: precompiled_svtools.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/svtools/inc/pch/precompiled_svtools.hxx b/svtools/inc/pch/precompiled_svtools.hxx
index cab81cac04ec..ddedfc5a0369 100644
--- a/svtools/inc/pch/precompiled_svtools.hxx
+++ b/svtools/inc/pch/precompiled_svtools.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_svtools.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/svtools/inc/prgsbar.hxx b/svtools/inc/prgsbar.hxx
index ca569ac152f4..c02d400c6931 100644
--- a/svtools/inc/prgsbar.hxx
+++ b/svtools/inc/prgsbar.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: prgsbar.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/svtools/inc/roadmap.hxx b/svtools/inc/roadmap.hxx
index 14ed6abceed6..ff94cc966f4d 100644
--- a/svtools/inc/roadmap.hxx
+++ b/svtools/inc/roadmap.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: roadmap.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/svtools/inc/rtfkeywd.hxx b/svtools/inc/rtfkeywd.hxx
index f76399ffd824..5ccd9149bd68 100644
--- a/svtools/inc/rtfkeywd.hxx
+++ b/svtools/inc/rtfkeywd.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: rtfkeywd.hxx,v $
- * $Revision: 1.13.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/rtfout.hxx b/svtools/inc/rtfout.hxx
index ba20add1d968..12a125635132 100644
--- a/svtools/inc/rtfout.hxx
+++ b/svtools/inc/rtfout.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: rtfout.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/svtools/inc/rtftoken.h b/svtools/inc/rtftoken.h
index c7981361ffc9..e75254487312 100644
--- a/svtools/inc/rtftoken.h
+++ b/svtools/inc/rtftoken.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: rtftoken.h,v $
- * $Revision: 1.13.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/ruler.hxx b/svtools/inc/ruler.hxx
index 805394999abe..c2649b298ba6 100644
--- a/svtools/inc/ruler.hxx
+++ b/svtools/inc/ruler.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: ruler.hxx,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/svtools/inc/scriptedtext.hxx b/svtools/inc/scriptedtext.hxx
index 0bf026b11ced..5bb89969785b 100644
--- a/svtools/inc/scriptedtext.hxx
+++ b/svtools/inc/scriptedtext.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: scriptedtext.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/svtools/inc/scrwin.hxx b/svtools/inc/scrwin.hxx
index c4c06aeb96ab..1542ed667133 100644
--- a/svtools/inc/scrwin.hxx
+++ b/svtools/inc/scrwin.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: scrwin.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/svtools/inc/sfxecode.hxx b/svtools/inc/sfxecode.hxx
index d87fff819748..59611eb35844 100644
--- a/svtools/inc/sfxecode.hxx
+++ b/svtools/inc/sfxecode.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: sfxecode.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/svtools/inc/soerr.hxx b/svtools/inc/soerr.hxx
index 9d8c9797a79f..41e488480039 100644
--- a/svtools/inc/soerr.hxx
+++ b/svtools/inc/soerr.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: soerr.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/svtools/inc/sores.hxx b/svtools/inc/sores.hxx
index 158810c5b171..e5a7e51b54cf 100644
--- a/svtools/inc/sores.hxx
+++ b/svtools/inc/sores.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: sores.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/svtools/inc/statusbarcontroller.hxx b/svtools/inc/statusbarcontroller.hxx
index a5f4fc1c974c..7856d96bcd77 100644
--- a/svtools/inc/statusbarcontroller.hxx
+++ b/svtools/inc/statusbarcontroller.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: statusbarcontroller.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/svtools/inc/stdmenu.hxx b/svtools/inc/stdmenu.hxx
index fb7d69476d92..1b7e9816a103 100644
--- a/svtools/inc/stdmenu.hxx
+++ b/svtools/inc/stdmenu.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: stdmenu.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/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx b/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx
index a640607d9923..fdca9a80af13 100644
--- a/svtools/inc/svtools/AccessibleBrowseBoxObjType.hxx
+++ b/svtools/inc/svtools/AccessibleBrowseBoxObjType.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: AccessibleBrowseBoxObjType.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/svtools/inc/svtools/FilterConfigItem.hxx b/svtools/inc/svtools/FilterConfigItem.hxx
index a2e80284b55d..bdae8dabb1c3 100644
--- a/svtools/inc/svtools/FilterConfigItem.hxx
+++ b/svtools/inc/svtools/FilterConfigItem.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: FilterConfigItem.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/svtools/inc/svtools/accessibilityoptions.hxx b/svtools/inc/svtools/accessibilityoptions.hxx
index bde908fb1851..784f570825fb 100644
--- a/svtools/inc/svtools/accessibilityoptions.hxx
+++ b/svtools/inc/svtools/accessibilityoptions.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: accessibilityoptions.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/svtools/inc/svtools/accessiblefactory.hxx b/svtools/inc/svtools/accessiblefactory.hxx
index f4d8a03ef872..b435d3da96a7 100644
--- a/svtools/inc/svtools/accessiblefactory.hxx
+++ b/svtools/inc/svtools/accessiblefactory.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: accessiblefactory.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/svtools/inc/svtools/accessibletable.hxx b/svtools/inc/svtools/accessibletable.hxx
index 0e3f08bfc568..b08a7f04f1da 100755..100644
--- a/svtools/inc/svtools/accessibletable.hxx
+++ b/svtools/inc/svtools/accessibletable.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: accessibletable.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/svtools/inc/svtools/accessibletableprovider.hxx b/svtools/inc/svtools/accessibletableprovider.hxx
index f77f34aeb463..fd29c72f35be 100644
--- a/svtools/inc/svtools/accessibletableprovider.hxx
+++ b/svtools/inc/svtools/accessibletableprovider.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: accessibletableprovider.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/svtools/inc/svtools/brwbox.hxx b/svtools/inc/svtools/brwbox.hxx
index 8296c9f994f6..9adeaf7efd05 100644
--- a/svtools/inc/svtools/brwbox.hxx
+++ b/svtools/inc/svtools/brwbox.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: brwbox.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/svtools/inc/svtools/brwhead.hxx b/svtools/inc/svtools/brwhead.hxx
index 8ab088c6c3c8..3ed431a09efe 100644
--- a/svtools/inc/svtools/brwhead.hxx
+++ b/svtools/inc/svtools/brwhead.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: brwhead.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/svtools/inc/svtools/chartprettypainter.hxx b/svtools/inc/svtools/chartprettypainter.hxx
index d29a846762ab..200951d5c5e8 100644
--- a/svtools/inc/svtools/chartprettypainter.hxx
+++ b/svtools/inc/svtools/chartprettypainter.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: chartprettypainter.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/svtools/inc/svtools/colctrl.hxx b/svtools/inc/svtools/colctrl.hxx
index 4a4d053b0403..d76f8e881269 100644
--- a/svtools/inc/svtools/colctrl.hxx
+++ b/svtools/inc/svtools/colctrl.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: colctrl.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/svtools/inc/svtools/colorcfg.hxx b/svtools/inc/svtools/colorcfg.hxx
index dd3ba4018280..ac78afe59034 100644
--- a/svtools/inc/svtools/colorcfg.hxx
+++ b/svtools/inc/svtools/colorcfg.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: colorcfg.hxx,v $
- * $Revision: 1.5.108.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/svtools/colrdlg.hxx b/svtools/inc/svtools/colrdlg.hxx
index f1cf8fd4c92d..00ec9647aa7a 100644
--- a/svtools/inc/svtools/colrdlg.hxx
+++ b/svtools/inc/svtools/colrdlg.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: colrdlg.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/svtools/inc/svtools/editbrowsebox.hxx b/svtools/inc/svtools/editbrowsebox.hxx
index 60fcbc9efb1a..f97449e1880c 100644
--- a/svtools/inc/svtools/editbrowsebox.hxx
+++ b/svtools/inc/svtools/editbrowsebox.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: editbrowsebox.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/svtools/inc/svtools/editimplementation.hxx b/svtools/inc/svtools/editimplementation.hxx
index 49fcc92f0b06..987d94c7bcee 100644
--- a/svtools/inc/svtools/editimplementation.hxx
+++ b/svtools/inc/svtools/editimplementation.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: editimplementation.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/svtools/inc/svtools/editsyntaxhighlighter.hxx b/svtools/inc/svtools/editsyntaxhighlighter.hxx
index 1af993a3ea8f..01add0c4ce1d 100644
--- a/svtools/inc/svtools/editsyntaxhighlighter.hxx
+++ b/svtools/inc/svtools/editsyntaxhighlighter.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: svmedit.hxx,v $
- * $Revision: 1.3.108.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/svtools/ehdl.hxx b/svtools/inc/svtools/ehdl.hxx
index f0e6852b39ad..967c41636ea3 100644
--- a/svtools/inc/svtools/ehdl.hxx
+++ b/svtools/inc/svtools/ehdl.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: ehdl.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/svtools/inc/svtools/embedhlp.hxx b/svtools/inc/svtools/embedhlp.hxx
index 68763a3fd487..098b565385ec 100644
--- a/svtools/inc/svtools/embedhlp.hxx
+++ b/svtools/inc/svtools/embedhlp.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/svtools/inc/svtools/embedtransfer.hxx b/svtools/inc/svtools/embedtransfer.hxx
index 6f2f58aef0e9..6b3896ceb1aa 100644
--- a/svtools/inc/svtools/embedtransfer.hxx
+++ b/svtools/inc/svtools/embedtransfer.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: embedtransfer.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/svtools/inc/svtools/extensionlistbox.hxx b/svtools/inc/svtools/extensionlistbox.hxx
index 8734f62ab225..532d3822c555 100644
--- a/svtools/inc/svtools/extensionlistbox.hxx
+++ b/svtools/inc/svtools/extensionlistbox.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: extensionlistbox.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/svtools/inc/svtools/fileurlbox.hxx b/svtools/inc/svtools/fileurlbox.hxx
index eb2b49353004..6d2f6e2b9041 100644
--- a/svtools/inc/svtools/fileurlbox.hxx
+++ b/svtools/inc/svtools/fileurlbox.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: fileurlbox.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/svtools/inc/svtools/filter.hxx b/svtools/inc/svtools/filter.hxx
index 942323ac00e1..770e81b00551 100644
--- a/svtools/inc/svtools/filter.hxx
+++ b/svtools/inc/svtools/filter.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: filter.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -52,6 +49,7 @@ struct ImplDirEntryHelper
 };
 
 class Window;
+class Graphic;
 
 #define OPT_FILTERSECTION           "Graphic"
 
@@ -409,6 +407,10 @@ public:
 
     const Link      GetFilterCallback() const;
     static          GraphicFilter* GetGraphicFilter();
+    static int      LoadGraphic( const String& rPath, const String& rFilter,
+                     Graphic& rGraphic,
+                     GraphicFilter* pFilter = NULL,
+                     USHORT* pDeterminedFormat = NULL );
 };
 
 // ------------------------------------
diff --git a/svtools/inc/svtools/fixedhyper.hxx b/svtools/inc/svtools/fixedhyper.hxx
index 895d883eac7b..290b53c7d841 100644
--- a/svtools/inc/svtools/fixedhyper.hxx
+++ b/svtools/inc/svtools/fixedhyper.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: fixedhyper.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/svtools/inc/svtools/fltcall.hxx b/svtools/inc/svtools/fltcall.hxx
index 8715c0efb50f..d0bf054d724e 100644
--- a/svtools/inc/svtools/fltcall.hxx
+++ b/svtools/inc/svtools/fltcall.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: fltcall.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/svtools/inc/svtools/fmtfield.hxx b/svtools/inc/svtools/fmtfield.hxx
index 27e9376ea1c7..9226f78b77fc 100644
--- a/svtools/inc/svtools/fmtfield.hxx
+++ b/svtools/inc/svtools/fmtfield.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: fmtfield.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/svtools/inc/svtools/generictoolboxcontroller.hxx b/svtools/inc/svtools/generictoolboxcontroller.hxx
index 2fbeabc7e204..0e9dc73a6882 100644
--- a/svtools/inc/svtools/generictoolboxcontroller.hxx
+++ b/svtools/inc/svtools/generictoolboxcontroller.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: generictoolboxcontroller.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/svtools/inc/svtools/genericunodialog.hxx b/svtools/inc/svtools/genericunodialog.hxx
index bf27a44bf55c..c5fbe5b840e4 100644
--- a/svtools/inc/svtools/genericunodialog.hxx
+++ b/svtools/inc/svtools/genericunodialog.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: genericunodialog.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/goodies/inc/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 1ef351ae6d32..06f75394c8bb 100644
--- a/goodies/inc/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.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: grfmgr.hxx,v $
- * $Revision: 1.23 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,6 +29,7 @@
 #define _GRFMGR_HXX
 
 #include <vcl/graph.hxx>
+#include <svtools/svtdllapi.h>
 
 // -----------
 // - Defines -
@@ -94,7 +92,7 @@ struct ImplTileInfo;
 // - GraphicAttr -
 // ---------------
 
-class GraphicAttr
+class SVT_DLLPUBLIC GraphicAttr
 {
 private:
 
@@ -192,7 +190,7 @@ public:
 // - GraphicObject -
 // -----------------
 
-class GraphicObject : public SvDataCopyStream
+class SVT_DLLPUBLIC GraphicObject : public SvDataCopyStream
 {
     friend class GraphicManager;
 
@@ -224,16 +222,14 @@ private:
     BOOL                    mbAlpha         : 1;
     BOOL                    mbDummyFlag8    : 1;
 
-//#if 0 // _SOLAR__PRIVATE
-
-    void                    ImplConstruct();
-    void                    ImplAssignGraphicData();
-    void                    ImplSetGraphicManager( const GraphicManager* pMgr,
+    void                    SVT_DLLPRIVATE ImplConstruct();
+    void                    SVT_DLLPRIVATE ImplAssignGraphicData();
+    void                    SVT_DLLPRIVATE ImplSetGraphicManager( const GraphicManager* pMgr,
                                                    const ByteString* pID = NULL,
                                                    const GraphicObject* pCopyObj = NULL );
-    void                    ImplAutoSwapIn();
-    BOOL                    ImplIsAutoSwapped() const { return mbAutoSwapped; }
-    BOOL                    ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr,
+    void                    SVT_DLLPRIVATE ImplAutoSwapIn();
+    BOOL                    SVT_DLLPRIVATE ImplIsAutoSwapped() const { return mbAutoSwapped; }
+    BOOL                    SVT_DLLPRIVATE ImplGetCropParams( OutputDevice* pOut, Point& rPt, Size& rSz, const GraphicAttr* pAttr,
                                                PolyPolygon& rClipPolyPoly, BOOL& bRectClipRegion ) const;
 
     /** Render a given number of tiles in an optimized way
@@ -277,27 +273,27 @@ private:
 
         @return true, if everything was successfully rendered.
     */
-    bool                    ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
+    bool                    SVT_DLLPRIVATE ImplRenderTempTile( VirtualDevice& rVDev, int nExponent,
                                                 int nNumTilesX, int nNumTilesY,
                                                 const Size& rTileSizePixel,
                                                 const GraphicAttr* pAttr, ULONG nFlags );
 
     /// internally called by ImplRenderTempTile()
-    bool                    ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent, int nMSBFactor,
+    bool                    SVT_DLLPRIVATE ImplRenderTileRecursive( VirtualDevice& rVDev, int nExponent, int nMSBFactor,
                                                      int nNumOrigTilesX, int nNumOrigTilesY,
                                                      int nRemainderTilesX, int nRemainderTilesY,
                                                      const Size& rTileSizePixel, const GraphicAttr* pAttr,
                                                      ULONG nFlags, ImplTileInfo& rTileInfo );
 
-    bool                    ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel,
+    bool                    SVT_DLLPRIVATE ImplDrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSizePixel,
                                            const Size& rOffset, const GraphicAttr* pAttr, ULONG nFlags, int nTileCacheSize1D );
 
-    bool                    ImplDrawTiled( OutputDevice& rOut, const Point& rPos,
+    bool                    SVT_DLLPRIVATE ImplDrawTiled( OutputDevice& rOut, const Point& rPos,
                                            int nNumTilesX, int nNumTilesY,
                                            const Size& rTileSize,
                                            const GraphicAttr* pAttr, ULONG nFlags );
 
-    void                    ImplTransformBitmap( BitmapEx&          rBmpEx,
+    void                    SVT_DLLPRIVATE ImplTransformBitmap( BitmapEx&           rBmpEx,
                                                  const GraphicAttr& rAttr,
                                                  const Size&        rCropLeftTop,
                                                  const Size&        rCropRightBottom,
@@ -307,8 +303,6 @@ private:
 
                             DECL_LINK( ImplAutoSwapOutHdl, void* );
 
-//#endif // _SOLAR__PRIVATE
-
 protected:
 
     virtual void            GraphicManagerDestroyed();
@@ -473,13 +467,15 @@ public:
 
     friend SvStream&        operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj );
     friend SvStream&        operator>>( SvStream& rIStm, GraphicObject& rGraphicObj );
+
+    static GraphicObject CreateGraphicObjectFromURL( const ::rtl::OUString &rURL );
 };
 
 // ------------------
 // - GraphicManager -
 // ------------------
 
-class GraphicManager
+class SVT_DLLPUBLIC GraphicManager
 {
     friend class GraphicObject;
     friend class GraphicDisplayCacheEntry;
@@ -492,54 +488,50 @@ private:
                     GraphicManager( const GraphicManager& ) {}
     GraphicManager& operator=( const GraphicManager& ) { return *this; }
 
-//#if 0 // _SOLAR__PRIVATE
-
-    BOOL            ImplDraw( OutputDevice* pOut, const Point& rPt,
+    BOOL            SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt,
                               const Size& rSz, GraphicObject& rObj,
                               const GraphicAttr& rAttr,
                               const ULONG nFlags, BOOL& rCached );
 
-    BOOL            ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    BOOL            SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                                       const BitmapEx& rBmpEx, const GraphicAttr& rAttr,
                                       const ULONG nFlags, BitmapEx* pBmpEx = NULL );
-    BOOL            ImplCreateOutput( OutputDevice* pOut,
+    BOOL            SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut,
                                       const Point& rPt, const Size& rSz,
                                       const GDIMetaFile& rMtf, const GraphicAttr& rAttr,
                                       const ULONG nFlags, GDIMetaFile& rOutMtf, BitmapEx& rOutBmpEx );
 
-    BOOL            ImplCreateScaled( const BitmapEx& rBmpEx,
+    BOOL            SVT_DLLPRIVATE ImplCreateScaled( const BitmapEx& rBmpEx,
                                       long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY,
                                       long nStartX, long nEndX, long nStartY, long nEndY,
                                       BitmapEx& rOutBmpEx );
 
-    BOOL            ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
+    BOOL            SVT_DLLPRIVATE ImplCreateRotatedScaled( const BitmapEx& rBmpEx,
                                              USHORT nRot10, const Size& rOutSzPix, const Size& rUntSzPix,
                                              long* pMapIX, long* pMapFX, long* pMapIY, long* pMapFY,
                                              long nStartX, long nEndX, long nStartY, long nEndY,
                                              BitmapEx& rOutBmpEx );
 
-    static void     ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
-    static void     ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
-    static void     ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
+    static void     SVT_DLLPRIVATE ImplAdjust( BitmapEx& rBmpEx, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
+    static void     SVT_DLLPRIVATE ImplAdjust( GDIMetaFile& rMtf, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
+    static void     SVT_DLLPRIVATE ImplAdjust( Animation& rAnimation, const GraphicAttr& rAttr, ULONG nAdjustmentFlags );
 
-    static void     ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
+    static void     SVT_DLLPRIVATE ImplDraw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
                               const GDIMetaFile& rMtf, const GraphicAttr& rAttr );
 
                     // Only used by GraphicObject's Ctor's and Dtor's
-    void            ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute,
+    void            SVT_DLLPRIVATE ImplRegisterObj( const GraphicObject& rObj, Graphic& rSubstitute,
                                      const ByteString* pID = NULL,
                                      const GraphicObject* pCopyObj = NULL );
-    void            ImplUnregisterObj( const GraphicObject& rObj );
-    inline BOOL     ImplHasObjects() const { return( maObjList.Count() > 0UL ); }
+    void            SVT_DLLPRIVATE ImplUnregisterObj( const GraphicObject& rObj );
+    inline BOOL     SVT_DLLPRIVATE ImplHasObjects() const { return( maObjList.Count() > 0UL ); }
 
                     // Only used in swap case by GraphicObject
-    void            ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj );
-    BOOL            ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute );
-    void            ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj );
-
-    ByteString      ImplGetUniqueID( const GraphicObject& rObj ) const;
+    void            SVT_DLLPRIVATE ImplGraphicObjectWasSwappedOut( const GraphicObject& rObj );
+    BOOL            SVT_DLLPRIVATE ImplFillSwappedGraphicObject( const GraphicObject& rObj, Graphic& rSubstitute );
+    void            SVT_DLLPRIVATE ImplGraphicObjectWasSwappedIn( const GraphicObject& rObj );
 
-//#endif // _SOLAR__PRIVATE
+    ByteString      SVT_DLLPRIVATE ImplGetUniqueID( const GraphicObject& rObj ) const;
 
 public:
 
diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx
index f34ad6b1043d..1ef7687cfb1d 100644
--- a/svtools/inc/svtools/headbar.hxx
+++ b/svtools/inc/svtools/headbar.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: headbar.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/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc
index 937898f37af1..1ffb7a99fb32 100644
--- a/svtools/inc/svtools/helpid.hrc
+++ b/svtools/inc/svtools/helpid.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: helpid.hrc,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/svtools/inc/svtools/helpopt.hxx b/svtools/inc/svtools/helpopt.hxx
index 7a9a06b8bc5f..974c6c85fa38 100644
--- a/svtools/inc/svtools/helpopt.hxx
+++ b/svtools/inc/svtools/helpopt.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: helpopt.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/svtools/inc/svtools/htmlcfg.hxx b/svtools/inc/svtools/htmlcfg.hxx
new file mode 100644
index 000000000000..c27df0a9a67f
--- /dev/null
+++ b/svtools/inc/svtools/htmlcfg.hxx
@@ -0,0 +1,107 @@
+/*************************************************************************
+ *
+ * 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_HTMLCFG_HXX
+#define _SVX_HTMLCFG_HXX
+
+// -----------------------------------------------------------------------
+
+#include <tools/solar.h>
+#include <unotools/configitem.hxx>
+#include <svtools/svtdllapi.h>
+
+#define HTML_FONT_COUNT 7
+
+// !!!be aware!!!: the following defines are _not_ used as values in the configuration file
+//                  this is because of compatibility reasons
+#define HTML_CFG_HTML32     0   // Html 3.2
+#define HTML_CFG_MSIE_40    1   // Internet Explorer 4.0
+#define HTML_CFG_MSIE       HTML_CFG_MSIE_40
+#define HTML_CFG_WRITER     2   // Writer
+#define HTML_CFG_NS40       3   // Netscape 4.0
+#define HTML_CFG_MSIE_40_OLD 4   // Internet Explorer 4.0 - alter Wert
+
+#define HTML_CFG_MAX HTML_CFG_NS40
+
+class Link;
+struct HtmlOptions_Impl;
+// -----------------------------------------------------------------------
+
+class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem
+{
+    HtmlOptions_Impl*pImp;
+    const com::sun::star::uno::Sequence<rtl::OUString>& GetPropertyNames();
+    void Load( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
+    void CallListeners();
+
+public:
+                    SvxHtmlOptions();
+                    ~SvxHtmlOptions();
+
+    virtual void    Commit();
+    virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
+
+    USHORT      GetFontSize(USHORT nPos) const;
+    void        SetFontSize(USHORT nPos, USHORT nSize);
+
+    BOOL        IsImportUnknown() const;
+    void        SetImportUnknown(BOOL bSet);
+
+    USHORT      GetExportMode() const;
+    void        SetExportMode(USHORT nSet);
+
+    BOOL        IsStarBasic() const;
+    void        SetStarBasic(BOOL bSet);
+
+    BOOL        IsStarBasicWarning() const;
+    void        SetStarBasicWarning(BOOL bSet);
+
+    BOOL        IsSaveGraphicsLocal() const;
+    void        SetSaveGraphicsLocal(BOOL bSet);
+
+    BOOL        IsPrintLayoutExtension() const;
+    void        SetPrintLayoutExtension(BOOL bSet);
+
+    BOOL        IsIgnoreFontFamily() const;
+    void        SetIgnoreFontFamily(BOOL bSet);
+
+    sal_Bool    IsDefaultTextEncoding() const;
+    rtl_TextEncoding GetTextEncoding() const;
+    void        SetTextEncoding( rtl_TextEncoding );
+    static SvxHtmlOptions* Get();
+
+    BOOL        IsNumbersEnglishUS() const;
+    void        SetNumbersEnglishUS(BOOL bSet);
+
+    void AddListenerLink( const Link& rLink );
+    void RemoveListenerLink( const Link& rLink );
+};
+
+#endif
+
+
+
+
diff --git a/svtools/inc/svtools/htmlout.hxx b/svtools/inc/svtools/htmlout.hxx
index 13df12b64ea9..888286b231ee 100644
--- a/svtools/inc/svtools/htmlout.hxx
+++ b/svtools/inc/svtools/htmlout.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: htmlout.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/svtools/inc/svtools/hyperlabel.hxx b/svtools/inc/svtools/hyperlabel.hxx
index 939b1799c0de..926b11c5537c 100644
--- a/svtools/inc/svtools/hyperlabel.hxx
+++ b/svtools/inc/svtools/hyperlabel.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: hyperlabel.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/svtools/inc/svtools/imap.hxx b/svtools/inc/svtools/imap.hxx
index 61cde3cf00c1..52212e365c87 100644
--- a/svtools/inc/svtools/imap.hxx
+++ b/svtools/inc/svtools/imap.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: imap.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/svtools/inc/svtools/imapcirc.hxx b/svtools/inc/svtools/imapcirc.hxx
index e4cfcf214e0e..e3ea5349d376 100644
--- a/svtools/inc/svtools/imapcirc.hxx
+++ b/svtools/inc/svtools/imapcirc.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: imapcirc.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/svtools/inc/svtools/imapobj.hxx b/svtools/inc/svtools/imapobj.hxx
index b8da0e5c3ee8..c557727124cc 100644
--- a/svtools/inc/svtools/imapobj.hxx
+++ b/svtools/inc/svtools/imapobj.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: imapobj.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -96,7 +93,7 @@ public:
 
     static rtl_TextEncoding nActualTextEncoding;
 
-                        IMapObject() {};
+                        IMapObject();
                         IMapObject( const String& rURL,
                                     const String& rAltText,
                                     const String& rDesc,
diff --git a/svtools/inc/svtools/imappoly.hxx b/svtools/inc/svtools/imappoly.hxx
index f97013e083b3..00d22cbe2de0 100644
--- a/svtools/inc/svtools/imappoly.hxx
+++ b/svtools/inc/svtools/imappoly.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: imappoly.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/svtools/inc/svtools/imaprect.hxx b/svtools/inc/svtools/imaprect.hxx
index 8f1222441298..8eacaaaf3531 100644
--- a/svtools/inc/svtools/imaprect.hxx
+++ b/svtools/inc/svtools/imaprect.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: imaprect.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/svtools/inc/svtools/inettbc.hxx b/svtools/inc/svtools/inettbc.hxx
index 338e3adb5a1a..9394f1ba5ccd 100644
--- a/svtools/inc/svtools/inettbc.hxx
+++ b/svtools/inc/svtools/inettbc.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: inettbc.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/svtools/inc/svtools/insdlg.hxx b/svtools/inc/svtools/insdlg.hxx
index 9721d55761f0..afbbc2509011 100644
--- a/svtools/inc/svtools/insdlg.hxx
+++ b/svtools/inc/svtools/insdlg.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: insdlg.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/svtools/inc/svtools/javacontext.hxx b/svtools/inc/svtools/javacontext.hxx
index 3e9cb2049daf..54ef70975ae0 100644
--- a/svtools/inc/svtools/javacontext.hxx
+++ b/svtools/inc/svtools/javacontext.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: javacontext.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/svtools/inc/svtools/javainteractionhandler.hxx b/svtools/inc/svtools/javainteractionhandler.hxx
index dd57bafbbce8..87ed9da0fc3d 100644
--- a/svtools/inc/svtools/javainteractionhandler.hxx
+++ b/svtools/inc/svtools/javainteractionhandler.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: javainteractionhandler.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/svtools/inc/svtools/langtab.hxx b/svtools/inc/svtools/langtab.hxx
index 3a70525bb450..e5600413091b 100644
--- a/svtools/inc/svtools/langtab.hxx
+++ b/svtools/inc/svtools/langtab.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: langtab.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,8 +29,8 @@
 
 
 #include <tools/resary.hxx>
-
-#include "svtdllapi.h"
+#include <i18npool/lang.h>
+#include <svtools/svtdllapi.h>
 
 //========================================================================
 //  class SvtLanguageTable
@@ -50,6 +47,7 @@ public:
 
     sal_uInt32      GetEntryCount() const;
     LanguageType    GetTypeAtIndex( sal_uInt32 nIndex ) const;
+    static String   GetLanguageString( const LanguageType eType );
 };
 
 // Add LRE or RLE embedding characters to the string based on the
diff --git a/svtools/inc/svtools/logindlg.hxx b/svtools/inc/svtools/logindlg.hxx
index b10c80207520..9cf12dd70610 100644
--- a/svtools/inc/svtools/logindlg.hxx
+++ b/svtools/inc/svtools/logindlg.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: logindlg.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/svtools/inc/svtools/menuoptions.hxx b/svtools/inc/svtools/menuoptions.hxx
index 2bc5588519c2..6de173f40c3a 100644
--- a/svtools/inc/svtools/menuoptions.hxx
+++ b/svtools/inc/svtools/menuoptions.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: menuoptions.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/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index 556dd7f0cc7e..ecd2574c1943 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.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: miscopt.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/svtools/inc/svtools/optionsdrawinglayer.hxx b/svtools/inc/svtools/optionsdrawinglayer.hxx
index 18ce9c65e897..bd3114b4e871 100644
--- a/svtools/inc/svtools/optionsdrawinglayer.hxx
+++ b/svtools/inc/svtools/optionsdrawinglayer.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: optionsdrawinglayer.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/svtools/inc/svtools/parhtml.hxx b/svtools/inc/svtools/parhtml.hxx
index e1eb53c6e052..a302b40d9d4b 100644
--- a/svtools/inc/svtools/parhtml.hxx
+++ b/svtools/inc/svtools/parhtml.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: parhtml.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -272,6 +269,8 @@ public:
     static void RemoveSGMLComment( String &rString, BOOL bFull );
 
     static BOOL InternalImgToPrivateURL( String& rURL );
+    static rtl_TextEncoding GetEncodingByHttpHeader( SvKeyValueIterator *pHTTPHeader );
+    BOOL SetEncodingByHTTPHeader( SvKeyValueIterator *pHTTPHeader );
 };
 
 inline void HTMLParser::StartPRE( BOOL bRestart )
diff --git a/svtools/inc/svtools/parrtf.hxx b/svtools/inc/svtools/parrtf.hxx
index 1882b127ae90..179f5a28259a 100644
--- a/svtools/inc/svtools/parrtf.hxx
+++ b/svtools/inc/svtools/parrtf.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: parrtf.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/svtools/inc/svtools/printdlg.hxx b/svtools/inc/svtools/printdlg.hxx
index 579d1a69fb6e..8c455b910b41 100644
--- a/svtools/inc/svtools/printdlg.hxx
+++ b/svtools/inc/svtools/printdlg.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: printdlg.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/svtools/inc/svtools/printoptions.hxx b/svtools/inc/svtools/printoptions.hxx
index 15147b21b62e..5d95eb27949f 100644
--- a/svtools/inc/svtools/printoptions.hxx
+++ b/svtools/inc/svtools/printoptions.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: printoptions.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/svtools/inc/svtools/prnsetup.hxx b/svtools/inc/svtools/prnsetup.hxx
index b0f810a28834..8e1ced9ed1a0 100644
--- a/svtools/inc/svtools/prnsetup.hxx
+++ b/svtools/inc/svtools/prnsetup.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: prnsetup.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/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx
index 30d3b999ae17..49a0f441c49c 100644
--- a/svtools/inc/svtools/roadmapwizard.hxx
+++ b/svtools/inc/svtools/roadmapwizard.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: roadmapwizard.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/svtools/inc/svtools/stdctrl.hxx b/svtools/inc/svtools/stdctrl.hxx
index cf7afe129092..4c0b794f78e3 100644
--- a/svtools/inc/svtools/stdctrl.hxx
+++ b/svtools/inc/svtools/stdctrl.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: stdctrl.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/svtools/inc/svtools/stringtransfer.hxx b/svtools/inc/svtools/stringtransfer.hxx
index 8c5498924eed..9cfe75418a12 100644
--- a/svtools/inc/svtools/stringtransfer.hxx
+++ b/svtools/inc/svtools/stringtransfer.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: stringtransfer.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/svtools/inc/svtools/svicnvw.hxx b/svtools/inc/svtools/svicnvw.hxx
index e5c9be095a27..ac15f0b55be6 100644
--- a/svtools/inc/svtools/svicnvw.hxx
+++ b/svtools/inc/svtools/svicnvw.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: svicnvw.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/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index 9d8d486596b6..c28b8d5db10c 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.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: svlbitm.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/svtools/inc/svtools/svlbox.hxx b/svtools/inc/svtools/svlbox.hxx
index a7f385941fc6..f33784f45397 100644
--- a/svtools/inc/svtools/svlbox.hxx
+++ b/svtools/inc/svtools/svlbox.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: svlbox.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/svtools/inc/svtools/svmedit.hxx b/svtools/inc/svtools/svmedit.hxx
index ccf77299965c..3bdfdc44e8e9 100644
--- a/svtools/inc/svtools/svmedit.hxx
+++ b/svtools/inc/svtools/svmedit.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: svmedit.hxx,v $
- * $Revision: 1.3.108.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/svtools/svmedit2.hxx b/svtools/inc/svtools/svmedit2.hxx
index 64e8c5fed241..e09592cfc172 100644
--- a/svtools/inc/svtools/svmedit2.hxx
+++ b/svtools/inc/svtools/svmedit2.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: svmedit2.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/svtools/inc/svtools/svparser.hxx b/svtools/inc/svtools/svparser.hxx
index 96c1aadc6319..bd24298011e2 100644
--- a/svtools/inc/svtools/svparser.hxx
+++ b/svtools/inc/svtools/svparser.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: svparser.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/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index 8018b8650dc5..8b8092260e33 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.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: svtabbx.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/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx
index b1cc8136ef68..9faadaff7305 100644
--- a/svtools/inc/svtools/svtdata.hxx
+++ b/svtools/inc/svtools/svtdata.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: svtdata.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/svtools/inc/svtools/svtdllapi.h b/svtools/inc/svtools/svtdllapi.h
index 1a689f066a7d..d230d7e76d0c 100644
--- a/svtools/inc/svtools/svtdllapi.h
+++ b/svtools/inc/svtools/svtdllapi.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: svtdllapi.h,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/svtools/inc/svtools/svtreebx.hxx b/svtools/inc/svtools/svtreebx.hxx
index fb683db9a405..a600b91db1c4 100644
--- a/svtools/inc/svtools/svtreebx.hxx
+++ b/svtools/inc/svtools/svtreebx.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: svtreebx.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/svtools/inc/svtools/svxbox.hxx b/svtools/inc/svtools/svxbox.hxx
new file mode 100644
index 000000000000..25deba4d091c
--- /dev/null
+++ b/svtools/inc/svtools/svxbox.hxx
@@ -0,0 +1,193 @@
+/*************************************************************************
+ *
+ * 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_BOX_HXX
+#define _SVX_BOX_HXX
+
+// include ---------------------------------------------------------------
+
+#include <svl/svarray.hxx>
+#include <tools/string.hxx>
+#include <vcl/lstbox.hxx>
+#include <vcl/combobox.hxx>
+#include <svtools/svtdllapi.h>
+
+// forward ---------------------------------------------------------------
+
+class SvxBoxEntry;
+class SvxListBase;
+
+SV_DECL_PTRARR( SvxEntryLst, SvxBoxEntry*, 10, 10 )
+
+// class SvxBoxEntry -----------------------------------------------------
+
+class SVT_DLLPUBLIC SvxBoxEntry
+{
+    friend class SvxListBox;
+    friend class SvxComboBox;
+
+public:
+    SvxBoxEntry( const String& aName, USHORT nId=0 );
+    SvxBoxEntry( const SvxBoxEntry& rOrg );
+    SvxBoxEntry();
+
+    String              aName;
+    USHORT              nId;
+
+private:
+    BOOL                bModified;
+    BOOL                bNew;
+};
+
+// class SvxListBox ------------------------------------------------------
+
+class SVT_DLLPUBLIC SvxListBox : public ListBox
+{
+    using ListBox::InsertEntry;
+    using ListBox::RemoveEntry;
+    using ListBox::GetEntryPos;
+    using ListBox::IsEntrySelected;
+    using ListBox::SelectEntry;
+
+public:
+    SvxListBox( Window* pParent, WinBits nBits = WB_BORDER );
+    SvxListBox( Window* pParent, const ResId& rId );
+    ~SvxListBox();
+
+    void                InsertNewEntry( const SvxBoxEntry& rEntry );
+    void                InsertEntry( const SvxBoxEntry& rEntry,
+                                     USHORT nId = LISTBOX_ENTRY_NOTFOUND );
+
+    void                RemoveEntry( USHORT nPos );
+    void                RemoveEntry( const SvxBoxEntry& rEntry );
+
+    void                Clear();
+
+    USHORT              GetEntryPos( const SvxBoxEntry& rEntry ) const;
+    const SvxBoxEntry&  GetSvxBoxEntry( USHORT nIdx ) const;
+
+    inline BOOL         IsEntrySelected( const SvxBoxEntry& rEntry ) const;
+    const SvxBoxEntry&  GetSelectSvxBoxEntry( USHORT nIdx = 0 ) const;
+    inline void         SelectEntry( const SvxBoxEntry& rEntry,
+                                     BOOL bSelect = TRUE );
+
+    void                ModifyEntry( USHORT nPos, const String& aName );
+    USHORT              GetModifiedCount() const;
+    const SvxBoxEntry&  GetModifiedEntry( USHORT nPos ) const;
+
+    USHORT              GetRemovedCount() const;
+    const SvxBoxEntry&  GetRemovedEntry( USHORT nPos ) const;
+
+    USHORT              GetNewCount() const;
+    const SvxBoxEntry&  GetNewEntry( USHORT nPos ) const;
+
+private:
+    SvxEntryLst         aEntryLst;
+    SvxEntryLst         aDelEntryLst;
+    SvxBoxEntry         aDefault;
+
+    void                InitListBox();
+    void                InsertSorted( SvxBoxEntry* pEntry );
+};
+
+// inlines ---------------------------------------------------------------
+
+inline BOOL SvxListBox::IsEntrySelected( const SvxBoxEntry& aEntry ) const
+    { return ListBox::IsEntrySelected( aEntry.aName ); }
+
+inline void SvxListBox::SelectEntry( const SvxBoxEntry& aEntry, BOOL bSelect )
+    { ListBox::SelectEntry( aEntry.aName, bSelect ); }
+
+// enum SvxComboBoxStyle -------------------------------------------------
+
+enum SvxComboBoxStyle
+{
+    SVX_CBS_UPPER       = 0x01,
+    SVX_CBS_LOWER       = 0x02,
+    SVX_CBS_ALL         = 0x04,
+    SVX_CBS_FILENAME    = 0x08,
+#ifdef WIN
+    SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME | SVX_CBS_LOWER
+#else
+    SVX_CBS_SW_FILENAME = SVX_CBS_FILENAME
+#endif
+};
+
+// class SvxComboBox -----------------------------------------------------
+
+class SVT_DLLPUBLIC SvxComboBox : public ComboBox
+{
+    using ComboBox::InsertEntry;
+    using ComboBox::RemoveEntry;
+    using ComboBox::GetEntryPos;
+    using Window::SetStyle;
+
+public:
+    SvxComboBox( Window* pParent,
+                 WinBits nBits = WB_BORDER, USHORT nStyleBits = SVX_CBS_ALL );
+    SvxComboBox( Window* pParent, const ResId& rId, USHORT nStyleBits = SVX_CBS_ALL );
+    ~SvxComboBox();
+
+    void                InsertNewEntry( const SvxBoxEntry& );
+    void                InsertEntry( const SvxBoxEntry& );
+
+    void                RemoveEntry( USHORT nPos );
+    void                RemoveEntry( const SvxBoxEntry& rEntry );
+
+    void                Clear();
+
+    USHORT              GetEntryPos( const SvxBoxEntry& rEntry ) const;
+    const SvxBoxEntry&  GetEntry( USHORT nIdx ) const;
+
+    void                ModifyEntry( USHORT nPos, const String& aName );
+    USHORT              GetModifiedCount() const;
+    const SvxBoxEntry&  GetModifiedEntry( USHORT nPos ) const;
+
+    USHORT              GetRemovedCount() const;
+    const SvxBoxEntry&  GetRemovedEntry( USHORT nPos ) const;
+
+    USHORT              GetNewCount() const;
+    const SvxBoxEntry&  GetNewEntry( USHORT nPos ) const;
+
+    USHORT              GetStyle() const             { return nStyle; }
+    void                SetStyle( const USHORT nSt ) { nStyle = nSt; }
+
+    String              GetText() const;
+
+private:
+    SvxEntryLst         aEntryLst;
+    SvxEntryLst         aDelEntryLst;
+    SvxBoxEntry         aDefault;
+    USHORT              nStyle;
+
+    virtual void        KeyInput( const KeyEvent& rKEvt );
+
+    void                InitComboBox();
+    void                InsertSorted( SvxBoxEntry* pEntry );
+};
+
+#endif
+
diff --git a/svtools/inc/svtools/syntaxhighlight.hxx b/svtools/inc/svtools/syntaxhighlight.hxx
index c9680821affc..8cf7126fa24c 100644
--- a/svtools/inc/svtools/syntaxhighlight.hxx
+++ b/svtools/inc/svtools/syntaxhighlight.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: syntaxhighlight.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/svtools/inc/svtools/table/abstracttablecontrol.hxx b/svtools/inc/svtools/table/abstracttablecontrol.hxx
index 03bc0a999f7a..8e92abc6c04c 100644
--- a/svtools/inc/svtools/table/abstracttablecontrol.hxx
+++ b/svtools/inc/svtools/table/abstracttablecontrol.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_INC_TABLE_ABSTRACTTABLECONTROL_HXX
diff --git a/svtools/inc/svtools/table/defaultinputhandler.hxx b/svtools/inc/svtools/table/defaultinputhandler.hxx
index eb1c14b43a85..b9e2db31ca01 100644
--- a/svtools/inc/svtools/table/defaultinputhandler.hxx
+++ b/svtools/inc/svtools/table/defaultinputhandler.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_INC_TABLE_DEFAULTINPUTHANDLER_HXX
diff --git a/svtools/inc/svtools/table/gridtablerenderer.hxx b/svtools/inc/svtools/table/gridtablerenderer.hxx
index a935f6b7386e..13d44617d523 100644
--- a/svtools/inc/svtools/table/gridtablerenderer.hxx
+++ b/svtools/inc/svtools/table/gridtablerenderer.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_INC_TABLE_GRIDTABLERENDERER_HXX
diff --git a/svtools/inc/svtools/table/tablecontrol.hxx b/svtools/inc/svtools/table/tablecontrol.hxx
index e3edd0b681ae..c1381e3b3c0b 100644
--- a/svtools/inc/svtools/table/tablecontrol.hxx
+++ b/svtools/inc/svtools/table/tablecontrol.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_INC_TABLE_TABLECONTROL_HXX
diff --git a/svtools/inc/svtools/table/tabledatawindow.hxx b/svtools/inc/svtools/table/tabledatawindow.hxx
index fddbfdcd4a3c..d14a25289c99 100644
--- a/svtools/inc/svtools/table/tabledatawindow.hxx
+++ b/svtools/inc/svtools/table/tabledatawindow.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_SOURCE_TABLE_TABLEDATAWINDOW_HXX
diff --git a/svtools/inc/svtools/table/tableinputhandler.hxx b/svtools/inc/svtools/table/tableinputhandler.hxx
index c0d3a2b5c18a..6d6af9f641bb 100644
--- a/svtools/inc/svtools/table/tableinputhandler.hxx
+++ b/svtools/inc/svtools/table/tableinputhandler.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_INC_TABLE_TABLEINPUTHANDLER_HXX
diff --git a/svtools/inc/svtools/table/tablemodel.hxx b/svtools/inc/svtools/table/tablemodel.hxx
index 6e74d35b8586..34a89cb03e6b 100644
--- a/svtools/inc/svtools/table/tablemodel.hxx
+++ b/svtools/inc/svtools/table/tablemodel.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_INC_TABLE_TABLEMODEL_HXX
diff --git a/svtools/inc/svtools/table/tablerenderer.hxx b/svtools/inc/svtools/table/tablerenderer.hxx
index eb645ad574c4..cf8cd20680c2 100644
--- a/svtools/inc/svtools/table/tablerenderer.hxx
+++ b/svtools/inc/svtools/table/tablerenderer.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_INC_TABLE_TABLERENDERER_HXX
diff --git a/svtools/inc/svtools/table/tabletypes.hxx b/svtools/inc/svtools/table/tabletypes.hxx
index 167e49cfd521..f423b64c2faa 100644
--- a/svtools/inc/svtools/table/tabletypes.hxx
+++ b/svtools/inc/svtools/table/tabletypes.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_INC_TABLE_TABLETYPES_HXX
diff --git a/svtools/inc/svtools/textdata.hxx b/svtools/inc/svtools/textdata.hxx
index bd119b63c095..809d64248eb6 100644
--- a/svtools/inc/svtools/textdata.hxx
+++ b/svtools/inc/svtools/textdata.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: textdata.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/svtools/inc/svtools/texteng.hxx b/svtools/inc/svtools/texteng.hxx
index e1d64aa42ecd..ef27edee2efe 100644
--- a/svtools/inc/svtools/texteng.hxx
+++ b/svtools/inc/svtools/texteng.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: texteng.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/svtools/inc/svtools/textview.hxx b/svtools/inc/svtools/textview.hxx
index b7bdd2a606db..c17084a1d693 100644
--- a/svtools/inc/svtools/textview.hxx
+++ b/svtools/inc/svtools/textview.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: textview.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/svtools/inc/svtools/textwindowpeer.hxx b/svtools/inc/svtools/textwindowpeer.hxx
index 86e60daceaa0..b80eb7ea89f0 100644
--- a/svtools/inc/svtools/textwindowpeer.hxx
+++ b/svtools/inc/svtools/textwindowpeer.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: textwindowpeer.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/svtools/inc/svtools/toolboxcontroller.hxx b/svtools/inc/svtools/toolboxcontroller.hxx
index 740c6999f909..27ed315a3c04 100644
--- a/svtools/inc/svtools/toolboxcontroller.hxx
+++ b/svtools/inc/svtools/toolboxcontroller.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: toolboxcontroller.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/svtools/inc/svtools/transfer.hxx b/svtools/inc/svtools/transfer.hxx
index c3e9ea21dca9..5eac1484fff9 100644
--- a/svtools/inc/svtools/transfer.hxx
+++ b/svtools/inc/svtools/transfer.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: transfer.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/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index f1cfb7289bbd..3ba013d90830 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.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: treelist.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/svtools/inc/svtools/ttprops.hxx b/svtools/inc/svtools/ttprops.hxx
index 9430c9758066..15f080b9aa3d 100644
--- a/svtools/inc/svtools/ttprops.hxx
+++ b/svtools/inc/svtools/ttprops.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: ttprops.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/svtools/inc/svtools/unitconv.hxx b/svtools/inc/svtools/unitconv.hxx
new file mode 100644
index 000000000000..becc41543396
--- /dev/null
+++ b/svtools/inc/svtools/unitconv.hxx
@@ -0,0 +1,113 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dlgutil.hxx,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.
+ *
+ ************************************************************************/
+#ifndef _SVT_UNITCONV_HXX
+#define _SVT_UNITCONV_HXX
+
+// include ---------------------------------------------------------------
+#include <vcl/field.hxx>
+#include "svtools/svtdllapi.h"
+#include <svl/poolitem.hxx>
+
+// macro -----------------------------------------------------------------
+
+// typedef ---------------------------------------------------------------
+
+typedef long (*FUNC_CONVERT)(long);
+
+// Functions -------------------------------------------------------------
+
+SVT_DLLPUBLIC void      SetFieldUnit( MetricField& rCtrl, FieldUnit eUnit, BOOL bAll = FALSE );
+SVT_DLLPUBLIC void      SetFieldUnit( MetricBox& rCtrl, FieldUnit eUnit, BOOL bAll = FALSE );
+
+SVT_DLLPUBLIC long      CalcToUnit( float nIn, SfxMapUnit eUnit );
+SVT_DLLPUBLIC long      CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor );
+
+SVT_DLLPUBLIC long      ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl );
+SVT_DLLPUBLIC long      ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem );
+
+SVT_DLLPUBLIC FieldUnit MapToFieldUnit( const SfxMapUnit eUnit );
+SVT_DLLPUBLIC MapUnit   FieldToMapUnit( const SfxFieldUnit eUnit );
+
+SVT_DLLPUBLIC long      ConvertValueToMap( long nVal, SfxMapUnit eUnit );
+SVT_DLLPUBLIC long      ConvertValueToUnit( long nVal, SfxMapUnit eUnit );
+
+SVT_DLLPUBLIC void      SetMetricValue( MetricField& rField, long lCoreValue, SfxMapUnit eUnit );
+SVT_DLLPUBLIC long      GetCoreValue( const MetricField& rField, SfxMapUnit eUnit );
+
+SVT_DLLPUBLIC long  PointToTwips( long nIn );
+
+#if 0
+// to Twips
+SVT_DLLPUBLIC long  CMToTwips( long nIn );
+SVT_DLLPUBLIC long  MMToTwips( long nIn );
+SVT_DLLPUBLIC long  InchToTwips( long nIn );
+SVT_DLLPUBLIC long  PicaToTwips( long nIn );
+
+// to CM
+SVT_DLLPUBLIC long  TwipsToCM( long nIn );
+SVT_DLLPUBLIC long  InchToCM( long nIn );
+SVT_DLLPUBLIC long  MMToCM( long nIn );
+SVT_DLLPUBLIC long  PointToCM( long nIn );
+SVT_DLLPUBLIC long  PicaToCM( long nIn );
+
+// to MM
+SVT_DLLPUBLIC long  TwipsToMM( long nIn );
+SVT_DLLPUBLIC long  CMToMM( long nIn );
+SVT_DLLPUBLIC long  InchToMM( long nIn );
+SVT_DLLPUBLIC long  PointToMM( long nIn );
+SVT_DLLPUBLIC long  PicaToMM( long nIn );
+
+// to Inch
+SVT_DLLPUBLIC long  TwipsToInch(long nIn );
+SVT_DLLPUBLIC long  CMToInch(long nIn );
+SVT_DLLPUBLIC long  MMToInch(long nIn );
+SVT_DLLPUBLIC long  PointToInch(long nIn );
+SVT_DLLPUBLIC long  PicaToInch(long nIn );
+
+// to Point
+SVT_DLLPUBLIC long  TwipsToPoint(long nIn );
+SVT_DLLPUBLIC long  InchToPoint(long nIn );
+SVT_DLLPUBLIC long  CMToPoint(long nIn );
+SVT_DLLPUBLIC long  MMToPoint(long nIn );
+SVT_DLLPUBLIC long  PicaToPoint(long nIn );
+
+// To Pica
+long    TwipsToPica(long nIn );
+long    InchToPica(long nIn );
+long    PointToPica(long nIn );
+long    CMToPica(long nIn );
+long    MMToPica(long nIn );
+
+#endif
+
+SVT_DLLPUBLIC long  TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew );
+
+#endif
+
diff --git a/svtools/inc/svtools/urlcontrol.hxx b/svtools/inc/svtools/urlcontrol.hxx
index 36adb1b858c2..ce73573d5e71 100644
--- a/svtools/inc/svtools/urlcontrol.hxx
+++ b/svtools/inc/svtools/urlcontrol.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: urlcontrol.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/svtools/inc/svtools/valueset.hxx b/svtools/inc/svtools/valueset.hxx
index fc12f9517b6d..9d72751c5e20 100644
--- a/svtools/inc/svtools/valueset.hxx
+++ b/svtools/inc/svtools/valueset.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: valueset.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/svtools/inc/svtools/wizardmachine.hxx b/svtools/inc/svtools/wizardmachine.hxx
index 0e46215a978e..f45087f78705 100644
--- a/svtools/inc/svtools/wizardmachine.hxx
+++ b/svtools/inc/svtools/wizardmachine.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: wizardmachine.hxx,v $
- * $Revision: 1.4.10.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/svtools/wizdlg.hxx b/svtools/inc/svtools/wizdlg.hxx
index 8116efc4d2f5..5bd2db5672ed 100644
--- a/svtools/inc/svtools/wizdlg.hxx
+++ b/svtools/inc/svtools/wizdlg.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: wizdlg.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/svtools/inc/svtools/wmf.hxx b/svtools/inc/svtools/wmf.hxx
index 681b3b1ddcb5..a41b6180747b 100644
--- a/svtools/inc/svtools/wmf.hxx
+++ b/svtools/inc/svtools/wmf.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: wmf.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/svtools/inc/svtools/xtextedt.hxx b/svtools/inc/svtools/xtextedt.hxx
index d1cfe94be064..46c6441e005e 100644
--- a/svtools/inc/svtools/xtextedt.hxx
+++ b/svtools/inc/svtools/xtextedt.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: xtextedt.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/svtools/inc/sychconv.hxx b/svtools/inc/sychconv.hxx
index 2e570dfe2550..4056556a2100 100644
--- a/svtools/inc/sychconv.hxx
+++ b/svtools/inc/sychconv.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: sychconv.hxx,v $
- * $Revision: 1.3.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx
index 5261697dd8b0..cf89d4426726 100644
--- a/svtools/inc/tabbar.hxx
+++ b/svtools/inc/tabbar.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: tabbar.hxx,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/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx
index af373749248c..46853fa07c03 100644
--- a/svtools/inc/taskbar.hxx
+++ b/svtools/inc/taskbar.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: taskbar.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/svtools/inc/templatefoldercache.hxx b/svtools/inc/templatefoldercache.hxx
index 8a6b6d9c1a3a..25d5080bd748 100644
--- a/svtools/inc/templatefoldercache.hxx
+++ b/svtools/inc/templatefoldercache.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: templatefoldercache.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/svtools/inc/templdlg.hxx b/svtools/inc/templdlg.hxx
index 4b2d644d6f6b..f08f7cc8770d 100644
--- a/svtools/inc/templdlg.hxx
+++ b/svtools/inc/templdlg.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: templdlg.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/svtools/inc/testtool.hxx b/svtools/inc/testtool.hxx
index 5d4ec5c6208e..ea00fe33cdbf 100644
--- a/svtools/inc/testtool.hxx
+++ b/svtools/inc/testtool.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: testtool.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/svtools/inc/tooltiplbox.hxx b/svtools/inc/tooltiplbox.hxx
index a72a2042a9cc..e50d516f5aa1 100644
--- a/svtools/inc/tooltiplbox.hxx
+++ b/svtools/inc/tooltiplbox.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: tooltiplbox.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/svtools/inc/txtattr.hxx b/svtools/inc/txtattr.hxx
index 4d4432f782bb..29723a38129b 100644
--- a/svtools/inc/txtattr.hxx
+++ b/svtools/inc/txtattr.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: txtattr.hxx,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/svtools/inc/txtcmp.hxx b/svtools/inc/txtcmp.hxx
index e40e578401cb..7b30b76e69a7 100644
--- a/svtools/inc/txtcmp.hxx
+++ b/svtools/inc/txtcmp.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: txtcmp.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/svtools/inc/unoevent.hxx b/svtools/inc/unoevent.hxx
index e8507722e31b..5d5378bf909b 100644
--- a/svtools/inc/unoevent.hxx
+++ b/svtools/inc/unoevent.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: unoevent.hxx,v $
- * $Revision: 1.5.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/inc/unoimap.hxx b/svtools/inc/unoimap.hxx
index f3a5aae50844..9ed2afe8dc6c 100644
--- a/svtools/inc/unoimap.hxx
+++ b/svtools/inc/unoimap.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: unoimap.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/svtools/inc/wallitem.hxx b/svtools/inc/wallitem.hxx
index 7f3e04ce2a8c..533d5ae3f6d3 100644
--- a/svtools/inc/wallitem.hxx
+++ b/svtools/inc/wallitem.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: wallitem.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/svtools/prj/build.lst b/svtools/prj/build.lst
index 5a67b9414181..4b2cd9f9b26b 100644
--- a/svtools/prj/build.lst
+++ b/svtools/prj/build.lst
@@ -14,6 +14,7 @@ st	svtools\source\filter.vcl\igif		nmake	-	all	st_vigif st_inc NULL
 st	svtools\source\filter.vcl\jpeg		nmake	-	all	st_vjpeg st_inc NULL
 st	svtools\source\filter.vcl\ixbm		nmake	-	all	st_vixbm st_inc NULL
 st	svtools\source\filter.vcl\ixpm		nmake	-	all	st_vixpm st_inc NULL
+st	svtools\source\graphic				nmake	-	all	st_svtgraphic  st_inc NULL
 st	svtools\source\java					nmake	-	all	st_svtjava  st_inc NULL
 st	svtools\source\misc					nmake	-	all	st__misc st_bmp st_inc NULL
 st	svtools\source\plugapp				nmake	-	all	st_papp st_inc NULL
@@ -22,7 +23,7 @@ st	svtools\source\svrtf				nmake	-	all	st_rtf st_inc NULL
 st	svtools\source\table               	nmake	-	all	st_table st_inc NULL
 st	svtools\source\uno					nmake	-	all	st_uno st_inc NULL
 st	svtools\source\urlobj				nmake	-	all	st__url st_inc NULL
-st  svtools\util                        nmake   -   all st_util st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url  st_html st_papp st_rtf st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL
+st  svtools\util                        nmake   -   all st_util st_svtgraphic st__brw st__ctr st_conf st_ctl st_dial st_edit st__misc st__url  st_html st_papp st_rtf st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_svtjava NULL
 st	svtools\source\hatchwindow			nmake	-	all	st_hatchwin st_inc NULL
 st	svtools\source\productregistration	nmake	-	all	st_prodreg st_util st_inc NULL
 st  svtools\workben\unodialog           nmake   -   all st_workben_udlg st_util NULL
diff --git a/svtools/qa/unoapi/makefile.mk b/svtools/qa/unoapi/makefile.mk
index de69c4acec1e..2d75735d4b0d 100644
--- a/svtools/qa/unoapi/makefile.mk
+++ b/svtools/qa/unoapi/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index 4ebed0d70f3f..9a4903b1e093 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.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: brwbox1.cxx,v $
- * $Revision: 1.47 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/brwbox/brwbox2.cxx b/svtools/source/brwbox/brwbox2.cxx
index daf8d080dac2..da07415dfee8 100644
--- a/svtools/source/brwbox/brwbox2.cxx
+++ b/svtools/source/brwbox/brwbox2.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: brwbox2.cxx,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/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx
index cc1816551237..449d5642e034 100644
--- a/svtools/source/brwbox/brwbox3.cxx
+++ b/svtools/source/brwbox/brwbox3.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: brwbox3.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/svtools/source/brwbox/brwhead.cxx b/svtools/source/brwbox/brwhead.cxx
index 46eca0758e06..39845b84f7e0 100644
--- a/svtools/source/brwbox/brwhead.cxx
+++ b/svtools/source/brwbox/brwhead.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: brwhead.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/svtools/source/brwbox/brwimpl.hxx b/svtools/source/brwbox/brwimpl.hxx
index 7eed15d165b4..3c9ddb2876f7 100644
--- a/svtools/source/brwbox/brwimpl.hxx
+++ b/svtools/source/brwbox/brwimpl.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: brwimpl.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/svtools/source/brwbox/datwin.cxx b/svtools/source/brwbox/datwin.cxx
index 633989ba0140..cb43e4989355 100644
--- a/svtools/source/brwbox/datwin.cxx
+++ b/svtools/source/brwbox/datwin.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: datwin.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/svtools/source/brwbox/datwin.hxx b/svtools/source/brwbox/datwin.hxx
index b01c39832a32..e068f669e46e 100644
--- a/svtools/source/brwbox/datwin.hxx
+++ b/svtools/source/brwbox/datwin.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: datwin.hxx,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/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index da8068a314a0..edf56f0b9b34 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.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: ebbcontrols.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/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 09d1f5c869b9..817ab743140a 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.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: editbrowsebox.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/svtools/source/brwbox/editbrowsebox.hrc b/svtools/source/brwbox/editbrowsebox.hrc
index 438d240e6e4e..5902365b1b05 100644
--- a/svtools/source/brwbox/editbrowsebox.hrc
+++ b/svtools/source/brwbox/editbrowsebox.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: editbrowsebox.hrc,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/svtools/source/brwbox/editbrowsebox.src b/svtools/source/brwbox/editbrowsebox.src
index c04e1294c0af..8c00c673c32b 100644
--- a/svtools/source/brwbox/editbrowsebox.src
+++ b/svtools/source/brwbox/editbrowsebox.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: editbrowsebox.src,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/svtools/source/brwbox/editbrowsebox2.cxx b/svtools/source/brwbox/editbrowsebox2.cxx
index c0658bc2b7dd..ed62b2cb1520 100644
--- a/svtools/source/brwbox/editbrowsebox2.cxx
+++ b/svtools/source/brwbox/editbrowsebox2.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: editbrowsebox2.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/svtools/source/brwbox/editbrowseboximpl.hxx b/svtools/source/brwbox/editbrowseboximpl.hxx
index 8b4390bc6a7a..724da694b9c1 100644
--- a/svtools/source/brwbox/editbrowseboximpl.hxx
+++ b/svtools/source/brwbox/editbrowseboximpl.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: editbrowseboximpl.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/svtools/source/brwbox/makefile.mk b/svtools/source/brwbox/makefile.mk
index 4f539b4cb45b..e195e0ef4859 100644
--- a/svtools/source/brwbox/makefile.mk
+++ b/svtools/source/brwbox/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.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/config/accessibilityoptions.cxx b/svtools/source/config/accessibilityoptions.cxx
index 4077231c5c84..b2d2c54232b0 100644
--- a/svtools/source/config/accessibilityoptions.cxx
+++ b/svtools/source/config/accessibilityoptions.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: accessibilityoptions.cxx,v $
- * $Revision: 1.15.74.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 0d4865ee563e..316e6ab34656 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.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: apearcfg.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/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx
index 9008d7a27ee1..7a151d609e6e 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.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: colorcfg.cxx,v $
- * $Revision: 1.20.82.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx
index 89bf41ac9f58..993025b22884 100644
--- a/svtools/source/config/extcolorcfg.cxx
+++ b/svtools/source/config/extcolorcfg.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: extcolorcfg.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/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index dc9bfa64e6d4..7bcbc1e4be82 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.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: fontsubstconfig.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/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx
index 16982a695e11..091bf50c4787 100644
--- a/svtools/source/config/helpopt.cxx
+++ b/svtools/source/config/helpopt.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: helpopt.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/svtools/source/config/htmlcfg.cxx b/svtools/source/config/htmlcfg.cxx
new file mode 100644
index 000000000000..b8a9660ee8dc
--- /dev/null
+++ b/svtools/source/config/htmlcfg.cxx
@@ -0,0 +1,523 @@
+/*************************************************************************
+ *
+ * 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_svtools.hxx"
+
+#include <svtools/htmlcfg.hxx>
+#include <svtools/parhtml.hxx>
+#include <unotools/syslocale.hxx>
+#include <tools/debug.hxx>
+#include <tools/list.hxx>
+#include <tools/link.hxx>
+
+// -----------------------------------------------------------------------
+#define HTMLCFG_UNKNOWN_TAGS            0x01
+//#define HTMLCFG_STYLE_SHEETS          0x02
+//#define HTMLCFG_NETSCAPE3             0x04
+#define HTMLCFG_STAR_BASIC              0x08
+#define HTMLCFG_LOCAL_GRF               0x10
+#define HTMLCFG_PRINT_LAYOUT_EXTENSION  0x20
+#define HTMLCFG_IGNORE_FONT_FAMILY      0x40
+#define HTMLCFG_IS_BASIC_WARNING        0x80
+#define HTMLCFG_NUMBERS_ENGLISH_US      0x100
+
+using namespace utl;
+using namespace rtl;
+using namespace com::sun::star::uno;
+
+static SvxHtmlOptions* pOptions = 0;
+
+DECLARE_LIST( LinkList, Link * )
+
+#define C2U(cChar) OUString::createFromAscii(cChar)
+/* -----------------------------23.11.00 11:39--------------------------------
+
+ ---------------------------------------------------------------------------*/
+struct HtmlOptions_Impl
+{
+    LinkList    aList;
+    sal_Int32   nFlags;
+    sal_Int32   nExportMode;
+    sal_Int32   aFontSizeArr[HTML_FONT_COUNT];
+    sal_Int32   eEncoding;
+    sal_Bool    bIsEncodingDefault;
+
+    HtmlOptions_Impl() :
+        nFlags(HTMLCFG_LOCAL_GRF|HTMLCFG_IS_BASIC_WARNING),
+        nExportMode(HTML_CFG_NS40),
+        eEncoding( gsl_getSystemTextEncoding() ),
+        bIsEncodingDefault(sal_True)
+    {
+        aFontSizeArr[0] = HTMLFONTSZ1_DFLT;
+        aFontSizeArr[1] = HTMLFONTSZ2_DFLT;
+        aFontSizeArr[2] = HTMLFONTSZ3_DFLT;
+        aFontSizeArr[3] = HTMLFONTSZ4_DFLT;
+        aFontSizeArr[4] = HTMLFONTSZ5_DFLT;
+        aFontSizeArr[5] = HTMLFONTSZ6_DFLT;
+        aFontSizeArr[6] = HTMLFONTSZ7_DFLT;
+    }
+};
+
+/* -----------------------------23.11.00 11:39--------------------------------
+
+ ---------------------------------------------------------------------------*/
+const Sequence<OUString>& SvxHtmlOptions::GetPropertyNames()
+{
+    static Sequence<OUString> aNames;
+    if(!aNames.getLength())
+    {
+        static const char* aPropNames[] =
+        {
+            "Import/UnknownTag",                    //  0
+            "Import/FontSetting",                   //  1
+            "Import/FontSize/Size_1",               //  2
+            "Import/FontSize/Size_2",               //  3
+            "Import/FontSize/Size_3",               //  4
+            "Import/FontSize/Size_4",               //  5
+            "Import/FontSize/Size_5",               //  6
+            "Import/FontSize/Size_6",               //  7
+            "Import/FontSize/Size_7",               //  8
+            "Export/Browser",                       //  9
+            "Export/Basic",                         //  0
+            "Export/PrintLayout",                   // 11
+            "Export/LocalGraphic",                  // 12
+            "Export/Warning",                       // 13
+            "Export/Encoding",                      // 14
+            "Import/NumbersEnglishUS"               // 15
+        };
+        const int nCount = sizeof(aPropNames) / sizeof(aPropNames[0]);
+        aNames.realloc(nCount);
+        OUString* pNames = aNames.getArray();
+        for(int i = 0; i < nCount; i++)
+            pNames[i] = C2U(aPropNames[i]);
+    }
+    return aNames;
+}
+// -----------------------------------------------------------------------
+SvxHtmlOptions::SvxHtmlOptions() :
+    ConfigItem(C2U("Office.Common/Filter/HTML"))
+{
+    pImp = new HtmlOptions_Impl;
+    Load( GetPropertyNames() );
+}
+
+// -----------------------------------------------------------------------
+SvxHtmlOptions::~SvxHtmlOptions()
+{
+    delete pImp;
+}
+
+void SvxHtmlOptions::Load( const Sequence< OUString >& aNames )
+{
+    Sequence<Any> aValues = GetProperties(aNames);
+    const Any* pValues = aValues.getConstArray();
+    DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed");
+    if(aValues.getLength() == aNames.getLength())
+    {
+        pImp->nFlags = 0;
+        for(int nProp = 0; nProp < aNames.getLength(); nProp++)
+        {
+            if(pValues[nProp].hasValue())
+            {
+                switch(nProp)
+                {
+                    case  0:
+                        if(*(sal_Bool*)pValues[nProp].getValue())
+                            pImp->nFlags |= HTMLCFG_UNKNOWN_TAGS;
+                    break;//"Import/UnknownTag",
+                    case  1:
+                        if(*(sal_Bool*)pValues[nProp].getValue())
+                            pImp->nFlags |= HTMLCFG_IGNORE_FONT_FAMILY;
+                    break;//"Import/FontSetting",
+                    case  2: pValues[nProp] >>= pImp->aFontSizeArr[0]; break;//"Import/FontSize/Size_1",
+                    case  3: pValues[nProp] >>= pImp->aFontSizeArr[1]; break;//"Import/FontSize/Size_2",
+                    case  4: pValues[nProp] >>= pImp->aFontSizeArr[2]; break;//"Import/FontSize/Size_3",
+                    case  5: pValues[nProp] >>= pImp->aFontSizeArr[3]; break;//"Import/FontSize/Size_4",
+                    case  6: pValues[nProp] >>= pImp->aFontSizeArr[4]; break;//"Import/FontSize/Size_5",
+                    case  7: pValues[nProp] >>= pImp->aFontSizeArr[5]; break;//"Import/FontSize/Size_6",
+                    case  8: pValues[nProp] >>= pImp->aFontSizeArr[6]; break;//"Import/FontSize/Size_7",
+                    case  9://"Export/Browser",
+                        {
+                            sal_Int32 nExpMode = 0;
+//                          pValues[nProp] >>= pImp->nExportMode;
+                            pValues[nProp] >>= nExpMode;
+                            switch( nExpMode )
+                            {
+                                case 0:     nExpMode = HTML_CFG_HTML32;     break;
+                                case 1:     nExpMode = HTML_CFG_MSIE_40;    break;
+//                              case 2:     nExpMode = HTML_CFG_NS30;       break;  depricated
+                                case 3:     nExpMode = HTML_CFG_WRITER;     break;
+                                case 4:     nExpMode = HTML_CFG_NS40;       break;
+                                case 5:     nExpMode = HTML_CFG_MSIE_40_OLD;break;
+                                default:    nExpMode = HTML_CFG_NS40;       break;
+                            }
+
+                            pImp->nExportMode = nExpMode;
+                        }
+                        break;
+                    case 10:
+                        if(*(sal_Bool*)pValues[nProp].getValue())
+                            pImp->nFlags |= HTMLCFG_STAR_BASIC;
+                    break;//"Export/Basic",
+                    case 11:
+                        if(*(sal_Bool*)pValues[nProp].getValue())
+                            pImp->nFlags |= HTMLCFG_PRINT_LAYOUT_EXTENSION;
+                    break;//"Export/PrintLayout",
+                    case 12:
+                        if(*(sal_Bool*)pValues[nProp].getValue())
+                            pImp->nFlags |= HTMLCFG_LOCAL_GRF;
+                    break;//"Export/LocalGraphic",
+                    case 13:
+                        if(*(sal_Bool*)pValues[nProp].getValue())
+                            pImp->nFlags |= HTMLCFG_IS_BASIC_WARNING;
+                    break;//"Export/Warning"
+
+                    case 14: pValues[nProp] >>= pImp->eEncoding;
+                             pImp->bIsEncodingDefault = sal_False;
+                    break;//"Export/Encoding"
+
+                    case 15:
+                        if(*(sal_Bool*)pValues[nProp].getValue())
+                            pImp->nFlags |= HTMLCFG_NUMBERS_ENGLISH_US;
+                    break;//"Import/NumbersEnglishUS"
+                }
+            }
+        }
+    }
+}
+
+// -----------------------------------------------------------------------
+void    SvxHtmlOptions::Commit()
+{
+    const Sequence<OUString>& aNames = GetPropertyNames();
+
+//  const OUString* pNames = aNames.getConstArray();
+    Sequence<Any> aValues(aNames.getLength());
+    Any* pValues = aValues.getArray();
+
+//  const Type& rType = ::getBooleanCppuType();
+    for(int nProp = 0; nProp < aNames.getLength(); nProp++)
+    {
+        sal_Bool bSet = sal_False;
+        switch(nProp)
+        {
+            case  0: bSet = 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS);break;//"Import/UnknownTag",
+            case  1: bSet = 0 != (pImp->nFlags & HTMLCFG_IGNORE_FONT_FAMILY);break;//"Import/FontSetting",
+            case  2: pValues[nProp] <<= pImp->aFontSizeArr[0];break;//"Import/FontSize/Size_1",
+            case  3: pValues[nProp] <<= pImp->aFontSizeArr[1];break;//"Import/FontSize/Size_2",
+            case  4: pValues[nProp] <<= pImp->aFontSizeArr[2];break;//"Import/FontSize/Size_3",
+            case  5: pValues[nProp] <<= pImp->aFontSizeArr[3];break;//"Import/FontSize/Size_4",
+            case  6: pValues[nProp] <<= pImp->aFontSizeArr[4];break;//"Import/FontSize/Size_5",
+            case  7: pValues[nProp] <<= pImp->aFontSizeArr[5];break;//"Import/FontSize/Size_6",
+            case  8: pValues[nProp] <<= pImp->aFontSizeArr[6];break;//"Import/FontSize/Size_7",
+            case  9:                //"Export/Browser",
+                {
+                    sal_Int32 nExpMode = pImp->nExportMode;
+
+                    switch( nExpMode )
+                    {
+                        case HTML_CFG_HTML32:       nExpMode = 0;   break;
+                        case HTML_CFG_MSIE_40:      nExpMode = 1;   break;
+//                      case HTML_CFG_NS30:         nExpMode = 2;   break;  depricated
+                        case HTML_CFG_WRITER:       nExpMode = 3;   break;
+                        case HTML_CFG_NS40:         nExpMode = 4;   break;
+                        case HTML_CFG_MSIE_40_OLD:  nExpMode = 5;   break;
+                        default:                    nExpMode = 4;   break;  // NS40
+                    }
+
+                    pValues[nProp] <<= nExpMode;
+                    break;
+                }
+            case 10: bSet = 0 != (pImp->nFlags & HTMLCFG_STAR_BASIC);break;//"Export/Basic",
+            case 11: bSet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);break;//"Export/PrintLayout",
+            case 12: bSet = 0 != (pImp->nFlags & HTMLCFG_LOCAL_GRF);break;//"Export/LocalGraphic",
+            case 13: bSet = 0 != (pImp->nFlags & HTMLCFG_IS_BASIC_WARNING);break;//"Export/Warning"
+            case 14:
+                if(!pImp->bIsEncodingDefault)
+                    pValues[nProp] <<= pImp->eEncoding;
+                break;//"Export/Encoding",
+            case 15: bSet = 0 != (pImp->nFlags & HTMLCFG_NUMBERS_ENGLISH_US);break;//"Import/NumbersEnglishUS"
+        }
+        if(nProp < 2 || ( nProp > 9 && nProp < 14 ) || nProp == 15)
+            pValues[nProp].setValue(&bSet, ::getCppuBooleanType());
+    }
+    PutProperties(aNames, aValues);
+}
+
+void SvxHtmlOptions::AddListenerLink( const Link& rLink )
+{
+    pImp->aList.Insert( new Link( rLink ) );
+}
+
+void SvxHtmlOptions::RemoveListenerLink( const Link& rLink )
+{
+    for ( USHORT n=0; n<pImp->aList.Count(); n++ )
+    {
+        if ( (*pImp->aList.GetObject(n) ) == rLink )
+        {
+            delete pImp->aList.Remove(n);
+            break;
+        }
+    }
+}
+
+void SvxHtmlOptions::CallListeners()
+{
+    for ( USHORT n = 0; n < pImp->aList.Count(); ++n )
+        pImp->aList.GetObject(n)->Call( this );
+}
+
+
+void SvxHtmlOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+    Load( GetPropertyNames() );
+    CallListeners();
+}
+
+// -----------------------------------------------------------------------
+USHORT  SvxHtmlOptions::GetFontSize(USHORT nPos) const
+{
+    if(nPos < HTML_FONT_COUNT)
+        return (USHORT)pImp->aFontSizeArr[nPos];
+    return 0;
+}
+// -----------------------------------------------------------------------
+void SvxHtmlOptions::SetFontSize(USHORT nPos, USHORT nSize)
+{
+    if(nPos < HTML_FONT_COUNT)
+    {
+        pImp->aFontSizeArr[nPos] = nSize;
+        SetModified();
+    }
+}
+
+// -----------------------------------------------------------------------
+
+// -----------------------------------------------------------------------
+
+
+BOOL SvxHtmlOptions::IsImportUnknown() const
+{
+    return 0 != (pImp->nFlags & HTMLCFG_UNKNOWN_TAGS) ;
+}
+
+// -----------------------------------------------------------------------
+
+
+void SvxHtmlOptions::SetImportUnknown(BOOL bSet)
+{
+    if(bSet)
+        pImp->nFlags |= HTMLCFG_UNKNOWN_TAGS;
+    else
+        pImp->nFlags &= ~HTMLCFG_UNKNOWN_TAGS;
+    SetModified();
+}
+
+// -----------------------------------------------------------------------
+
+
+USHORT  SvxHtmlOptions::GetExportMode() const
+{
+    return (USHORT)pImp->nExportMode;
+}
+
+// -----------------------------------------------------------------------
+
+
+void SvxHtmlOptions::SetExportMode(USHORT nSet)
+{
+    if(nSet <= HTML_CFG_MAX )
+    {
+        pImp->nExportMode = nSet;
+        SetModified();
+        CallListeners();
+    }
+}
+
+// -----------------------------------------------------------------------
+
+
+BOOL SvxHtmlOptions::IsStarBasic() const
+{
+    return 0 != (pImp->nFlags & HTMLCFG_STAR_BASIC) ;
+}
+
+// -----------------------------------------------------------------------
+
+
+void SvxHtmlOptions::SetStarBasic(BOOL bSet)
+{
+    if(bSet)
+        pImp->nFlags |=  HTMLCFG_STAR_BASIC;
+    else
+        pImp->nFlags &= ~HTMLCFG_STAR_BASIC;
+    SetModified();
+}
+
+/*-----------------14.02.97 08.34-------------------
+
+--------------------------------------------------*/
+
+BOOL SvxHtmlOptions::IsSaveGraphicsLocal() const
+{
+    return 0 != (pImp->nFlags & HTMLCFG_LOCAL_GRF) ;
+}
+/*-----------------14.02.97 08.34-------------------
+
+--------------------------------------------------*/
+void SvxHtmlOptions::SetSaveGraphicsLocal(BOOL bSet)
+{
+    if(bSet)
+        pImp->nFlags |=  HTMLCFG_LOCAL_GRF;
+    else
+        pImp->nFlags &= ~HTMLCFG_LOCAL_GRF;
+    SetModified();
+}
+
+/*-----------------10/21/97 08:34am-----------------
+
+--------------------------------------------------*/
+
+BOOL    SvxHtmlOptions::IsPrintLayoutExtension() const
+{
+    BOOL bRet = 0 != (pImp->nFlags & HTMLCFG_PRINT_LAYOUT_EXTENSION);
+    switch( pImp->nExportMode )
+    {
+        case HTML_CFG_MSIE_40:
+        case HTML_CFG_NS40  :
+        case HTML_CFG_WRITER :
+        break;
+        default:
+            bRet = FALSE;
+    }
+    return bRet;
+}
+/*-----------------10/21/97 08:34am-----------------
+
+--------------------------------------------------*/
+void    SvxHtmlOptions::SetPrintLayoutExtension(BOOL bSet)
+{
+    if(bSet)
+        pImp->nFlags |=  HTMLCFG_PRINT_LAYOUT_EXTENSION;
+    else
+        pImp->nFlags &= ~HTMLCFG_PRINT_LAYOUT_EXTENSION;
+    SetModified();
+}
+
+/*-----------------10.07.98 10.02-------------------
+
+--------------------------------------------------*/
+
+BOOL SvxHtmlOptions::IsIgnoreFontFamily() const
+{
+    return 0 != (pImp->nFlags & HTMLCFG_IGNORE_FONT_FAMILY) ;
+}
+/*-----------------10.07.98 10.02-------------------
+
+--------------------------------------------------*/
+void SvxHtmlOptions::SetIgnoreFontFamily(BOOL bSet)
+{
+    if(bSet)
+        pImp->nFlags |=  HTMLCFG_IGNORE_FONT_FAMILY;
+    else
+        pImp->nFlags &= ~HTMLCFG_IGNORE_FONT_FAMILY;
+    SetModified();
+}
+/* -----------------05.02.99 09:03-------------------
+ *
+ * --------------------------------------------------*/
+BOOL SvxHtmlOptions::IsStarBasicWarning() const
+{
+    return 0 != (pImp->nFlags & HTMLCFG_IS_BASIC_WARNING) ;
+}
+/* -----------------05.02.99 09:03-------------------
+ *
+ * --------------------------------------------------*/
+void SvxHtmlOptions::SetStarBasicWarning(BOOL bSet)
+{
+    if(bSet)
+        pImp->nFlags |=  HTMLCFG_IS_BASIC_WARNING;
+    else
+        pImp->nFlags &= ~HTMLCFG_IS_BASIC_WARNING;
+    SetModified();
+}
+
+/*-----------------19.02.2001 18:40-----------------
+ *
+ * --------------------------------------------------*/
+rtl_TextEncoding SvxHtmlOptions::GetTextEncoding() const
+{
+    rtl_TextEncoding eRet;
+    if(pImp->bIsEncodingDefault)
+        eRet = SvtSysLocale::GetBestMimeEncoding();
+    else
+        eRet = (rtl_TextEncoding)pImp->eEncoding;
+    return eRet;
+}
+
+/*-----------------19.02.2001 18:40-----------------
+ *
+ * --------------------------------------------------*/
+void SvxHtmlOptions::SetTextEncoding( rtl_TextEncoding eEnc )
+{
+    pImp->eEncoding = eEnc;
+    pImp->bIsEncodingDefault = sal_False;
+    SetModified();
+}
+/* -----------------------------15.08.2001 12:01------------------------------
+
+ ---------------------------------------------------------------------------*/
+sal_Bool SvxHtmlOptions::IsDefaultTextEncoding() const
+{
+    return pImp->bIsEncodingDefault;
+}
+
+SvxHtmlOptions* SvxHtmlOptions::Get()
+{
+    if ( !pOptions )
+        pOptions = new SvxHtmlOptions;
+    return pOptions;
+}
+
+
+/* ---------------------- 2006-06-07T21:02+0200 ---------------------- */
+BOOL SvxHtmlOptions::IsNumbersEnglishUS() const
+{
+    return 0 != (pImp->nFlags & HTMLCFG_NUMBERS_ENGLISH_US) ;
+}
+
+
+/* ---------------------- 2006-06-07T21:02+0200 ---------------------- */
+void SvxHtmlOptions::SetNumbersEnglishUS(BOOL bSet)
+{
+    if(bSet)
+        pImp->nFlags |=  HTMLCFG_NUMBERS_ENGLISH_US;
+    else
+        pImp->nFlags &= ~HTMLCFG_NUMBERS_ENGLISH_US;
+    SetModified();
+}
diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx
index 759fabbee686..8e971a1629bf 100644
--- a/svtools/source/config/itemholder2.cxx
+++ b/svtools/source/config/itemholder2.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: itemholder2.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/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx
index 192df8f746c9..9314021b5750 100644
--- a/svtools/source/config/itemholder2.hxx
+++ b/svtools/source/config/itemholder2.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: itemholder2.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/svtools/source/config/makefile.mk b/svtools/source/config/makefile.mk
index 9de32bd9e43d..d3ba43de68ef 100644
--- a/svtools/source/config/makefile.mk
+++ b/svtools/source/config/makefile.mk
@@ -1,15 +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: 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
@@ -49,6 +45,7 @@ SLOFILES=  \
         $(SLO)$/extcolorcfg.obj            \
         $(SLO)$/fontsubstconfig.obj				\
         $(SLO)$/helpopt.obj                 \
+    $(SLO)$/htmlcfg.obj \
         $(SLO)$/itemholder2.obj \
         $(SLO)$/menuoptions.obj				\
         $(SLO)$/miscopt.obj             \
diff --git a/svtools/source/config/menuoptions.cxx b/svtools/source/config/menuoptions.cxx
index 8c00d7165ba5..70d9d1623ef2 100644
--- a/svtools/source/config/menuoptions.cxx
+++ b/svtools/source/config/menuoptions.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: menuoptions.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/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index af6861a5104f..7b04b56104e0 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.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: miscopt.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/config/optionsdrawinglayer.cxx b/svtools/source/config/optionsdrawinglayer.cxx
index 43490c5ea79e..57cf1cd8ad5b 100644
--- a/svtools/source/config/optionsdrawinglayer.cxx
+++ b/svtools/source/config/optionsdrawinglayer.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: optionsdrawinglayer.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/svtools/source/config/printoptions.cxx b/svtools/source/config/printoptions.cxx
index 9627a2ce10d9..46e1f737d347 100644
--- a/svtools/source/config/printoptions.cxx
+++ b/svtools/source/config/printoptions.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: printoptions.cxx,v $
- * $Revision: 1.14.236.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/config/test/makefile.mk b/svtools/source/config/test/makefile.mk
index 01d6752a2850..71bea788d8de 100644
--- a/svtools/source/config/test/makefile.mk
+++ b/svtools/source/config/test/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/config/test/test.cxx b/svtools/source/config/test/test.cxx
index 1ac0038b5131..ea4e0c0ec942 100644
--- a/svtools/source/config/test/test.cxx
+++ b/svtools/source/config/test/test.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: test.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/svtools/source/contnr/cont_pch.cxx b/svtools/source/contnr/cont_pch.cxx
index fb711ff12e7d..4661a08162a2 100644
--- a/svtools/source/contnr/cont_pch.cxx
+++ b/svtools/source/contnr/cont_pch.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: cont_pch.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/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx
index a0e6b353dfb6..93f328ae2028 100644
--- a/svtools/source/contnr/contentenumeration.cxx
+++ b/svtools/source/contnr/contentenumeration.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: contentenumeration.cxx,v $
- * $Revision: 1.11.104.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/contnr/contentenumeration.hxx b/svtools/source/contnr/contentenumeration.hxx
index dd6c3e727f05..16db279ad547 100644
--- a/svtools/source/contnr/contentenumeration.hxx
+++ b/svtools/source/contnr/contentenumeration.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: contentenumeration.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/svtools/source/contnr/ctrdll.cxx b/svtools/source/contnr/ctrdll.cxx
index 1607cd1727f9..463c6ccc8b35 100644
--- a/svtools/source/contnr/ctrdll.cxx
+++ b/svtools/source/contnr/ctrdll.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: ctrdll.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/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 7fddf18ee266..8538e344bdc1 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.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: fileview.cxx,v $
- * $Revision: 1.73.104.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/contnr/fileview.hrc b/svtools/source/contnr/fileview.hrc
index 791945595229..bbf340148fc9 100644
--- a/svtools/source/contnr/fileview.hrc
+++ b/svtools/source/contnr/fileview.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: fileview.hrc,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/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src
index 9d1cdb618cda..e45f35fc1927 100644
--- a/svtools/source/contnr/fileview.src
+++ b/svtools/source/contnr/fileview.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: fileview.src,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/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx
index d443beb7fff9..cc7aa4e05ee1 100644
--- a/svtools/source/contnr/imivctl.hxx
+++ b/svtools/source/contnr/imivctl.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: imivctl.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/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx
index 954c8a7ca179..dd2ed992536e 100644
--- a/svtools/source/contnr/imivctl1.cxx
+++ b/svtools/source/contnr/imivctl1.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: imivctl1.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/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx
index 5d602143b810..7cb92e8cef07 100644
--- a/svtools/source/contnr/imivctl2.cxx
+++ b/svtools/source/contnr/imivctl2.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: imivctl2.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/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx
index 916738af70ae..dae3abbac966 100644
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.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: ivctrl.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/svtools/source/contnr/makefile.mk b/svtools/source/contnr/makefile.mk
index ded62752330a..232665c88c9c 100644
--- a/svtools/source/contnr/makefile.mk
+++ b/svtools/source/contnr/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/contnr/svcontnr.src b/svtools/source/contnr/svcontnr.src
index f81bc3fdfa9b..c296cc686c1d 100644
--- a/svtools/source/contnr/svcontnr.src
+++ b/svtools/source/contnr/svcontnr.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: svcontnr.src,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/svtools/source/contnr/svicnvw.cxx b/svtools/source/contnr/svicnvw.cxx
index 978a50395e8e..20bcfe0fe33a 100644
--- a/svtools/source/contnr/svicnvw.cxx
+++ b/svtools/source/contnr/svicnvw.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: svicnvw.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/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index f2674279f4df..426f55be5b93 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.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: svimpbox.cxx,v $
- * $Revision: 1.57 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/contnr/svimpicn.cxx b/svtools/source/contnr/svimpicn.cxx
index 8d7a79701d27..2d4c9cf2df0e 100644
--- a/svtools/source/contnr/svimpicn.cxx
+++ b/svtools/source/contnr/svimpicn.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: svimpicn.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/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index e9125b7fb2e1..82321b53259e 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.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: svlbitm.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/svtools/source/contnr/svlbox.cxx b/svtools/source/contnr/svlbox.cxx
index 77a9a3798d6d..2752e813052e 100644
--- a/svtools/source/contnr/svlbox.cxx
+++ b/svtools/source/contnr/svlbox.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: svlbox.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/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 3b4907e7a80d..9d4ad1ba15b5 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.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: svtabbx.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/svtools/source/contnr/svtreebx.cxx b/svtools/source/contnr/svtreebx.cxx
index 503325ddf802..143ac922eebc 100644
--- a/svtools/source/contnr/svtreebx.cxx
+++ b/svtools/source/contnr/svtreebx.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: svtreebx.cxx,v $
- * $Revision: 1.56 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 06de35ba19aa..ab4bda64a652 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.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: templwin.cxx,v $
- * $Revision: 1.82.58.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/contnr/templwin.hrc b/svtools/source/contnr/templwin.hrc
index ebf756e17799..5a0d84f1d377 100644
--- a/svtools/source/contnr/templwin.hrc
+++ b/svtools/source/contnr/templwin.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: templwin.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/svtools/source/contnr/templwin.hxx b/svtools/source/contnr/templwin.hxx
index 050ba7ab6739..acb7c602ad30 100644
--- a/svtools/source/contnr/templwin.hxx
+++ b/svtools/source/contnr/templwin.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: templwin.hxx,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/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src
index f7f42b7e176b..636c54ef6632 100644
--- a/svtools/source/contnr/templwin.src
+++ b/svtools/source/contnr/templwin.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: templwin.src,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/svtools/source/contnr/tooltiplbox.cxx b/svtools/source/contnr/tooltiplbox.cxx
index f33b7e4c24ea..6aae495bd504 100644
--- a/svtools/source/contnr/tooltiplbox.cxx
+++ b/svtools/source/contnr/tooltiplbox.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: tooltiplbox.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/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index c1491571dd1c..3395dffc28f5 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.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: treelist.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/svtools/source/control/asynclink.cxx b/svtools/source/control/asynclink.cxx
index 1e47c71de5d4..04b2b58367ee 100644
--- a/svtools/source/control/asynclink.cxx
+++ b/svtools/source/control/asynclink.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: asynclink.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/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 481f6f2ceeae..c83ffa3ed70f 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.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: calendar.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/svtools/source/control/calendar.src b/svtools/source/control/calendar.src
index 043dd9808663..15c82cfdd184 100644
--- a/svtools/source/control/calendar.src
+++ b/svtools/source/control/calendar.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: calendar.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/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx
index c976d7442bc0..23a84e757ebe 100644
--- a/svtools/source/control/collatorres.cxx
+++ b/svtools/source/control/collatorres.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: collatorres.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/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index b0d20bf7ce30..2f692944d3c7 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.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: ctrlbox.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1152,6 +1149,7 @@ void FontSizeBox::ImplInit()
     SetDecimalDigits( 1 );
     SetMin( 20 );
     SetMax( 9999 );
+    SetProminentEntryType( PROMINENT_MIDDLE );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/control/ctrlbox.src b/svtools/source/control/ctrlbox.src
index 05c75577cdbf..0c63aef259b3 100644
--- a/svtools/source/control/ctrlbox.src
+++ b/svtools/source/control/ctrlbox.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: ctrlbox.src,v $
- * $Revision: 1.59 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/control/ctrldll.cxx b/svtools/source/control/ctrldll.cxx
index 084d76125088..2f3ff037be31 100644
--- a/svtools/source/control/ctrldll.cxx
+++ b/svtools/source/control/ctrldll.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: ctrldll.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/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx
index 1573ed531662..9abd14331fe4 100644
--- a/svtools/source/control/ctrltool.cxx
+++ b/svtools/source/control/ctrltool.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: ctrltool.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/svtools/source/control/ctrltool.src b/svtools/source/control/ctrltool.src
index ab8005cd9698..3e1c1ba884f8 100644
--- a/svtools/source/control/ctrltool.src
+++ b/svtools/source/control/ctrltool.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: ctrltool.src,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/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx
index d820dce097ed..14c0478f5327 100644
--- a/svtools/source/control/filectrl.cxx
+++ b/svtools/source/control/filectrl.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: filectrl.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -78,6 +75,9 @@ WinBits FileControl::ImplInitStyle( WinBits nStyle )
         maButton.SetStyle( (maButton.GetStyle()|WB_NOTABSTOP)&(~WB_TABSTOP) );
     }
 
+    const WinBits nAlignmentStyle = ( WB_TOP | WB_VCENTER | WB_BOTTOM );
+    maEdit.SetStyle( ( maEdit.GetStyle() & ~nAlignmentStyle ) | ( nStyle & nAlignmentStyle ) );
+
     if ( !(nStyle & WB_NOGROUP) )
         nStyle |= WB_GROUP;
 
diff --git a/svtools/source/control/filectrl.src b/svtools/source/control/filectrl.src
index 3a051e8196e1..dc8bbb5905d6 100644
--- a/svtools/source/control/filectrl.src
+++ b/svtools/source/control/filectrl.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: filectrl.src,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/svtools/source/control/filectrl2.cxx b/svtools/source/control/filectrl2.cxx
index 0ea28fbf96bd..2a75c5d3d7e8 100644
--- a/svtools/source/control/filectrl2.cxx
+++ b/svtools/source/control/filectrl2.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: filectrl2.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/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index 554f713fd4d6..476b2864a117 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.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: fileurlbox.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/svtools/source/control/fixedhyper.cxx b/svtools/source/control/fixedhyper.cxx
index 5525333e083c..a8877d240d4e 100644
--- a/svtools/source/control/fixedhyper.cxx
+++ b/svtools/source/control/fixedhyper.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: fixedhyper.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/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index bbf00329cf93..5b986dc10f9d 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.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: fmtfield.cxx,v $
- * $Revision: 1.40 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx
index ffef998d7aad..1ae223bebf06 100644
--- a/svtools/source/control/headbar.cxx
+++ b/svtools/source/control/headbar.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: headbar.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/svtools/source/control/hyperlabel.cxx b/svtools/source/control/hyperlabel.cxx
index 7d7477130e0d..10ef8cdcfadf 100644
--- a/svtools/source/control/hyperlabel.cxx
+++ b/svtools/source/control/hyperlabel.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: hyperlabel.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/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx
index f69e9b34e5ea..32e3aa14c0dc 100644
--- a/svtools/source/control/indexentryres.cxx
+++ b/svtools/source/control/indexentryres.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: indexentryres.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/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index b4904afee418..8aadbb9028b0 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/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.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/control/makefile.mk b/svtools/source/control/makefile.mk
index eecf983ab756..a40a81163eb3 100644
--- a/svtools/source/control/makefile.mk
+++ b/svtools/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.19 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -49,6 +45,7 @@ SRC1FILES=\
         filectrl.src
 
 EXCEPTIONSFILES=\
+        $(SLO)$/svxbox.obj \
         $(SLO)$/filectrl2.obj \
         $(SLO)$/roadmap.obj \
         $(SLO)$/scriptedtext.obj\
diff --git a/svtools/source/control/prgsbar.cxx b/svtools/source/control/prgsbar.cxx
index b6702e93af4d..b67202e9c1fc 100644
--- a/svtools/source/control/prgsbar.cxx
+++ b/svtools/source/control/prgsbar.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: prgsbar.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/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx
index 693bca733813..7cf88816199f 100644
--- a/svtools/source/control/roadmap.cxx
+++ b/svtools/source/control/roadmap.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: roadmap.cxx,v $
- * $Revision: 1.16.56.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index c3f10f1866aa..6fcbd92597ba 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.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: ruler.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/svtools/source/control/scriptedtext.cxx b/svtools/source/control/scriptedtext.cxx
index 04f3d55c35b0..2067e6d245f0 100644
--- a/svtools/source/control/scriptedtext.cxx
+++ b/svtools/source/control/scriptedtext.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: scriptedtext.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/svtools/source/control/scrwin.cxx b/svtools/source/control/scrwin.cxx
index 162f23948385..eb47d2c780ad 100644
--- a/svtools/source/control/scrwin.cxx
+++ b/svtools/source/control/scrwin.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: scrwin.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/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx
index ddfb607d8064..14c8cade3092 100644
--- a/svtools/source/control/stdctrl.cxx
+++ b/svtools/source/control/stdctrl.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: stdctrl.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/svtools/source/control/stdmenu.cxx b/svtools/source/control/stdmenu.cxx
index 35250753de1e..95b6d3fbd5c6 100644
--- a/svtools/source/control/stdmenu.cxx
+++ b/svtools/source/control/stdmenu.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: stdmenu.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/svtools/source/control/svxbox.cxx b/svtools/source/control/svxbox.cxx
new file mode 100644
index 000000000000..d1ea47d110cd
--- /dev/null
+++ b/svtools/source/control/svxbox.cxx
@@ -0,0 +1,617 @@
+/*************************************************************************
+ *
+ * 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_svtools.hxx"
+#include <tools/debug.hxx>
+#include <vcl/svapp.hxx>
+#include <svtools/svxbox.hxx>
+#include <unotools/charclass.hxx>
+
+// -----------------------------------------------------------------------
+
+SV_IMPL_PTRARR(SvxEntryLst, SvxBoxEntry*)
+
+/*--------------------------------------------------------------------
+     Beschreibung: Ein ListboxElement
+ --------------------------------------------------------------------*/
+
+SvxBoxEntry::SvxBoxEntry() :
+    nId(LISTBOX_ENTRY_NOTFOUND),
+    bModified(FALSE),
+    bNew(FALSE)
+{
+}
+
+
+SvxBoxEntry::SvxBoxEntry(const String& aNam, USHORT nIdx) :
+    aName(aNam),
+    nId(nIdx),
+    bModified(FALSE),
+    bNew(FALSE)
+{
+}
+
+
+SvxBoxEntry::SvxBoxEntry(const SvxBoxEntry& rOld) :
+    aName(rOld.aName),
+    nId(rOld.nId),
+    bModified(rOld.bModified),
+    bNew(rOld.bNew)
+{
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung:
+ --------------------------------------------------------------------*/
+
+SvxListBox::SvxListBox(Window* pParent, WinBits nBits) :
+    ListBox(pParent, nBits)
+{
+    InitListBox();
+}
+
+
+SvxListBox::SvxListBox(Window* pParent, const ResId& rId):
+    ListBox(pParent, rId)
+{
+    InitListBox();
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Basisklasse Dtor
+ --------------------------------------------------------------------*/
+
+__EXPORT SvxListBox::~SvxListBox()
+{
+    aEntryLst.DeleteAndDestroy(0,   aEntryLst.Count());
+    aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Evtl. Liste aus der Ressource beachten
+ --------------------------------------------------------------------*/
+
+void SvxListBox::InitListBox()
+{
+    // Verwaltung fuer die Stringlist aus der Resource aufbauen
+    USHORT nSize = GetEntryCount();
+    for(USHORT i=0; i < nSize; ++i)
+    {   const SvxBoxEntry* pTmp = new SvxBoxEntry(ListBox::GetEntry(i), i);
+        const SvxBoxEntry* &rpTmp = pTmp;
+        aEntryLst.Insert(rpTmp, aEntryLst.Count());
+    }
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: neue Eintraege verwalten
+ --------------------------------------------------------------------*/
+
+void SvxListBox::InsertNewEntry(const SvxBoxEntry& rEntry)
+{
+    SvxBoxEntry* pNew = new SvxBoxEntry(rEntry);
+    pNew->bNew = TRUE;
+    InsertSorted(pNew);
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Eintrag in die ListBox aufnehmen
+ --------------------------------------------------------------------*/
+
+void SvxListBox::InsertEntry(const SvxBoxEntry& rEntry, USHORT nPos)
+{
+    if(nPos != LISTBOX_ENTRY_NOTFOUND)
+    {
+        SvxBoxEntry* pEntry = new SvxBoxEntry(rEntry);
+        ListBox::InsertEntry(pEntry->aName, nPos);
+        //const SvxBoxEntry* &rpEntry = pEntry;
+        aEntryLst.C40_INSERT(SvxBoxEntry, pEntry, nPos);
+    }
+    else
+        InsertSorted(new SvxBoxEntry(rEntry));
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Eintrag aus der Liste loeschen
+ --------------------------------------------------------------------*/
+
+void SvxListBox::RemoveEntry(USHORT nPos)
+{
+    if(nPos >= aEntryLst.Count())
+        return;
+
+    // Altes Element austragen
+    SvxBoxEntry* pEntry = aEntryLst[nPos];
+    aEntryLst.Remove(nPos, 1);
+    ListBox::RemoveEntry(nPos);
+
+    // keine neuen Eintraege in die Liste mit aufnehmen
+    if(pEntry->bNew)
+        return;
+
+    // in DeleteListe eintragen
+    aDelEntryLst.C40_INSERT(SvxBoxEntry, pEntry, aDelEntryLst.Count());
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Eintrag ueber konkretes Obkjekt loeschen
+ --------------------------------------------------------------------*/
+
+void SvxListBox::RemoveEntry(const SvxBoxEntry& rEntry)
+{
+    USHORT nPos = ListBox::GetEntryPos(rEntry.aName);
+    RemoveEntry(nPos);
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Listen loeschen und Anzeige loeschen
+ --------------------------------------------------------------------*/
+
+void SvxListBox::Clear()
+{
+    ListBox::Clear();
+    aEntryLst.DeleteAndDestroy(0, aEntryLst.Count());
+    aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Position by Name
+ --------------------------------------------------------------------*/
+
+USHORT SvxListBox::GetEntryPos(const SvxBoxEntry& rEntry) const
+{
+    return ListBox::GetEntryPos(rEntry.aName);
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Rund um die Entries
+ --------------------------------------------------------------------*/
+
+const SvxBoxEntry& SvxListBox::GetSvxBoxEntry(USHORT nPos) const
+{
+    if(nPos < aEntryLst.Count())
+        return *aEntryLst[nPos];
+    else
+        return aDefault;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: aktullen Eintrag zurueckgeben
+ --------------------------------------------------------------------*/
+
+const SvxBoxEntry& SvxListBox::GetSelectSvxBoxEntry(USHORT nSelId) const
+{
+    String aName(ListBox::GetSelectEntry(nSelId));
+
+    if(aName.Len() > 0)
+    {
+        for (USHORT i=0; i < aEntryLst.Count(); i++)
+        {
+            if(aEntryLst[i]->aName == aName )
+                return *aEntryLst[i];
+        }
+    }
+    return aDefault;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: modifizierte Eintraege
+ --------------------------------------------------------------------*/
+
+USHORT SvxListBox::GetModifiedCount() const
+{
+    USHORT nMod  = 0;
+    USHORT nSize = aEntryLst.Count();
+    for(USHORT i=0; i < nSize; ++i)
+    {   if(aEntryLst[i]->bModified)
+            nMod++;
+    }
+    return nMod;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Modifizierte Eintraege behandeln
+ --------------------------------------------------------------------*/
+
+void SvxListBox::ModifyEntry(USHORT nPos, const String& rName)
+{
+    if(nPos >= aEntryLst.Count())
+        return;
+
+    SvxBoxEntry* pEntry = aEntryLst[nPos];
+    aEntryLst.Remove(nPos, 1);
+    aEntryLst[nPos]->aName      = rName;
+    aEntryLst[nPos]->bModified  = TRUE;
+    ListBox::RemoveEntry(nPos);
+
+    InsertSorted(pEntry);
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: alle modifizierten Eintraege bahandeln
+ --------------------------------------------------------------------*/
+
+const SvxBoxEntry& SvxListBox::GetModifiedEntry(USHORT nPos) const
+{
+    USHORT nSize = aEntryLst.Count();
+    USHORT nMod  = 0;
+    for(USHORT i=0; i < nSize; ++i)
+    {   if(aEntryLst[i]->bModified)
+        {   if(nMod == nPos)
+                return *aEntryLst[i];
+            nMod++;
+        }
+    }
+    return aDefault;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: geloeschte Eintraege
+ --------------------------------------------------------------------*/
+
+USHORT SvxListBox::GetRemovedCount() const
+{
+    return aDelEntryLst.Count();
+}
+
+
+const SvxBoxEntry& SvxListBox::GetRemovedEntry(USHORT nPos) const
+{
+    if(nPos < aDelEntryLst.Count())
+        return *aDelEntryLst[nPos];
+
+    return aDefault;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Neue Entries begutachten
+ --------------------------------------------------------------------*/
+
+USHORT SvxListBox::GetNewCount() const
+{
+    USHORT nNew = 0;
+    USHORT nSize = aEntryLst.Count();
+    for(USHORT i=0; i < nSize; ++i)
+    {   if(aEntryLst[i]->bNew)
+            nNew++;
+    }
+    return nNew;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung:  Alle neuen Eintraege ueberpruefen
+ --------------------------------------------------------------------*/
+
+const SvxBoxEntry& SvxListBox::GetNewEntry(USHORT nPos) const
+{
+    USHORT nSize = aEntryLst.Count();
+    USHORT nNew  = 0;
+    for(USHORT i=0; i < nSize; ++i)
+    {   if(aEntryLst[i]->bNew)
+        {   if(nNew == nPos)
+                return *aEntryLst[i];
+            nNew++;
+        }
+    }
+    return aDefault;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Sortiert einfuegen
+ --------------------------------------------------------------------*/
+
+void SvxListBox::InsertSorted(SvxBoxEntry* pEntry)
+{
+    ListBox::InsertEntry(pEntry->aName);
+    USHORT nPos = ListBox::GetEntryPos(pEntry->aName);
+    aEntryLst.C40_INSERT(SvxBoxEntry, pEntry, nPos);
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: ComboBoxen mit Verwaltungseinheit
+ --------------------------------------------------------------------*/
+
+SvxComboBox::SvxComboBox(Window* pParent, WinBits nBits, USHORT nStyleBits) :
+    ComboBox(pParent, nBits),
+    nStyle(nStyleBits)
+{
+    InitComboBox();
+}
+
+
+SvxComboBox::SvxComboBox(Window* pParent, const ResId& rId, USHORT nStyleBits ):
+    ComboBox(pParent, rId),
+    nStyle(nStyleBits)
+{
+    InitComboBox();
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Basisklasse Dtor
+ --------------------------------------------------------------------*/
+
+__EXPORT SvxComboBox::~SvxComboBox()
+{
+    aEntryLst.DeleteAndDestroy(0,   aEntryLst.Count());
+    aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Evtl. Liste aus der Ressource beachten
+ --------------------------------------------------------------------*/
+
+void SvxComboBox::InitComboBox()
+{
+    // Verwaltung fuer die Stringlist aus der Resource aufbauen
+    USHORT nSize = GetEntryCount();
+    for(USHORT i=0; i < nSize; ++i)
+    {   const SvxBoxEntry* pTmp = new SvxBoxEntry(ComboBox::GetEntry(i), i);
+        const SvxBoxEntry* &rpTmp = pTmp;
+        aEntryLst.Insert(rpTmp, aEntryLst.Count());
+    }
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: neue Eintraege verwalten
+ --------------------------------------------------------------------*/
+
+void SvxComboBox::InsertNewEntry(const SvxBoxEntry& rEntry)
+{
+    SvxBoxEntry* pNew = new SvxBoxEntry(rEntry);
+    pNew->bNew = TRUE;
+    InsertSorted(pNew);
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Eintrag in die ComboBox aufnehmen
+ --------------------------------------------------------------------*/
+
+void SvxComboBox::InsertEntry(const SvxBoxEntry& rEntry)
+{
+    InsertSorted(new SvxBoxEntry(rEntry));
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Eintrag aus der Liste loeschen
+ --------------------------------------------------------------------*/
+
+void SvxComboBox::RemoveEntry(USHORT nPos)
+{
+    if(nPos >= aEntryLst.Count())
+        return;
+
+    // Altes Element austragen
+    SvxBoxEntry* pEntry = aEntryLst[nPos];
+    aEntryLst.Remove(nPos, 1);
+    ComboBox::RemoveEntry(nPos);
+
+    // keine neuen Eintraege in die Liste mit aufnehmen
+    if(pEntry->bNew)
+        return;
+
+    // in DeleteListe eintragen
+    aDelEntryLst.C40_INSERT(SvxBoxEntry, pEntry, aDelEntryLst.Count());
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Eintrag ueber konkretes Obkjekt loeschen
+ --------------------------------------------------------------------*/
+
+void SvxComboBox::RemoveEntry(const SvxBoxEntry& rEntry)
+{
+    USHORT nPos = ComboBox::GetEntryPos(rEntry.aName);
+    RemoveEntry(nPos);
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Listen loeschen und Anzeige loeschen
+ --------------------------------------------------------------------*/
+
+void SvxComboBox::Clear()
+{
+    ComboBox::Clear();
+    aEntryLst.DeleteAndDestroy(0, aEntryLst.Count());
+    aDelEntryLst.DeleteAndDestroy(0, aDelEntryLst.Count());
+}
+
+
+/*--------------------------------------------------------------------
+     Beschreibung: Position by Name
+ --------------------------------------------------------------------*/
+
+USHORT SvxComboBox::GetEntryPos(const SvxBoxEntry& rEntry) const
+{
+    return ComboBox::GetEntryPos(rEntry.aName);
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Rund um die Entries
+ --------------------------------------------------------------------*/
+
+const SvxBoxEntry& SvxComboBox::GetEntry(USHORT nPos) const
+{
+    if(nPos < aEntryLst.Count())
+        return *aEntryLst[nPos];
+    else
+        return aDefault;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: modifizierte Eintraege
+ --------------------------------------------------------------------*/
+
+USHORT SvxComboBox::GetModifiedCount() const
+{
+    USHORT nMod  = 0;
+    USHORT nSize = aEntryLst.Count();
+    for(USHORT i=0; i < nSize; ++i)
+    {   if(aEntryLst[i]->bModified)
+            nMod++;
+    }
+    return nMod;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Modifizierte Eintraege behandeln
+ --------------------------------------------------------------------*/
+
+void SvxComboBox::ModifyEntry(USHORT nPos, const String& rName)
+{
+    if(nPos >= aEntryLst.Count())
+        return;
+
+    SvxBoxEntry* pEntry = aEntryLst[nPos];
+    aEntryLst.Remove(nPos, 1);
+    aEntryLst[nPos]->aName      = rName;
+    aEntryLst[nPos]->bModified  = TRUE;
+    ComboBox::RemoveEntry(nPos);
+
+    InsertSorted(pEntry);
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: alle modifizierten Eintraege bahandeln
+ --------------------------------------------------------------------*/
+
+const SvxBoxEntry& SvxComboBox::GetModifiedEntry(USHORT nPos) const
+{
+    USHORT nSize = aEntryLst.Count();
+    USHORT nMod  = 0;
+    for(USHORT i=0; i < nSize; ++i)
+    {   if(aEntryLst[i]->bModified)
+        {   if(nMod == nPos)
+                return *aEntryLst[i];
+            nMod++;
+        }
+    }
+    return aDefault;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: geloeschte Eintraege
+ --------------------------------------------------------------------*/
+
+USHORT SvxComboBox::GetRemovedCount() const
+{
+    return aDelEntryLst.Count();
+}
+
+
+const SvxBoxEntry& SvxComboBox::GetRemovedEntry(USHORT nPos) const
+{
+    if(nPos < aDelEntryLst.Count())
+        return *aDelEntryLst[nPos];
+
+    return aDefault;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Neue Entries begutachten
+ --------------------------------------------------------------------*/
+
+USHORT SvxComboBox::GetNewCount() const
+{
+    USHORT nNew = 0;
+    USHORT nSize = aEntryLst.Count();
+    for(USHORT i=0; i < nSize; ++i)
+    {   if(aEntryLst[i]->bNew)
+            nNew++;
+    }
+    return nNew;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung:  Alle neuen Eintraege ueberpruefen
+ --------------------------------------------------------------------*/
+
+const SvxBoxEntry& SvxComboBox::GetNewEntry(USHORT nPos) const
+{
+    USHORT nSize = aEntryLst.Count();
+    USHORT nNew  = 0;
+    for(USHORT i=0; i < nSize; ++i)
+    {   if(aEntryLst[i]->bNew)
+        {   if(nNew == nPos)
+                return *aEntryLst[i];
+            nNew++;
+        }
+    }
+    return aDefault;
+}
+
+/*--------------------------------------------------------------------
+     Beschreibung: Sortiert einfuegen
+ --------------------------------------------------------------------*/
+
+void SvxComboBox::InsertSorted(SvxBoxEntry* pEntry)
+{
+    ComboBox::InsertEntry(pEntry->aName);
+    USHORT nPos = ComboBox::GetEntryPos(pEntry->aName);
+    aEntryLst.C40_INSERT(SvxBoxEntry, pEntry, nPos);
+}
+
+
+/*--------------------------------------------------------------------
+    Beschreibung: Je nach Option bestimmte Zeichen ausblenden
+ --------------------------------------------------------------------*/
+
+void __EXPORT SvxComboBox::KeyInput( const KeyEvent& rKEvt )
+{
+    sal_Unicode cChar = rKEvt.GetCharCode();
+
+    if(nStyle & SVX_CBS_FILENAME)
+    {
+#if defined UNX
+        if( cChar == sal_Unicode( '/' ) || cChar == sal_Unicode( ' ' ) )
+            return;
+#else
+        if( cChar == sal_Unicode( ':' ) || cChar == sal_Unicode( '\\' ) ||
+            cChar == sal_Unicode( '.' ) || cChar == sal_Unicode( ' ' ) )
+            return;
+#endif
+    }
+    ComboBox::KeyInput(rKEvt);
+}
+
+/*--------------------------------------------------------------------
+    Beschreibung: Text nach Option konvertieren
+ --------------------------------------------------------------------*/
+
+String SvxComboBox::GetText() const
+{
+    String aTxt(ComboBox::GetText());
+    CharClass aCharClass( Application::GetSettings().GetLocale() );
+
+    if(nStyle & SVX_CBS_LOWER)
+        return aCharClass.lower(aTxt);
+
+    if(nStyle & SVX_CBS_UPPER)
+        return aCharClass.upper(aTxt);
+
+    return aTxt;
+}
+
+
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx
index ed1abbe53a2a..c4896ba8b812 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.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: tabbar.cxx,v $
- * $Revision: 1.21.100.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/control/taskbar.cxx b/svtools/source/control/taskbar.cxx
index 146fa4933af3..e84c934ef0d8 100644
--- a/svtools/source/control/taskbar.cxx
+++ b/svtools/source/control/taskbar.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: taskbar.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/svtools/source/control/taskbox.cxx b/svtools/source/control/taskbox.cxx
index 72a7345f1660..8e5ff6de8def 100644
--- a/svtools/source/control/taskbox.cxx
+++ b/svtools/source/control/taskbox.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: taskbox.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/svtools/source/control/taskmisc.cxx b/svtools/source/control/taskmisc.cxx
index bada5926d639..4c9fda217258 100644
--- a/svtools/source/control/taskmisc.cxx
+++ b/svtools/source/control/taskmisc.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: taskmisc.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/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx
index 82165a711285..2fdab63be37f 100644
--- a/svtools/source/control/taskstat.cxx
+++ b/svtools/source/control/taskstat.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: taskstat.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/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index 899867414e2f..788948355965 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.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: urlcontrol.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/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index 96eb8bb39e99..6712e75aa9b4 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.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: valueacc.cxx,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/svtools/source/control/valueimp.hxx b/svtools/source/control/valueimp.hxx
index c176629953ae..f74cdf00a4db 100644
--- a/svtools/source/control/valueimp.hxx
+++ b/svtools/source/control/valueimp.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: valueimp.hxx,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/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index 4033a9df7bb5..bb48c11c7c0b 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.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: valueset.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/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index aa18a3683916..6647b9eee608 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.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: addresstemplate.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/svtools/source/dialogs/addresstemplate.hrc b/svtools/source/dialogs/addresstemplate.hrc
index 8c4a6b9fbd27..5fb89cd567fc 100644
--- a/svtools/source/dialogs/addresstemplate.hrc
+++ b/svtools/source/dialogs/addresstemplate.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: addresstemplate.hrc,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/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src
index 63c0e6475597..f4812f8b7566 100644
--- a/svtools/source/dialogs/addresstemplate.src
+++ b/svtools/source/dialogs/addresstemplate.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: addresstemplate.src,v $
- * $Revision: 1.55 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/dialogs/colctrl.cxx b/svtools/source/dialogs/colctrl.cxx
index 06fb689cd2ce..4456fe2f1268 100644
--- a/svtools/source/dialogs/colctrl.cxx
+++ b/svtools/source/dialogs/colctrl.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: colctrl.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/svtools/source/dialogs/colrdlg.cxx b/svtools/source/dialogs/colrdlg.cxx
index 3b40f498c656..a52cc4b0834c 100644
--- a/svtools/source/dialogs/colrdlg.cxx
+++ b/svtools/source/dialogs/colrdlg.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: colrdlg.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/svtools/source/dialogs/colrdlg.hrc b/svtools/source/dialogs/colrdlg.hrc
index 8ffad0ea544e..41329df6e366 100644
--- a/svtools/source/dialogs/colrdlg.hrc
+++ b/svtools/source/dialogs/colrdlg.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: colrdlg.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/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src
index 1425f0f28962..ad9a5c1aa015 100644
--- a/svtools/source/dialogs/colrdlg.src
+++ b/svtools/source/dialogs/colrdlg.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: colrdlg.src,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/dialogs/filedlg.cxx b/svtools/source/dialogs/filedlg.cxx
index b543aa895a8e..5567651c0480 100644
--- a/svtools/source/dialogs/filedlg.cxx
+++ b/svtools/source/dialogs/filedlg.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: filedlg.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/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx
index 5a03ab3885b5..b0e77d658931 100644
--- a/svtools/source/dialogs/filedlg2.cxx
+++ b/svtools/source/dialogs/filedlg2.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: filedlg2.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/svtools/source/dialogs/filedlg2.hxx b/svtools/source/dialogs/filedlg2.hxx
index fffa318e2529..4d32565a2775 100644
--- a/svtools/source/dialogs/filedlg2.hxx
+++ b/svtools/source/dialogs/filedlg2.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: filedlg2.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/svtools/source/dialogs/filedlg2.src b/svtools/source/dialogs/filedlg2.src
index ecbabc79941b..977a0d6f430b 100644
--- a/svtools/source/dialogs/filedlg2.src
+++ b/svtools/source/dialogs/filedlg2.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: filedlg2.src,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/dialogs/formats.src b/svtools/source/dialogs/formats.src
index a3a738a705fb..f8ce80f62f2f 100644
--- a/svtools/source/dialogs/formats.src
+++ b/svtools/source/dialogs/formats.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: formats.src,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/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx
index a1bbbd9b9edb..3f7700805995 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.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: insdlg.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/svtools/source/dialogs/logindlg.cxx b/svtools/source/dialogs/logindlg.cxx
index 791e373086af..c9edf632d2ec 100644
--- a/svtools/source/dialogs/logindlg.cxx
+++ b/svtools/source/dialogs/logindlg.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: logindlg.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/svtools/source/dialogs/logindlg.hrc b/svtools/source/dialogs/logindlg.hrc
index 1998c55ebce4..7baf6010f531 100644
--- a/svtools/source/dialogs/logindlg.hrc
+++ b/svtools/source/dialogs/logindlg.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: logindlg.hrc,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/svtools/source/dialogs/logindlg.src b/svtools/source/dialogs/logindlg.src
index b3ef357bbae4..338b608ab0e4 100644
--- a/svtools/source/dialogs/logindlg.src
+++ b/svtools/source/dialogs/logindlg.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: logindlg.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/svtools/source/dialogs/makefile.mk b/svtools/source/dialogs/makefile.mk
index 6abf15732b8e..16528ee7d4cd 100644
--- a/svtools/source/dialogs/makefile.mk
+++ b/svtools/source/dialogs/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.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/dialogs/mcvmath.cxx b/svtools/source/dialogs/mcvmath.cxx
index fef27c4c9a62..d07c41acba04 100644
--- a/svtools/source/dialogs/mcvmath.cxx
+++ b/svtools/source/dialogs/mcvmath.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: mcvmath.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/svtools/source/dialogs/mcvmath.hxx b/svtools/source/dialogs/mcvmath.hxx
index cd021559c780..67d54fd80cf0 100644
--- a/svtools/source/dialogs/mcvmath.hxx
+++ b/svtools/source/dialogs/mcvmath.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: mcvmath.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/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx
index a006f209af18..532fd3f61bb2 100644
--- a/svtools/source/dialogs/printdlg.cxx
+++ b/svtools/source/dialogs/printdlg.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: printdlg.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/svtools/source/dialogs/printdlg.hrc b/svtools/source/dialogs/printdlg.hrc
index 2f2f43e3ba10..ef780acbb47c 100644
--- a/svtools/source/dialogs/printdlg.hrc
+++ b/svtools/source/dialogs/printdlg.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: printdlg.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/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src
index c3ab39564d75..405accc63344 100644
--- a/svtools/source/dialogs/printdlg.src
+++ b/svtools/source/dialogs/printdlg.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: printdlg.src,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/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index dedb5b2d7143..ceef2a88642b 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.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: prnsetup.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -59,7 +56,7 @@ void ImplFillPrnDlgListBox( const Printer* pPrinter,
     }
 
     pBox->Enable( nCount != 0 );
-    pPropBtn->Enable( pPrinter->HasSupport( SUPPORT_SETUPDIALOG ) );
+    pPropBtn->Show( pPrinter->HasSupport( SUPPORT_SETUPDIALOG ) );
 }
 
 // -----------------------------------------------------------------------
diff --git a/svtools/source/dialogs/prnsetup.hrc b/svtools/source/dialogs/prnsetup.hrc
index 00623d97084c..7d10c4652d45 100644
--- a/svtools/source/dialogs/prnsetup.hrc
+++ b/svtools/source/dialogs/prnsetup.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: prnsetup.hrc,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/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src
index 9f8731742c84..1443a35e0f39 100644
--- a/svtools/source/dialogs/prnsetup.src
+++ b/svtools/source/dialogs/prnsetup.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: prnsetup.src,v $
- * $Revision: 1.40 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/dialogs/propctrl.cxx b/svtools/source/dialogs/propctrl.cxx
index 40fd55fb1586..675a93ca728b 100644
--- a/svtools/source/dialogs/propctrl.cxx
+++ b/svtools/source/dialogs/propctrl.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: propctrl.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/svtools/source/dialogs/propctrl.hxx b/svtools/source/dialogs/propctrl.hxx
index 59019fc21b90..949873ceb1b7 100644
--- a/svtools/source/dialogs/propctrl.hxx
+++ b/svtools/source/dialogs/propctrl.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: propctrl.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/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx
index a0d2c557a3f6..3b081ce2f520 100644
--- a/svtools/source/dialogs/property.cxx
+++ b/svtools/source/dialogs/property.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: property.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/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx
index c7473e446986..2c71e60e8101 100644
--- a/svtools/source/dialogs/roadmapwizard.cxx
+++ b/svtools/source/dialogs/roadmapwizard.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: roadmapwizard.cxx,v $
- * $Revision: 1.19.10.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/dialogs/so3res.src b/svtools/source/dialogs/so3res.src
index c99b917d891e..524b58e0a5df 100644
--- a/svtools/source/dialogs/so3res.src
+++ b/svtools/source/dialogs/so3res.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: so3res.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/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 602c2e3e6f8a..bac18a2932dc 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.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: wizardmachine.cxx,v $
- * $Revision: 1.21.10.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/dialogs/wizardmachine.src b/svtools/source/dialogs/wizardmachine.src
index 2fa50ef20bf6..c3570335773f 100644
--- a/svtools/source/dialogs/wizardmachine.src
+++ b/svtools/source/dialogs/wizardmachine.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: wizardmachine.src,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/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index aa0e62046ea6..f06b4f53ce7c 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.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: wizdlg.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/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index 990e3041d903..01bb7ad41682 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.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: editsyntaxhighlighter.cxx,v $
- * $Revision: 1.44.108.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/edit/makefile.mk b/svtools/source/edit/makefile.mk
index 0cb429a9b5b1..58a63be58f78 100644
--- a/svtools/source/edit/makefile.mk
+++ b/svtools/source/edit/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.108.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx
index 8c60a62063df..daaff472d1cc 100644
--- a/svtools/source/edit/svmedit.cxx
+++ b/svtools/source/edit/svmedit.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: svmedit.cxx,v $
- * $Revision: 1.44.108.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/edit/svmedit2.cxx b/svtools/source/edit/svmedit2.cxx
index c990ed9f004e..19eba618a828 100644
--- a/svtools/source/edit/svmedit2.cxx
+++ b/svtools/source/edit/svmedit2.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: svmedit2.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/svtools/source/edit/sychconv.cxx b/svtools/source/edit/sychconv.cxx
index 0a394207d051..3efa510bfc5a 100644
--- a/svtools/source/edit/sychconv.cxx
+++ b/svtools/source/edit/sychconv.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: sychconv.cxx,v $
- * $Revision: 1.5.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/edit/syntaxhighlight.cxx b/svtools/source/edit/syntaxhighlight.cxx
index 7e2f98d0d37f..5729eb712bfe 100644
--- a/svtools/source/edit/syntaxhighlight.cxx
+++ b/svtools/source/edit/syntaxhighlight.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: syntaxhighlight.cxx,v $
- * $Revision: 1.1.2.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/edit/textdat2.hxx b/svtools/source/edit/textdat2.hxx
index 7ee667db2305..222e8abee5a4 100644
--- a/svtools/source/edit/textdat2.hxx
+++ b/svtools/source/edit/textdat2.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: textdat2.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/svtools/source/edit/textdata.cxx b/svtools/source/edit/textdata.cxx
index 4e90e37a075b..32bdfe40a3fb 100644
--- a/svtools/source/edit/textdata.cxx
+++ b/svtools/source/edit/textdata.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: textdata.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/svtools/source/edit/textdoc.cxx b/svtools/source/edit/textdoc.cxx
index 09fd6b36fdb2..d4470904077e 100644
--- a/svtools/source/edit/textdoc.cxx
+++ b/svtools/source/edit/textdoc.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: textdoc.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/svtools/source/edit/textdoc.hxx b/svtools/source/edit/textdoc.hxx
index b940bb6f4da7..0c875b4fe07f 100644
--- a/svtools/source/edit/textdoc.hxx
+++ b/svtools/source/edit/textdoc.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: textdoc.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/svtools/source/edit/texteng.cxx b/svtools/source/edit/texteng.cxx
index 596ca89054e7..e0e136089d78 100644
--- a/svtools/source/edit/texteng.cxx
+++ b/svtools/source/edit/texteng.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: texteng.cxx,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/svtools/source/edit/textund2.hxx b/svtools/source/edit/textund2.hxx
index c1ebfe9e4af1..18cf9331328e 100644
--- a/svtools/source/edit/textund2.hxx
+++ b/svtools/source/edit/textund2.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: textund2.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/svtools/source/edit/textundo.cxx b/svtools/source/edit/textundo.cxx
index d16c1441c5d1..4c243de16c31 100644
--- a/svtools/source/edit/textundo.cxx
+++ b/svtools/source/edit/textundo.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: textundo.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/svtools/source/edit/textundo.hxx b/svtools/source/edit/textundo.hxx
index 7ce7169e1563..cc26c0b51ef6 100644
--- a/svtools/source/edit/textundo.hxx
+++ b/svtools/source/edit/textundo.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: textundo.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/svtools/source/edit/textview.cxx b/svtools/source/edit/textview.cxx
index 99b6fc900885..48cd23bdcc6f 100644
--- a/svtools/source/edit/textview.cxx
+++ b/svtools/source/edit/textview.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: textview.cxx,v $
- * $Revision: 1.59 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/edit/textwindowpeer.cxx b/svtools/source/edit/textwindowpeer.cxx
index 8a9c168653e6..7f31e95c75a7 100644
--- a/svtools/source/edit/textwindowpeer.cxx
+++ b/svtools/source/edit/textwindowpeer.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: textwindowpeer.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/svtools/source/edit/txtattr.cxx b/svtools/source/edit/txtattr.cxx
index e860a3a0cfd4..e7466cbe1d85 100644
--- a/svtools/source/edit/txtattr.cxx
+++ b/svtools/source/edit/txtattr.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: txtattr.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/svtools/source/edit/xtextedt.cxx b/svtools/source/edit/xtextedt.cxx
index b3d17d80b567..0a4907edcadd 100644
--- a/svtools/source/edit/xtextedt.cxx
+++ b/svtools/source/edit/xtextedt.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: xtextedt.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/svtools/source/filter.vcl/filter/FilterConfigCache.cxx b/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
index d28fb78dcad1..4c8023bed883 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.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: FilterConfigCache.cxx,v $
- * $Revision: 1.24.100.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx b/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
index 76c3976763e9..2c6b7361e540 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigCache.hxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigCache.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: FilterConfigCache.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/svtools/source/filter.vcl/filter/FilterConfigItem.cxx b/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
index b336ed1adf07..765711ad8d4a 100644
--- a/svtools/source/filter.vcl/filter/FilterConfigItem.cxx
+++ b/svtools/source/filter.vcl/filter/FilterConfigItem.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: FilterConfigItem.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/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
index 584814dd9e92..038930ef80ee 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.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: SvFilterOptionsDialog.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/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
index 2828c6268c17..a55fc4c84520 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.hxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.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: SvFilterOptionsDialog.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/svtools/source/filter.vcl/filter/dlgejpg.cxx b/svtools/source/filter.vcl/filter/dlgejpg.cxx
index a892a9012bba..377697023de3 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.cxx
+++ b/svtools/source/filter.vcl/filter/dlgejpg.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: dlgejpg.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/svtools/source/filter.vcl/filter/dlgejpg.hrc b/svtools/source/filter.vcl/filter/dlgejpg.hrc
index 67ac915df367..523a1d9553f1 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.hrc
+++ b/svtools/source/filter.vcl/filter/dlgejpg.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: dlgejpg.hrc,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/svtools/source/filter.vcl/filter/dlgejpg.hxx b/svtools/source/filter.vcl/filter/dlgejpg.hxx
index 4fe06e254c8c..d80682574a54 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.hxx
+++ b/svtools/source/filter.vcl/filter/dlgejpg.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: dlgejpg.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/svtools/source/filter.vcl/filter/dlgejpg.src b/svtools/source/filter.vcl/filter/dlgejpg.src
index 9a7c637d4d9c..fd224f22c409 100644
--- a/svtools/source/filter.vcl/filter/dlgejpg.src
+++ b/svtools/source/filter.vcl/filter/dlgejpg.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: dlgejpg.src,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/filter.vcl/filter/dlgepng.cxx b/svtools/source/filter.vcl/filter/dlgepng.cxx
index 04ad01c5a89c..bd551e9a4bda 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.cxx
+++ b/svtools/source/filter.vcl/filter/dlgepng.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: dlgepng.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/svtools/source/filter.vcl/filter/dlgepng.hrc b/svtools/source/filter.vcl/filter/dlgepng.hrc
index d687141abf56..4a05771534ab 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.hrc
+++ b/svtools/source/filter.vcl/filter/dlgepng.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: dlgepng.hrc,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/svtools/source/filter.vcl/filter/dlgepng.hxx b/svtools/source/filter.vcl/filter/dlgepng.hxx
index ad8536532a29..469985afee59 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.hxx
+++ b/svtools/source/filter.vcl/filter/dlgepng.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: dlgepng.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/svtools/source/filter.vcl/filter/dlgepng.src b/svtools/source/filter.vcl/filter/dlgepng.src
index d4010b0acdd7..aa778842dc48 100644
--- a/svtools/source/filter.vcl/filter/dlgepng.src
+++ b/svtools/source/filter.vcl/filter/dlgepng.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: dlgepng.src,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/svtools/source/filter.vcl/filter/dlgexpor.cxx b/svtools/source/filter.vcl/filter/dlgexpor.cxx
index 3dd75b53598a..b4b7c0fc949d 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.cxx
+++ b/svtools/source/filter.vcl/filter/dlgexpor.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: dlgexpor.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/svtools/source/filter.vcl/filter/dlgexpor.hrc b/svtools/source/filter.vcl/filter/dlgexpor.hrc
index cae15d7276d2..2e5377ce4fcb 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.hrc
+++ b/svtools/source/filter.vcl/filter/dlgexpor.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: dlgexpor.hrc,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/svtools/source/filter.vcl/filter/dlgexpor.hxx b/svtools/source/filter.vcl/filter/dlgexpor.hxx
index 8797cbec48c9..8c7b2d462e70 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.hxx
+++ b/svtools/source/filter.vcl/filter/dlgexpor.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: dlgexpor.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/svtools/source/filter.vcl/filter/dlgexpor.src b/svtools/source/filter.vcl/filter/dlgexpor.src
index 63fb3ccff729..7573b394d72f 100644
--- a/svtools/source/filter.vcl/filter/dlgexpor.src
+++ b/svtools/source/filter.vcl/filter/dlgexpor.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: dlgexpor.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/svtools/source/filter.vcl/filter/filter.cxx b/svtools/source/filter.vcl/filter/filter.cxx
index 306307a0bf91..e8121f1d7e94 100644
--- a/svtools/source/filter.vcl/filter/filter.cxx
+++ b/svtools/source/filter.vcl/filter/filter.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: filter.cxx,v $
- * $Revision: 1.77 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2129,3 +2126,42 @@ GraphicFilter* GraphicFilter::GetGraphicFilter()
     }
     return pGraphicFilter;
 }
+
+int GraphicFilter::LoadGraphic( const String &rPath, const String &rFilterName,
+                 Graphic& rGraphic, GraphicFilter* pFilter,
+                 USHORT* pDeterminedFormat )
+{
+    if ( !pFilter )
+        pFilter = GetGraphicFilter();
+
+    const USHORT nFilter = rFilterName.Len() && pFilter->GetImportFormatCount()
+                    ? pFilter->GetImportFormatNumber( rFilterName )
+                    : GRFILTER_FORMAT_DONTKNOW;
+
+    SvStream* pStream = NULL;
+    INetURLObject aURL( rPath );
+
+    if ( aURL.HasError() || INET_PROT_NOT_VALID == aURL.GetProtocol() )
+    {
+        aURL.SetSmartProtocol( INET_PROT_FILE );
+        aURL.SetSmartURL( rPath );
+    }
+    else if ( INET_PROT_FILE != aURL.GetProtocol() )
+    {
+        pStream = ::utl::UcbStreamHelper::CreateStream( rPath, STREAM_READ );
+    }
+
+    int nRes = GRFILTER_OK;
+    if ( !pStream )
+        nRes = pFilter->ImportGraphic( rGraphic, aURL, nFilter, pDeterminedFormat );
+    else
+        nRes = pFilter->ImportGraphic( rGraphic, rPath, *pStream, nFilter, pDeterminedFormat );
+
+#ifdef DBG_UTIL
+    if( nRes )
+        DBG_WARNING2( "GrafikFehler [%d] - [%s]", nRes, rPath.GetBuffer() );
+#endif
+
+    return nRes;
+}
+
diff --git a/svtools/source/filter.vcl/filter/filter2.cxx b/svtools/source/filter.vcl/filter/filter2.cxx
index d570dd34e50f..de2bef64ba6e 100644
--- a/svtools/source/filter.vcl/filter/filter2.cxx
+++ b/svtools/source/filter.vcl/filter/filter2.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: filter2.cxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -471,7 +468,8 @@ BOOL GraphicDescriptor::ImpDetectJPG( SvStream& rStm,  BOOL bExtendedInfo )
 
                 // Groesse des verbleibenden Puffers ermitteln
                 if ( bLinked )
-                    nMax = ( (SvMemoryStream&) rStm ).GetSize() - 16;
+                    nMax = static_cast< SvMemoryStream& >(rStm).GetEndOfData()
+                                - 16;
                 else
                     nMax = DATA_SIZE - 16;
 
diff --git a/svtools/source/filter.vcl/filter/fldll.cxx b/svtools/source/filter.vcl/filter/fldll.cxx
index 96125e63a5e2..b44e08835f34 100644
--- a/svtools/source/filter.vcl/filter/fldll.cxx
+++ b/svtools/source/filter.vcl/filter/fldll.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: fldll.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/svtools/source/filter.vcl/filter/gradwrap.cxx b/svtools/source/filter.vcl/filter/gradwrap.cxx
index d13767f494ef..be5dade03313 100644
--- a/svtools/source/filter.vcl/filter/gradwrap.cxx
+++ b/svtools/source/filter.vcl/filter/gradwrap.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: gradwrap.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/svtools/source/filter.vcl/filter/makefile.mk b/svtools/source/filter.vcl/filter/makefile.mk
index ecdf48ba5671..272bb9a76b03 100644
--- a/svtools/source/filter.vcl/filter/makefile.mk
+++ b/svtools/source/filter.vcl/filter/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.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/filter.vcl/filter/sgfbram.cxx b/svtools/source/filter.vcl/filter/sgfbram.cxx
index 7da9304a8266..43cf0fbbacd3 100644
--- a/svtools/source/filter.vcl/filter/sgfbram.cxx
+++ b/svtools/source/filter.vcl/filter/sgfbram.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: sgfbram.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/svtools/source/filter.vcl/filter/sgvmain.cxx b/svtools/source/filter.vcl/filter/sgvmain.cxx
index da466140a01e..e175380244b3 100644
--- a/svtools/source/filter.vcl/filter/sgvmain.cxx
+++ b/svtools/source/filter.vcl/filter/sgvmain.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: sgvmain.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/svtools/source/filter.vcl/filter/sgvspln.cxx b/svtools/source/filter.vcl/filter/sgvspln.cxx
index afe4f318cbf1..7a23e85f4dbe 100644
--- a/svtools/source/filter.vcl/filter/sgvspln.cxx
+++ b/svtools/source/filter.vcl/filter/sgvspln.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: sgvspln.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/svtools/source/filter.vcl/filter/sgvtext.cxx b/svtools/source/filter.vcl/filter/sgvtext.cxx
index 6ff019fee1ee..4a0be80b55be 100644
--- a/svtools/source/filter.vcl/filter/sgvtext.cxx
+++ b/svtools/source/filter.vcl/filter/sgvtext.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: sgvtext.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/svtools/source/filter.vcl/filter/strings.hrc b/svtools/source/filter.vcl/filter/strings.hrc
index a3356982609a..ac162bff09f4 100644
--- a/svtools/source/filter.vcl/filter/strings.hrc
+++ b/svtools/source/filter.vcl/filter/strings.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: strings.hrc,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/svtools/source/filter.vcl/filter/strings.src b/svtools/source/filter.vcl/filter/strings.src
index 79a039355cb7..60e628ee0b5c 100644
--- a/svtools/source/filter.vcl/filter/strings.src
+++ b/svtools/source/filter.vcl/filter/strings.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: strings.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/svtools/source/filter.vcl/igif/decode.cxx b/svtools/source/filter.vcl/igif/decode.cxx
index 9babc02665a3..bfe77319b81a 100644
--- a/svtools/source/filter.vcl/igif/decode.cxx
+++ b/svtools/source/filter.vcl/igif/decode.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: decode.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/svtools/source/filter.vcl/igif/decode.hxx b/svtools/source/filter.vcl/igif/decode.hxx
index 8584a852e169..3c6a61e7508d 100644
--- a/svtools/source/filter.vcl/igif/decode.hxx
+++ b/svtools/source/filter.vcl/igif/decode.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: decode.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/svtools/source/filter.vcl/igif/gifread.cxx b/svtools/source/filter.vcl/igif/gifread.cxx
index 792befd17157..e4020c727ff4 100644
--- a/svtools/source/filter.vcl/igif/gifread.cxx
+++ b/svtools/source/filter.vcl/igif/gifread.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: gifread.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/svtools/source/filter.vcl/igif/makefile.mk b/svtools/source/filter.vcl/igif/makefile.mk
index 49e2461bd7a8..0821591e0178 100644
--- a/svtools/source/filter.vcl/igif/makefile.mk
+++ b/svtools/source/filter.vcl/igif/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/filter.vcl/ixbm/makefile.mk b/svtools/source/filter.vcl/ixbm/makefile.mk
index 41d6f7425474..55708d2f2630 100644
--- a/svtools/source/filter.vcl/ixbm/makefile.mk
+++ b/svtools/source/filter.vcl/ixbm/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/filter.vcl/ixbm/xbmread.cxx b/svtools/source/filter.vcl/ixbm/xbmread.cxx
index 32f73d62c195..9c7faaafa88c 100644
--- a/svtools/source/filter.vcl/ixbm/xbmread.cxx
+++ b/svtools/source/filter.vcl/ixbm/xbmread.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: xbmread.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/svtools/source/filter.vcl/ixpm/makefile.mk b/svtools/source/filter.vcl/ixpm/makefile.mk
index 10792f41ab3a..98f93290d325 100644
--- a/svtools/source/filter.vcl/ixpm/makefile.mk
+++ b/svtools/source/filter.vcl/ixpm/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/svtools/source/filter.vcl/ixpm/rgbtable.hxx b/svtools/source/filter.vcl/ixpm/rgbtable.hxx
index fea528a25de7..afdab883b369 100644
--- a/svtools/source/filter.vcl/ixpm/rgbtable.hxx
+++ b/svtools/source/filter.vcl/ixpm/rgbtable.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: rgbtable.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/svtools/source/filter.vcl/ixpm/xpmread.cxx b/svtools/source/filter.vcl/ixpm/xpmread.cxx
index 1a667908f2f1..7575c94e3ed9 100644
--- a/svtools/source/filter.vcl/ixpm/xpmread.cxx
+++ b/svtools/source/filter.vcl/ixpm/xpmread.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: xpmread.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/svtools/source/filter.vcl/jpeg/jpeg.cxx b/svtools/source/filter.vcl/jpeg/jpeg.cxx
index 81d07ccd5e79..045dd00cc96f 100644
--- a/svtools/source/filter.vcl/jpeg/jpeg.cxx
+++ b/svtools/source/filter.vcl/jpeg/jpeg.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: jpeg.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -656,10 +653,14 @@ void* JPEGWriter::GetScanline( long nY )
                     aColor = pAcc->GetPaletteColor( (BYTE) pAcc->GetPixel( nY, nX ) );
 #ifndef SYSTEM_JPEG
                     *pTmp++ = aColor.GetBlue();
+                    if ( bGreys )
+                        continue;
                     *pTmp++ = aColor.GetGreen();
                     *pTmp++ = aColor.GetRed();
 #else
                     *pTmp++ = aColor.GetRed();
+                    if ( bGreys )
+                        continue;
                     *pTmp++ = aColor.GetGreen();
                     *pTmp++ = aColor.GetBlue();
 #endif
@@ -672,10 +673,14 @@ void* JPEGWriter::GetScanline( long nY )
                     aColor = pAcc->GetPixel( nY, nX );
 #ifndef SYSTEM_JPEG
                     *pTmp++ = aColor.GetBlue();
+                    if ( bGreys )
+                        continue;
                     *pTmp++ = aColor.GetGreen();
                     *pTmp++ = aColor.GetRed();
 #else
                     *pTmp++ = aColor.GetRed();
+                    if ( bGreys )
+                        continue;
                     *pTmp++ = aColor.GetGreen();
                     *pTmp++ = aColor.GetBlue();
 #endif
@@ -711,20 +716,43 @@ BOOL JPEGWriter::Write( const Graphic& rGraphic )
 
     pAcc = aGraphicBmp.AcquireReadAccess();
 
+    if ( !bGreys )  // bitmap was not explicitely converted into greyscale,
+    {               // check if source is greyscale only
+
+        sal_Bool bIsGrey = sal_True;
+
+        long nWidth = pAcc->Width();
+        for ( long nY = 0; bIsGrey && ( nY < pAcc->Height() ); nY++ )
+        {
+            BitmapColor aColor;
+            for( long nX = 0L; bIsGrey && ( nX < nWidth ); nX++ )
+            {
+                aColor = pAcc->HasPalette() ? pAcc->GetPaletteColor( (BYTE) pAcc->GetPixel( nY, nX ) )
+                                            : pAcc->GetPixel( nY, nX );
+                bIsGrey = ( aColor.GetRed() == aColor.GetGreen() ) && ( aColor.GetRed() == aColor.GetBlue() );
+            }
+        }
+        if ( bIsGrey )
+            bGreys = sal_True;
+    }
+
     if( pAcc )
     {
+        if ( bGreys )
+            bNative = ( pAcc->GetScanlineFormat() == BMP_FORMAT_8BIT_PAL );
+        else
 #ifndef SYSTEM_JPEG
-        bNative = ( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_BGR );
+            bNative = ( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_BGR );
 #else
-        bNative = ( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB );
+            bNative = ( pAcc->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB );
 #endif
 
         if( !bNative )
-            pBuffer = new BYTE[ AlignedWidth4Bytes( pAcc->Width() * 24L ) ];
+            pBuffer = new BYTE[ AlignedWidth4Bytes( bGreys ? pAcc->Width() * 8L : pAcc->Width() * 24L ) ];
 
         JPEGCallbackStruct aCallbackData;
         aCallbackData.xStatusIndicator = xStatusIndicator;
-        bRet = (BOOL) WriteJPEG( this, &rOStm, pAcc->Width(), pAcc->Height(), nQuality, &aCallbackData );
+        bRet = (BOOL) WriteJPEG( this, &rOStm, pAcc->Width(), pAcc->Height(), bGreys, nQuality, &aCallbackData );
 
         delete[] pBuffer;
         pBuffer = NULL;
diff --git a/svtools/source/filter.vcl/jpeg/jpeg.h b/svtools/source/filter.vcl/jpeg/jpeg.h
index eaeaa503b5e9..deb06600474c 100644
--- a/svtools/source/filter.vcl/jpeg/jpeg.h
+++ b/svtools/source/filter.vcl/jpeg/jpeg.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: jpeg.h,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,7 +61,7 @@ void*   JPEGMalloc( size_t size );
 void    JPEGFree( void *ptr );
 long    JPEGCallback( void* pCallbackData, long nPercent );
 
-long    WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight,
+long    WriteJPEG( void* pJPEGWriter, void* pOStm, long nWidth, long nHeight, long bGreyScale,
                    long nQualityPercent, void* pCallbackData );
 void*   GetScanline( void* pJPEGWriter, long nY );
 
diff --git a/svtools/source/filter.vcl/jpeg/jpegc.c b/svtools/source/filter.vcl/jpeg/jpegc.c
index 84394d945f79..78602556097b 100644
--- a/svtools/source/filter.vcl/jpeg/jpegc.c
+++ b/svtools/source/filter.vcl/jpeg/jpegc.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: jpegc.c,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -182,7 +179,7 @@ Exit:
 }
 
 long WriteJPEG( void* pJPEGWriter, void* pOStm,
-                long nWidth, long nHeight,
+                long nWidth, long nHeight, long bGreys,
                 long nQualityPercent, void* pCallbackData )
 {
     struct jpeg_compress_struct cinfo;
@@ -208,8 +205,16 @@ long WriteJPEG( void* pJPEGWriter, void* pOStm,
 
     cinfo.image_width = (JDIMENSION) nWidth;
     cinfo.image_height = (JDIMENSION) nHeight;
-    cinfo.input_components = 3;
-    cinfo.in_color_space = JCS_RGB;
+    if ( bGreys )
+    {
+        cinfo.input_components = 1;
+        cinfo.in_color_space = JCS_GRAYSCALE;
+    }
+    else
+    {
+        cinfo.input_components = 3;
+        cinfo.in_color_space = JCS_RGB;
+    }
 
     jpeg_set_defaults( &cinfo );
     jpeg_set_quality( &cinfo, (int) nQualityPercent, FALSE );
diff --git a/svtools/source/filter.vcl/jpeg/makefile.mk b/svtools/source/filter.vcl/jpeg/makefile.mk
index 7a9b5fc509c9..653ca77ed7eb 100644
--- a/svtools/source/filter.vcl/jpeg/makefile.mk
+++ b/svtools/source/filter.vcl/jpeg/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/svtools/source/filter.vcl/wmf/emfwr.cxx b/svtools/source/filter.vcl/wmf/emfwr.cxx
index e011dde1a0e8..f31fd4439e9f 100644
--- a/svtools/source/filter.vcl/wmf/emfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/emfwr.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: emfwr.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -165,6 +162,8 @@
 #define TA_RTLREADING                       256
 #define TA_MASK     (TA_BASELINE+TA_CENTER+TA_UPDATECP+TA_RTLREADING)
 
+#define MM_ANISOTROPIC                      8
+
 // -------------
 // - EMFWriter -
 // -------------
@@ -184,19 +183,37 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
     maVDev.SetMapMode( rMtf.GetPrefMapMode() );
     mpFilterConfigItem = pFilterConfigItem;
 
+    // don't work with pixel as destination map mode -> higher resolution preferrable
+    maDestMapMode.SetMapUnit( MAP_100TH_MM );
+
     const Size aMtfSizePix( maVDev.LogicToPixel( rMtf.GetPrefSize(), rMtf.GetPrefMapMode() ) );
     const Size aMtfSizeLog( maVDev.LogicToLogic( rMtf.GetPrefSize(), rMtf.GetPrefMapMode(), MAP_100TH_MM ) );
 
     // seek over header
-    rOStm.SeekRel( 100 );
+    // use [MS-EMF 2.2.11] HeaderExtension2 Object, otherwise resulting EMF cannot be converted with GetWinMetaFileBits()
+    rOStm.SeekRel( 108 );
 
     // write initial values
-    ImplBeginRecord( WIN_EMR_SETWINDOWORGEX );
-    (*mpStm) << (INT32) 0 << (INT32) 0;
+
+    // set 100th mm map mode in EMF
+    ImplBeginRecord( WIN_EMR_SETMAPMODE );
+    (*mpStm) << (INT32) MM_ANISOTROPIC;
+    ImplEndRecord();
+
+    ImplBeginRecord( WIN_EMR_SETVIEWPORTEXTEX );
+    (*mpStm) << (INT32) maVDev.ImplGetDPIX() << (INT32) maVDev.ImplGetDPIY();
     ImplEndRecord();
 
     ImplBeginRecord( WIN_EMR_SETWINDOWEXTEX );
-    (*mpStm) << (INT32) aMtfSizePix.Width() << (INT32) aMtfSizePix.Height();
+    (*mpStm) << (INT32) 2540 << (INT32) 2540;
+    ImplEndRecord();
+
+    ImplBeginRecord( WIN_EMR_SETVIEWPORTORGEX );
+    (*mpStm) << (INT32) 0 << (INT32) 0;
+    ImplEndRecord();
+
+    ImplBeginRecord( WIN_EMR_SETWINDOWORGEX );
+    (*mpStm) << (INT32) 0 << (INT32) 0;
     ImplEndRecord();
 
     ImplWriteRasterOp( ROP_OVERPAINT );
@@ -210,7 +227,7 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
 
     ImplBeginRecord( WIN_EMR_EOF );
     (*mpStm)<< (sal_uInt32)0        // nPalEntries
-            << (sal_uInt32)0x16     // offPalEntries
+            << (sal_uInt32)0x10     // offPalEntries
             << (sal_uInt32)0x14;    // nSizeLast
     ImplEndRecord();
 
@@ -218,14 +235,15 @@ BOOL EMFWriter::WriteEMF( const GDIMetaFile& rMtf, SvStream& rOStm, FilterConfig
     // write header
     const ULONG nEndPos = mpStm->Tell(); mpStm->Seek( nHeaderPos );
 
-    (*mpStm) << (UINT32) 0x00000001 << (UINT32) 100;
-    (*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizePix.Width() - 1 ) << (INT32) ( aMtfSizePix.Height() - 1 );
-    (*mpStm) << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizeLog.Width() - 1 ) << (INT32) ( aMtfSizeLog.Height() - 1 );
-    (*mpStm) << (UINT32) 0x464d4520 << (UINT32) 0x10000 << (UINT32) ( nEndPos - nHeaderPos );
-    (*mpStm) << (UINT32) mnRecordCount << (UINT16) ( mnHandleCount + 1 ) << (UINT16) 0 << (UINT32) 0 << (UINT32) 0 << (UINT32) 0;
-    (*mpStm) << (INT32) aMtfSizePix.Width() << (INT32) aMtfSizePix.Height();
-    (*mpStm) << (INT32) ( aMtfSizeLog.Width() / 100 ) << (INT32) ( aMtfSizeLog.Height() / 100 );
-    (*mpStm) << (UINT32) 0 << (UINT32) 0 << (UINT32) 0;
+    (*mpStm) << (UINT32) 0x00000001 << (UINT32) 108 //use [MS-EMF 2.2.11] HeaderExtension2 Object
+             << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizePix.Width() - 1 ) << (INT32) ( aMtfSizePix.Height() - 1 )
+             << (INT32) 0 << (INT32) 0 << (INT32) ( aMtfSizeLog.Width() - 1 ) << (INT32) ( aMtfSizeLog.Height() - 1 )
+             << (UINT32) 0x464d4520 << (UINT32) 0x10000 << (UINT32) ( nEndPos - nHeaderPos )
+             << (UINT32) mnRecordCount << (UINT16) ( mnHandleCount + 1 ) << (UINT16) 0 << (UINT32) 0 << (UINT32) 0 << (UINT32) 0
+             << (INT32) aMtfSizePix.Width() << (INT32) aMtfSizePix.Height()
+             << (INT32) ( aMtfSizeLog.Width() / 100 ) << (INT32) ( aMtfSizeLog.Height() / 100 )
+             << (UINT32) 0 << (UINT32) 0 << (UINT32) 0
+             << (INT32) (  aMtfSizeLog.Width() * 10 ) << (INT32) ( aMtfSizeLog.Height() * 10 ); //use [MS-EMF 2.2.11] HeaderExtension2 Object
 
     mpStm->Seek( nEndPos );
     delete[] mpHandlesUsed;
@@ -523,35 +541,32 @@ void EMFWriter::ImplWriteRasterOp( RasterOp eRop )
 
 void EMFWriter::ImplWriteExtent( long nExtent )
 {
-    const Size aSize( maVDev.LogicToPixel( Size( nExtent, nExtent ) ) );
-    (*mpStm) << (INT32) aSize.Width();
+    nExtent = maVDev.LogicToLogic( Size( nExtent, 0 ), maVDev.GetMapMode(), maDestMapMode ).Width();
+    (*mpStm) << (INT32) nExtent;
 }
 
 // -----------------------------------------------------------------------------
 
 void EMFWriter::ImplWritePoint( const Point& rPoint )
 {
-    const Point aPoint( maVDev.LogicToPixel( rPoint ) );
-
-    (*mpStm) << (INT32) aPoint.X() << (INT32) aPoint.Y();
+    const Point aPoint( maVDev.LogicToLogic( rPoint, maVDev.GetMapMode(), maDestMapMode ));
+     (*mpStm) << (INT32) aPoint.X() << (INT32) aPoint.Y();
 }
 
 // -----------------------------------------------------------------------------
 
 void EMFWriter::ImplWriteSize( const Size& rSize)
 {
-    const Size aSize( maVDev.LogicToPixel( rSize ) );
-
-    (*mpStm) << (INT32) aSize.Width() << (INT32) aSize.Height();
+    const Size aSize( maVDev.LogicToLogic( rSize, maVDev.GetMapMode(), maDestMapMode ));
+     (*mpStm) << (INT32) aSize.Width() << (INT32) aSize.Height();
 }
 
 // -----------------------------------------------------------------------------
 
 void EMFWriter::ImplWriteRect( const Rectangle& rRect )
 {
-    const Rectangle aRect( maVDev.LogicToPixel( rRect ) );
-
-    (*mpStm) << aRect.Left() << aRect.Top() << aRect.Right() << aRect.Bottom();
+    const Rectangle aRect( maVDev.LogicToLogic ( rRect, maVDev.GetMapMode(), maDestMapMode ));
+     (*mpStm) << aRect.Left() << aRect.Top() << aRect.Right() << aRect.Bottom();
 }
 
 // -----------------------------------------------------------------------------
@@ -650,12 +665,20 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
         const Polygon& rPoly = rPolyPoly[ i ];
         while ( n < rPoly.GetSize() )
         {
-            sal_uInt16 nBezPoints = 0;
-            if ( n )
+            if( n == 0 )
             {
-                while ( ( ( nBezPoints + n + 2 ) < rPoly.GetSize() ) && ( rPoly.GetFlags( nBezPoints + n ) == POLY_CONTROL ) )
-                    nBezPoints += 3;
+                ImplBeginRecord( WIN_EMR_MOVETOEX );
+                ImplWritePoint( rPoly[ 0 ] );
+                ImplEndRecord();
+                n++;
+                continue;
             }
+
+            sal_uInt16 nBezPoints = 0;
+
+            while ( ( ( nBezPoints + n + 2 ) < rPoly.GetSize() ) && ( rPoly.GetFlags( nBezPoints + n ) == POLY_CONTROL ) )
+                nBezPoints += 3;
+
             if ( nBezPoints )
             {
                 ImplBeginRecord( WIN_EMR_POLYBEZIERTO );
@@ -675,22 +698,26 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
                 sal_uInt16 nPoints = 1;
                 while( ( nPoints + n ) < rPoly.GetSize() && ( rPoly.GetFlags( nPoints + n ) != POLY_CONTROL ) )
                     nPoints++;
-                ImplBeginRecord( WIN_EMR_MOVETOEX );
-                ImplWritePoint( rPoly[ n ] );
-                ImplEndRecord();
+
                 if ( nPoints > 1 )
                 {
                     ImplBeginRecord( WIN_EMR_POLYLINETO );
-                    Polygon aNewPoly( nPoints );
-                    aNewPoly[ 0 ] = rPoly[ n ];
-                    for ( o = 1; o < nPoints; o++ )
-                        aNewPoly[ o ] = rPoly[ n + o ];
+                    Polygon aNewPoly( nPoints + 1 );
+                    aNewPoly[ 0 ] = rPoly[ n - 1];
+                    for ( o = 1; o <= nPoints; o++ )
+                        aNewPoly[ o ] = rPoly[ n - 1 + o ];
                     ImplWriteRect( aNewPoly.GetBoundRect() );
-                    (*mpStm) << (sal_uInt32)( nPoints - 1 );
+                    (*mpStm) << (sal_uInt32)( nPoints );
                     for( o = 1; o < aNewPoly.GetSize(); o++ )
                         ImplWritePoint( aNewPoly[ o ] );
                     ImplEndRecord();
                 }
+                else
+                {
+                    ImplBeginRecord( WIN_EMR_LINETO );
+                    ImplWritePoint( rPoly[ n ] );
+                    ImplEndRecord();
+                }
                 n = n + nPoints;
             }
             if ( bClosed && ( n == rPoly.GetSize() ) )
@@ -703,6 +730,7 @@ void EMFWriter::ImplWritePath( const PolyPolygon& rPolyPoly, sal_Bool bClosed )
     ImplBeginRecord( WIN_EMR_ENDPATH );
     ImplEndRecord();
     ImplBeginRecord( bClosed ? WIN_EMR_FILLPATH : WIN_EMR_STROKEPATH );
+    ImplWriteRect( rPolyPoly.GetBoundRect() );
     ImplEndRecord();
 }
 
diff --git a/svtools/source/filter.vcl/wmf/emfwr.hxx b/svtools/source/filter.vcl/wmf/emfwr.hxx
index 2d3c8801ba49..6334b5dfe16f 100644
--- a/svtools/source/filter.vcl/wmf/emfwr.hxx
+++ b/svtools/source/filter.vcl/wmf/emfwr.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: emfwr.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -50,6 +47,7 @@ class EMFWriter
 private:
 
     VirtualDevice       maVDev;
+    MapMode             maDestMapMode;
     FilterConfigItem*   mpFilterConfigItem;
     SvStream*           mpStm;
     BOOL*               mpHandlesUsed;
diff --git a/svtools/source/filter.vcl/wmf/enhwmf.cxx b/svtools/source/filter.vcl/wmf/enhwmf.cxx
index db12dab82cbd..1e49e0d61446 100644
--- a/svtools/source/filter.vcl/wmf/enhwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/enhwmf.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: enhwmf.cxx,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/svtools/source/filter.vcl/wmf/makefile.mk b/svtools/source/filter.vcl/wmf/makefile.mk
index d0354924f483..5c9412bc8387 100644
--- a/svtools/source/filter.vcl/wmf/makefile.mk
+++ b/svtools/source/filter.vcl/wmf/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/filter.vcl/wmf/winmtf.cxx b/svtools/source/filter.vcl/wmf/winmtf.cxx
index 6f1caae18750..21f6e69c8d9e 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.cxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.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: winmtf.cxx,v $
- * $Revision: 1.54.136.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1522,9 +1519,9 @@ void WinMtfOutput::DrawText( Point& rPosition, String& rText, sal_Int32* pDXArry
     aTmp.SetFillColor( maBkColor );
 
     if( mnBkMode == TRANSPARENT )
-        maFont.SetTransparent( sal_True );
+        aTmp.SetTransparent( sal_True );
     else
-        maFont.SetTransparent( sal_False );
+        aTmp.SetTransparent( sal_False );
 
     if ( ( mnTextAlign & TA_BASELINE) == TA_BASELINE )
         aTmp.SetAlign( ALIGN_BASELINE );
@@ -2195,3 +2192,8 @@ void WinMtfOutput::Pop()
     }
 }
 
+void WinMtfOutput::AddFromGDIMetaFile( GDIMetaFile& rGDIMetaFile )
+{
+   rGDIMetaFile.Play( *mpGDIMetaFile, 0xFFFFFFFF );
+}
+
diff --git a/svtools/source/filter.vcl/wmf/winmtf.hxx b/svtools/source/filter.vcl/wmf/winmtf.hxx
index ada590a19675..beb1f62e22d6 100644
--- a/svtools/source/filter.vcl/wmf/winmtf.hxx
+++ b/svtools/source/filter.vcl/wmf/winmtf.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: winmtf.hxx,v $
- * $Revision: 1.34.134.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -672,6 +669,7 @@ class WinMtfOutput
         void                MoveClipRegion( const Size& rSize );
         void                SetClipPath( const PolyPolygon& rPolyPoly, sal_Int32 nClippingMode, sal_Bool bIsMapped );
         void                UpdateClipRegion();
+        void                AddFromGDIMetaFile( GDIMetaFile& rGDIMetaFile );
 
                             WinMtfOutput( GDIMetaFile& rGDIMetaFile );
         virtual             ~WinMtfOutput();
@@ -734,6 +732,18 @@ private:
     UINT16          nUnitsPerInch;
     sal_uInt32      nRecSize;
 
+    // embedded EMF data
+    SvMemoryStream* pEMFStream;
+
+    // total number of comment records containing EMF data
+    sal_uInt32      nEMFRecCount;
+
+    // number of EMF records read
+    sal_uInt32      nEMFRec;
+
+    // total size of embedded EMF data
+    sal_uInt32      nEMFSize;
+
     sal_uInt32      nSkipActions;
     sal_uInt32      nCurrentAction;
     sal_uInt32      nUnicodeEscapeAction;
@@ -755,6 +765,8 @@ public:
                     WMFReader( SvStream& rStreamWMF, GDIMetaFile& rGDIMetaFile, FilterConfigItem* pConfigItem = NULL )
                         : WinMtf( new WinMtfOutput( rGDIMetaFile ), rStreamWMF, pConfigItem ) {};
 
+                    ~WMFReader();
+
     // Liesst aus dem Stream eine WMF-Datei und fuellt das GDIMetaFile
     void            ReadWMF();
 };
diff --git a/svtools/source/filter.vcl/wmf/winwmf.cxx b/svtools/source/filter.vcl/wmf/winwmf.cxx
index 0930b0ece8a8..f7c4f51ce1e2 100644
--- a/svtools/source/filter.vcl/wmf/winwmf.cxx
+++ b/svtools/source/filter.vcl/wmf/winwmf.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: winwmf.cxx,v $
- * $Revision: 1.36.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,6 +29,7 @@
 #include "precompiled_svtools.hxx"
 
 #include "winmtf.hxx"
+#include <vcl/gdimtf.hxx>
 #include <rtl/crc.h>
 #include <rtl/tencinfo.h>
 #include <osl/endian.h>
@@ -831,81 +829,136 @@ void WMFReader::ReadRecordParams( USHORT nFunc )
                 pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR );
                 break;
             }
-            if ( nRecSize >= 12 )   // minimal escape lenght
+            if ( nRecSize >= 4 )    // minimal escape lenght
             {
-                sal_uInt16  nMode, nLen, OO;
-                sal_uInt32  Magic, nCheck,nEsc;
+                sal_uInt16  nMode, nLen;
                 *pWMF >> nMode
-                      >> nLen
-                      >> OO
-                      >> Magic
-                      >> nCheck
-                      >> nEsc;
-                if ( ( nMode == W_MFCOMMENT ) && ( nLen >= 14 ) && ( OO == 0x4f4f ) && ( Magic == 0xa2c2a ) )
+                      >> nLen;
+                if ( ( nMode == W_MFCOMMENT ) && ( nLen >= 4 ) )
                 {
-                    sal_uInt32 nEscLen = nLen - 14;
-                    if ( nEscLen <= ( nRecSize * 2 ) )
+                    sal_uInt32 nNewMagic; // we have to read int32 for
+                    *pWMF >> nNewMagic;   // META_ESCAPE_ENHANCED_METAFILE CommentIdentifier
+
+                    if( nNewMagic == 0x2c2a4f4f &&  nLen >= 14 )
                     {
+                        sal_uInt16 nMagic2;
+                        *pWMF >> nMagic2;
+                        if( nMagic2 == 0x0a ) // 2nd half of magic
+                        {                     // continue with private escape
+                            sal_uInt32 nCheck, nEsc;
+                            *pWMF >> nCheck
+                                  >> nEsc;
+
+                            sal_uInt32 nEscLen = nLen - 14;
+                            if ( nEscLen <= ( nRecSize * 2 ) )
+                            {
 #ifdef OSL_BIGENDIAN
-                        sal_uInt32 nTmp = SWAPLONG( nEsc );
-                        sal_uInt32 nCheckSum = rtl_crc32( 0, &nTmp, 4 );
+                                sal_uInt32 nTmp = SWAPLONG( nEsc );
+                                sal_uInt32 nCheckSum = rtl_crc32( 0, &nTmp, 4 );
 #else
-                        sal_uInt32 nCheckSum = rtl_crc32( 0, &nEsc, 4 );
+                                sal_uInt32 nCheckSum = rtl_crc32( 0, &nEsc, 4 );
 #endif
-                        sal_Int8* pData = NULL;
+                                sal_Int8* pData = NULL;
 
-                        if ( ( static_cast< sal_uInt64 >( nEscLen ) + pWMF->Tell() ) > nMetaRecEndPos )
-                        {
-                            pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR );
-                            break;
-                        }
-                        if ( nEscLen > 0 )
-                        {
-                            pData = new sal_Int8[ nEscLen ];
-                            pWMF->Read( pData, nEscLen );
-                            nCheckSum = rtl_crc32( nCheckSum, pData, nEscLen );
-                        }
-                        if ( nCheck == nCheckSum )
-                        {
-                            switch( nEsc )
-                            {
-                                case PRIVATE_ESCAPE_UNICODE :
-                                {   // we will use text instead of polygons only if we have the correct font
-                                    if ( aVDev.IsFontAvailable( pOut->GetFont().GetName() ) )
+                                if ( ( static_cast< sal_uInt64 >( nEscLen ) + pWMF->Tell() ) > nMetaRecEndPos )
+                                {
+                                    pWMF->SetError( SVSTREAM_FILEFORMAT_ERROR );
+                                    break;
+                                }
+                                if ( nEscLen > 0 )
+                                {
+                                    pData = new sal_Int8[ nEscLen ];
+                                    pWMF->Read( pData, nEscLen );
+                                    nCheckSum = rtl_crc32( nCheckSum, pData, nEscLen );
+                                }
+                                if ( nCheck == nCheckSum )
+                                {
+                                    switch( nEsc )
                                     {
-                                        Point  aPt;
-                                        String aString;
-                                        sal_uInt32  i, nStringLen, nDXCount;
-                                        sal_Int32* pDXAry = NULL;
-                                        SvMemoryStream aMemoryStream( nEscLen );
-                                        aMemoryStream.Write( pData, nEscLen );
-                                        aMemoryStream.Seek( STREAM_SEEK_TO_BEGIN );
-                                        aMemoryStream >> aPt.X()
-                                                      >> aPt.Y()
-                                                      >> nStringLen;
-
-                                        if ( ( static_cast< sal_uInt64 >( nStringLen ) * sizeof( sal_Unicode ) ) < ( nEscLen - aMemoryStream.Tell() ) )
-                                        {
-                                            sal_Unicode* pBuf = aString.AllocBuffer( (xub_StrLen)nStringLen );
-                                            for ( i = 0; i < nStringLen; i++ )
-                                                aMemoryStream >> pBuf[ i ];
-                                            aMemoryStream >> nDXCount;
-                                            if ( ( static_cast< sal_uInt64 >( nDXCount ) * sizeof( sal_Int32 ) ) >= ( nEscLen - aMemoryStream.Tell() ) )
-                                                nDXCount = 0;
-                                            if ( nDXCount )
-                                                pDXAry = new sal_Int32[ nDXCount ];
-                                            for  ( i = 0; i < nDXCount; i++ )
-                                                aMemoryStream >> pDXAry[ i ];
-                                            aMemoryStream >> nSkipActions;
-                                            pOut->DrawText( aPt, aString, pDXAry );
-                                            delete[] pDXAry;
+                                        case PRIVATE_ESCAPE_UNICODE :
+                                        {   // we will use text instead of polygons only if we have the correct font
+                                            if ( aVDev.IsFontAvailable( pOut->GetFont().GetName() ) )
+                                            {
+                                                Point  aPt;
+                                                String aString;
+                                                sal_uInt32  i, nStringLen, nDXCount;
+                                                sal_Int32* pDXAry = NULL;
+                                                SvMemoryStream aMemoryStream( nEscLen );
+                                                aMemoryStream.Write( pData, nEscLen );
+                                                aMemoryStream.Seek( STREAM_SEEK_TO_BEGIN );
+                                                aMemoryStream >> aPt.X()
+                                                              >> aPt.Y()
+                                                              >> nStringLen;
+
+                                                if ( ( static_cast< sal_uInt64 >( nStringLen ) * sizeof( sal_Unicode ) ) < ( nEscLen - aMemoryStream.Tell() ) )
+                                                {
+                                                    sal_Unicode* pBuf = aString.AllocBuffer( (xub_StrLen)nStringLen );
+                                                    for ( i = 0; i < nStringLen; i++ )
+                                                        aMemoryStream >> pBuf[ i ];
+                                                    aMemoryStream >> nDXCount;
+                                                    if ( ( static_cast< sal_uInt64 >( nDXCount ) * sizeof( sal_Int32 ) ) >= ( nEscLen - aMemoryStream.Tell() ) )
+                                                        nDXCount = 0;
+                                                    if ( nDXCount )
+                                                        pDXAry = new sal_Int32[ nDXCount ];
+                                                    for  ( i = 0; i < nDXCount; i++ )
+                                                        aMemoryStream >> pDXAry[ i ];
+                                                    aMemoryStream >> nSkipActions;
+                                                    pOut->DrawText( aPt, aString, pDXAry );
+                                                    delete[] pDXAry;
+                                                }
+                                            }
                                         }
+                                        break;
                                     }
                                 }
-                                break;
+                                delete[] pData;
+                            }
+                        }
+                    }
+                    else if ( (nNewMagic == static_cast< sal_uInt32 >(0x43464D57)) && (nLen >= 34) && ( (sal_Int32)(nLen + 10) <= (sal_Int32)(nRecSize * 2) ))
+                    {
+                        sal_uInt32 nComType, nVersion, nFlags, nComRecCount,
+                                   nCurRecSize, nRemainingSize, nEMFTotalSize;
+                        sal_uInt16 nCheck;
+
+                        *pWMF >> nComType >> nVersion >> nCheck >> nFlags
+                              >> nComRecCount >> nCurRecSize
+                              >> nRemainingSize >> nEMFTotalSize; // the nRemainingSize is not mentioned in MSDN documentation
+                                                                  // but it seems to be required to read in data produced by OLE
+
+                        if( nComType == 0x01 && nVersion == 0x10000 && nComRecCount )
+                        {
+                            if( !nEMFRec )
+                            {   // first EMF comment
+                                nEMFRecCount    = nComRecCount;
+                                nEMFSize        = nEMFTotalSize;
+                                pEMFStream = new SvMemoryStream( nEMFSize );
+                            }
+                            else if( ( nEMFRecCount != nComRecCount ) || ( nEMFSize != nEMFTotalSize ) ) // add additional checks here
+                            {
+                                // total records should be the same as in previous comments
+                                nEMFRecCount = 0xFFFFFFFF;
+                                delete pEMFStream;
+                                pEMFStream = NULL;
+                            }
+                            nEMFRec++;
+
+                            if( pEMFStream && nCurRecSize + 34 > nLen )
+                            {
+                                nEMFRecCount = 0xFFFFFFFF;
+                                delete pEMFStream;
+                                pEMFStream = NULL;
+                            }
+
+                            if( pEMFStream )
+                            {
+                                sal_Int8* pBuf = new sal_Int8[ nCurRecSize ];
+                                sal_uInt32 nCount = pWMF->Read( pBuf, nCurRecSize );
+                                if( nCount == nCurRecSize )
+                                    pEMFStream->Write( pBuf, nCount );
+                                delete[] pBuf;
                             }
                         }
-                        delete[] pData;
                     }
                 }
             }
@@ -1023,6 +1076,11 @@ void WMFReader::ReadWMF()
     nCurrentAction = 0;
     nUnicodeEscapeAction = 0;
 
+    pEMFStream      = NULL;
+    nEMFRecCount    = 0;
+    nEMFRec         = 0;
+    nEMFSize        = 0;
+
     pOut->SetMapMode( MM_ANISOTROPIC );
     pOut->SetWinOrg( Point() );
     pOut->SetWinExt( Size( 1, 1 ) );
@@ -1070,6 +1128,33 @@ void WMFReader::ReadWMF()
                     ReadRecordParams( nFunction );
                 else
                     nSkipActions--;
+
+                if( pEMFStream && nEMFRecCount == nEMFRec )
+                {
+                    GDIMetaFile aMeta;
+                    pEMFStream->Seek( 0 );
+                    EnhWMFReader* pEMFReader = new EnhWMFReader ( *pEMFStream, aMeta );
+                    BOOL bRead = pEMFReader->ReadEnhWMF();
+                    delete pEMFReader; // destroy first!!!
+
+                    if( bRead )
+                    {
+                       pOut->AddFromGDIMetaFile( aMeta );
+                       pOut->SetrclFrame( Rectangle(0, 0, aMeta.GetPrefSize().Width(), aMeta.GetPrefSize().Height() ));
+                       // we have successfully read the embedded EMF data
+                       // no need to process WMF data further
+                       break;
+                    }
+                    else
+                    {
+                        // something went wrong
+                        // continue with WMF, don't try this again
+                        delete pEMFStream;
+                        pEMFStream = NULL;
+                    }
+
+                }
+
                 nPos += nRecSize * 2;
                 if ( nPos <= nEndPos )
                     pWMF->Seek( nPos  );
@@ -1333,3 +1418,9 @@ sal_Bool WMFReader::GetPlaceableBound( Rectangle& rPlaceableBound, SvStream* pSt
     return bRet;
 }
 
+WMFReader::~WMFReader()
+{
+    if( pEMFStream )
+        delete pEMFStream;
+}
+
diff --git a/svtools/source/filter.vcl/wmf/wmf.cxx b/svtools/source/filter.vcl/wmf/wmf.cxx
index 97e77d3256ac..25ca9f721b33 100644
--- a/svtools/source/filter.vcl/wmf/wmf.cxx
+++ b/svtools/source/filter.vcl/wmf/wmf.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: wmf.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/svtools/source/filter.vcl/wmf/wmfwr.cxx b/svtools/source/filter.vcl/wmf/wmfwr.cxx
index 30d4ff06c0d2..4dff9732c7d0 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.cxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.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: wmfwr.cxx,v $
- * $Revision: 1.31 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,6 +31,7 @@
 #include <vcl/salbtype.hxx>
 #include "wmfwr.hxx"
 #include <unotools/fontcvt.hxx>
+#include "emfwr.hxx"
 #include <rtl/crc.h>
 #include <rtl/tencinfo.h>
 #include <tools/tenccvt.hxx>
@@ -1875,6 +1873,7 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
 {
     WMFWriterAttrStackMember * pAt;
 
+    bEmbedEMF = TRUE;
     bStatus=TRUE;
     pConvert = 0;
     pVirDev = new VirtualDevice;
@@ -1938,6 +1937,8 @@ BOOL WMFWriter::WriteWMF( const GDIMetaFile& rMTF, SvStream& rTargetStream,
     CountActionsAndBitmaps(rMTF);
 
     WriteHeader(rMTF,bPlaceable);
+    if( bEmbedEMF )
+        WriteEmbeddedEMF( rMTF );
     WMFRecord_SetWindowOrg(Point(0,0));
     WMFRecord_SetWindowExt(rMTF.GetPrefSize());
     WMFRecord_SetBkMode( TRUE );
@@ -2016,3 +2017,80 @@ USHORT WMFWriter::CalcSaveTargetMapMode(MapMode& rMapMode,
 
     return nDivisor;
 }
+
+// ------------------------------------------------------------------------
+
+void WMFWriter::WriteEmbeddedEMF( const GDIMetaFile& rMTF )
+{
+    EMFWriter aEMFWriter;
+    SvMemoryStream aStream;
+
+    if( aEMFWriter.WriteEMF( rMTF, aStream ) )
+    {
+        sal_Size nTotalSize = aStream.Tell();
+        if( nTotalSize > SAL_MAX_UINT32 )
+            return;
+        aStream.Seek( 0 );
+        sal_uInt32 nRemainingSize = static_cast< sal_uInt32 >( nTotalSize );
+        sal_uInt32 nRecCounts = ( (nTotalSize - 1) / 0x2000 ) + 1;
+        sal_uInt16 nCheckSum = 0, nWord;
+
+        sal_uInt32 nPos = 0;
+
+        while( nPos + 1 < nTotalSize )
+        {
+            aStream >> nWord;
+            nCheckSum ^= nWord;
+            nPos += 2;
+        }
+
+        nCheckSum = static_cast< sal_uInt16 >( nCheckSum * -1 );
+
+        aStream.Seek( 0 );
+        while( nRemainingSize > 0 )
+        {
+            sal_uInt32 nCurSize;
+            if( nRemainingSize > 0x2000 )
+            {
+                nCurSize = 0x2000;
+                nRemainingSize -= 0x2000;
+            }
+            else
+            {
+                nCurSize = nRemainingSize;
+                nRemainingSize = 0;
+            }
+            WriteEMFRecord( aStream,
+                            nCurSize,
+                            nRemainingSize,
+                            nTotalSize,
+                            nRecCounts,
+                            nCheckSum );
+            nCheckSum = 0;
+        }
+    }
+}
+
+// ------------------------------------------------------------------------
+
+void WMFWriter::WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize, sal_uInt32 nRemainingSize,
+                sal_uInt32 nTotalSize, sal_uInt32 nRecCounts, sal_uInt16 nCheckSum )
+{
+   // according to http://msdn.microsoft.com/en-us/library/dd366152%28PROT.13%29.aspx
+   WriteRecordHeader( 0, W_META_ESCAPE );
+   *pWMF << (sal_uInt16)W_MFCOMMENT         // same as META_ESCAPE_ENHANCED_METAFILE
+          << (sal_uInt16)( nCurSize + 34 )  // we will always have a 34 byte escape header:
+          << (sal_uInt32) 0x43464D57        // WMFC
+          << (sal_uInt32) 0x00000001        // Comment type
+          << (sal_uInt32) 0x00010000        // version
+          << nCheckSum                      // check sum
+          << (sal_uInt32) 0                 // flags = 0
+          << nRecCounts                     // total number of records
+          << nCurSize                       // size of this record's data
+          << nRemainingSize                 // remaining size of data in following records, missing in MSDN documentation
+          << nTotalSize;                    // total size of EMF stream
+
+   pWMF->Write( static_cast< const sal_Char* >( rStream.GetData() ) + rStream.Tell(), nCurSize );
+   rStream.SeekRel( nCurSize );
+   UpdateRecordHeader();
+}
diff --git a/svtools/source/filter.vcl/wmf/wmfwr.hxx b/svtools/source/filter.vcl/wmf/wmfwr.hxx
index 03ca14e7633f..9fe698b22c2e 100644
--- a/svtools/source/filter.vcl/wmf/wmfwr.hxx
+++ b/svtools/source/filter.vcl/wmf/wmfwr.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: wmfwr.hxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -131,6 +128,8 @@ private:
     ULONG nWrittenBitmaps;  // Anzahl der bereits geschriebenen Bitmaps
     ULONG nActBitmapPercent; // Wieviel Prozent die naechste Bitmap schon geschrieben ist.
 
+    BOOL bEmbedEMF; // optionally embedd EMF data into WMF
+
     void MayCallback();
         // Berechnet anhand der obigen 5 Parameter eine Prozentzahl
         // und macht dann ggf. einen Callback. Setzt bStatus auf FALSE wenn User abbrechen
@@ -211,6 +210,13 @@ private:
     void WriteHeader(const GDIMetaFile & rMTF, BOOL bPlaceable);
     void UpdateHeader();
 
+    void WriteEmbeddedEMF( const GDIMetaFile& rMTF );
+    void WriteEMFRecord( SvMemoryStream& rStream, sal_uInt32 nCurSize,
+                            sal_uInt32 nRemainingSize,
+                            sal_uInt32 nTotalSize,
+                            sal_uInt32 nRecCounts,
+                            sal_uInt16 nCheckSum );
+
     USHORT CalcSaveTargetMapMode(MapMode& rMapMode, const Size& rPrefSize);
 
 public:
diff --git a/goodies/source/unographic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index c19318d6e11e..5db73e6cc2f3 100644
--- a/goodies/source/unographic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.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: descriptor.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
 
 #include "descriptor.hxx"
 
@@ -39,18 +36,11 @@
 #include <svtools/filter.hxx>
 #include <svl/itemprop.hxx>
 
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_
 #include <com/sun/star/beans/PropertyState.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HDL_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_SIZE_HDL_
 #include <com/sun/star/awt/Size.hpp>
-#endif
-#ifndef _COM_SUN_STAR_GRAPHIC_GRAPHICTYPE_HDL_
 #include <com/sun/star/graphic/GraphicType.hpp>
-#endif
+
 #include "vcl/graph.hxx"
 #include "vcl/svapp.hxx"
 
diff --git a/goodies/source/unographic/descriptor.hxx b/svtools/source/graphic/descriptor.hxx
index 5bbb982846ff..bed7c64c0411 100644
--- a/goodies/source/unographic/descriptor.hxx
+++ b/svtools/source/graphic/descriptor.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: descriptor.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/goodies/source/unographic/graphic.cxx b/svtools/source/graphic/graphic.cxx
index ed40de4dcc55..52c03c611241 100644
--- a/goodies/source/unographic/graphic.cxx
+++ b/svtools/source/graphic/graphic.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: graphic.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,18 +26,13 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
+
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
-#ifndef _SV_SVAPP_HXX_
 #include <vcl/svapp.hxx>
-#endif
 #include <com/sun/star/graphic/GraphicType.hpp>
-
-#ifndef _COM_SUN_STAR_GRAPHIC_XGRAPHICTRANSOFMER_HPP_
 #include <com/sun/star/graphic/XGraphicTransformer.hpp>
-#endif
-
 #include <vcl/graph.hxx>
 #include "graphic.hxx"
 
diff --git a/goodies/source/unographic/graphic.hxx b/svtools/source/graphic/graphic.hxx
index a7687458be19..1a6594a3e543 100644
--- a/goodies/source/unographic/graphic.hxx
+++ b/svtools/source/graphic/graphic.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: graphic.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/goodies/source/unographic/graphicunofactory.cxx b/svtools/source/graphic/graphicunofactory.cxx
index cdf9c51bf601..f29b34b66743 100644
--- a/goodies/source/unographic/graphicunofactory.cxx
+++ b/svtools/source/graphic/graphicunofactory.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: graphicunofactory.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
@@ -28,14 +25,14 @@
  *
  ************************************************************************/
 
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
+
 #include <comphelper/servicedecl.hxx>
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/graphic/XGraphicObject.hpp>
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
-#include "grfmgr.hxx"
+#include <svtools/grfmgr.hxx>
 
 using namespace com::sun::star;
 
diff --git a/goodies/source/graphic/grfattr.cxx b/svtools/source/graphic/grfattr.cxx
index f04011d9e6b0..757be42a104c 100644
--- a/goodies/source/graphic/grfattr.cxx
+++ b/svtools/source/graphic/grfattr.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: grfattr.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,10 +26,10 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
 
 #include <tools/vcompat.hxx>
-#include "grfmgr.hxx"
+#include <svtools/grfmgr.hxx>
 
 // ---------------
 // - GraphicAttr -
diff --git a/goodies/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx
index f0a41ceca53f..41240c95d113 100644
--- a/goodies/source/graphic/grfcache.cxx
+++ b/svtools/source/graphic/grfcache.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: grfcache.cxx,v $
- * $Revision: 1.23.38.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
 
 #include <vos/timer.hxx>
 #include <tools/debug.hxx>
diff --git a/goodies/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx
index 86b982b01498..55309a00827d 100644
--- a/goodies/source/graphic/grfcache.hxx
+++ b/svtools/source/graphic/grfcache.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: grfcache.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,7 +31,7 @@
 #include <tools/list.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/timer.hxx>
-#include "grfmgr.hxx"
+#include <svtools/grfmgr.hxx>
 
 // -----------------------
 // - GraphicManagerCache -
diff --git a/goodies/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 7f5970383075..53f4a3ed2515 100644
--- a/goodies/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.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: grfmgr.cxx,v $
- * $Revision: 1.36 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
 
 #define ENABLE_BYTESTRING_STREAM_OPERATORS
 
@@ -45,7 +42,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/salbtype.hxx>
 #include <unotools/cacheoptions.hxx>
-#include "grfmgr.hxx"
+#include <svtools/grfmgr.hxx>
 
 // -----------
 // - Defines -
@@ -1292,3 +1289,28 @@ SvStream& operator<<( SvStream& rOStm, const GraphicObject& rGraphicObj )
     return rOStm;
 }
 
+#define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
+
+GraphicObject GraphicObject::CreateGraphicObjectFromURL( const ::rtl::OUString &rURL )
+{
+    const String aURL( rURL ), aPrefix( RTL_CONSTASCII_STRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX) );
+    if( aURL.Search( aPrefix ) == 0 )
+    {
+        // graphic manager url
+        ByteString aUniqueID( String(rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 )), RTL_TEXTENCODING_UTF8 );
+        return GraphicObject( aUniqueID );
+    }
+    else
+    {
+        Graphic     aGraphic;
+        if ( aURL.Len() )
+        {
+            SvStream*   pStream = utl::UcbStreamHelper::CreateStream( aURL, STREAM_READ );
+            if( pStream )
+                GraphicConverter::Import( *pStream, aGraphic );
+        }
+
+        return GraphicObject( aGraphic );
+    }
+}
+
diff --git a/goodies/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx
index 2b7dc86f7149..7e1255aabc56 100644
--- a/goodies/source/graphic/grfmgr2.cxx
+++ b/svtools/source/graphic/grfmgr2.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: grfmgr2.cxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,7 +26,7 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
 
 #include <vos/macros.hxx>
 #include <vcl/bmpacc.hxx>
@@ -43,7 +40,7 @@
 #include <vcl/alpha.hxx>
 #include <vcl/virdev.hxx>
 #include "grfcache.hxx"
-#include "grfmgr.hxx"
+#include <svtools/grfmgr.hxx>
 
 // -----------
 // - defines -
diff --git a/goodies/source/unographic/makefile.mk b/svtools/source/graphic/makefile.mk
index 59196031f089..37870b46b80b 100755..100644
--- a/goodies/source/unographic/makefile.mk
+++ b/svtools/source/graphic/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.6.40.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,27 +27,33 @@
 
 PRJ=..$/..
 
-PRJNAME=goodies
-TARGET=unographic
-ENABLE_EXCEPTIONS=TRUE
+PRJNAME=svtools
+TARGET=graphic
 
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :  settings.mk
+.INCLUDE :  $(PRJ)$/util$/svt.pmk
 
-# --- Files --------------------------------------------------------
+.IF "$(GUI)"=="WIN"
+LINKFLAGS=$(LINKFLAGS) /PACKC:32768
+.ENDIF
 
-CXXFILES=							\
-            graphicuno.cxx			\
-            descriptor.cxx			\
-            provider.cxx			\
-            graphic.cxx				\
-            renderer.cxx			\
-            graphicunofactory.cxx			\
-            transformer.cxx
+# --- Files --------------------------------------------------------
 
 SLOFILES=							\
-            $(SLO)$/graphicuno.obj	\
+            $(SLO)$/grfattr.obj		\
+            $(SLO)$/grfmgr.obj		\
+            $(SLO)$/grfmgr2.obj		\
+            $(SLO)$/grfcache.obj	\
+            $(SLO)$/descriptor.obj	\
+            $(SLO)$/provider.obj	\
+            $(SLO)$/graphic.obj		\
+            $(SLO)$/renderer.obj	\
+            $(SLO)$/graphicunofactory.obj	\
+            $(SLO)$/transformer.obj
+
+EXCEPTIONSFILES=					\
             $(SLO)$/descriptor.obj	\
             $(SLO)$/provider.obj	\
             $(SLO)$/graphic.obj		\
diff --git a/goodies/source/unographic/provider.cxx b/svtools/source/graphic/provider.cxx
index 1f7de99d4473..fbf95406a63a 100644
--- a/goodies/source/unographic/provider.cxx
+++ b/svtools/source/graphic/provider.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: provider.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,15 +26,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
+
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
-#ifndef _SV_SVAPP_HXX_
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _SV_IMAGE_HXX_
 #include <vcl/image.hxx>
-#endif
 #include <vcl/metaact.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/imagerepository.hxx>
@@ -54,7 +48,7 @@
 
 #include "descriptor.hxx"
 #include "graphic.hxx"
-#include "grfmgr.hxx"
+#include <svtools/grfmgr.hxx>
 #include "provider.hxx"
 
 using namespace com::sun::star;
@@ -67,6 +61,11 @@ namespace unographic {
 // - GraphicProvider -
 // -------------------
 
+uno::Reference< uno::XInterface > SAL_CALL GraphicProvider_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& )
+{
+    return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicProvider );
+}
+
 GraphicProvider::GraphicProvider()
 {
 }
diff --git a/goodies/source/unographic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index d280ed832999..b8a0ea73b92c 100644
--- a/goodies/source/unographic/renderer.cxx
+++ b/svtools/source/graphic/renderer.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: renderer.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,27 +26,18 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
 
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYSTATE_HDL_
 #include <com/sun/star/beans/PropertyState.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HDL_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _COM_SUN_STAR_AWT_RECTANGLE_HDL_
 #include <com/sun/star/awt/Rectangle.hpp>
-#endif
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
-#ifndef _SV_SVAPP_HXX_
 #include <vcl/svapp.hxx>
-#endif
-
 #include <toolkit/helper/vclunohelper.hxx>
 #include <comphelper/propertysetinfo.hxx>
 #include <svl/itemprop.hxx>
-#include "grfmgr.hxx"
+#include <svtools/grfmgr.hxx>
 #include "graphic.hxx"
 #include "renderer.hxx"
 
@@ -65,6 +53,12 @@ namespace unographic {
 // - GraphicRendererVCL -
 // ---------------------
 
+uno::Reference< uno::XInterface > SAL_CALL GraphicRendererVCL_CreateInstance( const uno::Reference< lang::XMultiServiceFactory >& )
+{
+    return SAL_STATIC_CAST( ::cppu::OWeakObject*, new GraphicRendererVCL );
+}
+
+
 GraphicRendererVCL::GraphicRendererVCL() :
     ::comphelper::PropertySetHelper( createPropertySetInfo() ),
     mpOutDev( NULL )
diff --git a/goodies/source/unographic/transformer.cxx b/svtools/source/graphic/transformer.cxx
index 7e18c10cdd41..5c234c8d5ecb 100644
--- a/goodies/source/unographic/transformer.cxx
+++ b/svtools/source/graphic/transformer.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: transformer.cxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,15 +26,12 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_svtools.hxx"
+
 #include <rtl/uuid.h>
 #include <vos/mutex.hxx>
-#ifndef _SV_SVAPP_HXX_
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _SV_IMAGE_HXX_
 #include <vcl/image.hxx>
-#endif
 #include <vcl/metaact.hxx>
 #include <tools/rcid.h>
 #include <tools/resid.hxx>
diff --git a/goodies/source/unographic/transformer.hxx b/svtools/source/graphic/transformer.hxx
index 5de3acc7f2d5..c4002bb4bbae 100644
--- a/goodies/source/unographic/transformer.hxx
+++ b/svtools/source/graphic/transformer.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: transformer.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/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index f850b4b5b542..09dc7018dc42 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.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: documentcloser.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/svtools/source/hatchwindow/documentcloser.hxx b/svtools/source/hatchwindow/documentcloser.hxx
index 14198197b589..98e30b4d1683 100644
--- a/svtools/source/hatchwindow/documentcloser.hxx
+++ b/svtools/source/hatchwindow/documentcloser.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: documentcloser.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/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index 3e0703d9b8ad..1b84206d6696 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.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: hatchwindow.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/svtools/source/hatchwindow/hatchwindow.hxx b/svtools/source/hatchwindow/hatchwindow.hxx
index 4395784ce41c..fa3e70ee8901 100644
--- a/svtools/source/hatchwindow/hatchwindow.hxx
+++ b/svtools/source/hatchwindow/hatchwindow.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: hatchwindow.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/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index ced54dfd460a..f8dbddff3761 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.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: hatchwindowfactory.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/svtools/source/hatchwindow/hatchwindowfactory.hxx b/svtools/source/hatchwindow/hatchwindowfactory.hxx
index 72eaa58bb16d..9a59c7a95f6d 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.hxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.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: hatchwindowfactory.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/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index 2e8c763b666a..1beae4a54355 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.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: ipwin.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/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx
index 996e9713eccd..4c7cb6d88d36 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.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: ipwin.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/svtools/source/hatchwindow/makefile.mk b/svtools/source/hatchwindow/makefile.mk
index 8366763a81f9..c5a4dab09762 100644
--- a/svtools/source/hatchwindow/makefile.mk
+++ b/svtools/source/hatchwindow/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/inc/configitems/accessibilityoptions_const.hxx b/svtools/source/inc/configitems/accessibilityoptions_const.hxx
index 07dff55591a6..177edce8c3f0 100644
--- a/svtools/source/inc/configitems/accessibilityoptions_const.hxx
+++ b/svtools/source/inc/configitems/accessibilityoptions_const.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: accessibilityoptions_const.hxx,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/19 11: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.
  *
  ************************************************************************/
 
diff --git a/svtools/source/inc/filectrl.hrc b/svtools/source/inc/filectrl.hrc
index 13fb89afd382..1707e306e1b0 100644
--- a/svtools/source/inc/filectrl.hrc
+++ b/svtools/source/inc/filectrl.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: filectrl.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/svtools/source/inc/gifread.hxx b/svtools/source/inc/gifread.hxx
index 8a9d299930c9..de4c6935ef67 100644
--- a/svtools/source/inc/gifread.hxx
+++ b/svtools/source/inc/gifread.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: gifread.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/svtools/source/inc/gradwrap.hxx b/svtools/source/inc/gradwrap.hxx
index 28c9d8db1fcd..41887b67822a 100644
--- a/svtools/source/inc/gradwrap.hxx
+++ b/svtools/source/inc/gradwrap.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: gradwrap.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/svtools/source/inc/iodlg.hrc b/svtools/source/inc/iodlg.hrc
index 9c41e06a2b6c..918e47f849b4 100644
--- a/svtools/source/inc/iodlg.hrc
+++ b/svtools/source/inc/iodlg.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: iodlg.hrc,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/svtools/source/inc/jpeg.hxx b/svtools/source/inc/jpeg.hxx
index d8de26c31009..906bcd9ea2de 100644
--- a/svtools/source/inc/jpeg.hxx
+++ b/svtools/source/inc/jpeg.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: jpeg.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/svtools/source/inc/msgrd.hxx b/svtools/source/inc/msgrd.hxx
index 381ae71c7b83..2d3dcccb1244 100644
--- a/svtools/source/inc/msgrd.hxx
+++ b/svtools/source/inc/msgrd.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: msgrd.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/svtools/source/inc/msgwr.hxx b/svtools/source/inc/msgwr.hxx
index c347938fd34d..7e72e98c124c 100644
--- a/svtools/source/inc/msgwr.hxx
+++ b/svtools/source/inc/msgwr.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: msgwr.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/svtools/source/inc/property.hxx b/svtools/source/inc/property.hxx
index 2a756f177608..689da1faf140 100644
--- a/svtools/source/inc/property.hxx
+++ b/svtools/source/inc/property.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: property.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/goodies/source/unographic/provider.hxx b/svtools/source/inc/provider.hxx
index d92866d1ed09..c54215482a0e 100644
--- a/goodies/source/unographic/provider.hxx
+++ b/svtools/source/inc/provider.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: provider.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/goodies/source/unographic/renderer.hxx b/svtools/source/inc/renderer.hxx
index ebb4b2e3dca7..b58bd065245b 100644
--- a/goodies/source/unographic/renderer.hxx
+++ b/svtools/source/inc/renderer.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: renderer.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/svtools/source/inc/sgfbram.hxx b/svtools/source/inc/sgfbram.hxx
index ca7e90b59cd4..2acab5445a8c 100644
--- a/svtools/source/inc/sgfbram.hxx
+++ b/svtools/source/inc/sgfbram.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: sgfbram.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/svtools/source/inc/sgffilt.hxx b/svtools/source/inc/sgffilt.hxx
index a93522fcf590..1c75917b8f73 100644
--- a/svtools/source/inc/sgffilt.hxx
+++ b/svtools/source/inc/sgffilt.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: sgffilt.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/svtools/source/inc/sgvmain.hxx b/svtools/source/inc/sgvmain.hxx
index 58e43e0a00b2..6f69908865c5 100644
--- a/svtools/source/inc/sgvmain.hxx
+++ b/svtools/source/inc/sgvmain.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: sgvmain.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/svtools/source/inc/sgvspln.hxx b/svtools/source/inc/sgvspln.hxx
index 7e9976eaf25b..29df09247f22 100644
--- a/svtools/source/inc/sgvspln.hxx
+++ b/svtools/source/inc/sgvspln.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: sgvspln.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/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 10463fc05906..cde986b3cb7d 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.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: svimpbox.hxx,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/svtools/source/inc/svimpicn.hxx b/svtools/source/inc/svimpicn.hxx
index 724a92543700..20f98d2bcbbd 100644
--- a/svtools/source/inc/svimpicn.hxx
+++ b/svtools/source/inc/svimpicn.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: svimpicn.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/svtools/source/inc/svtaccessiblefactory.hxx b/svtools/source/inc/svtaccessiblefactory.hxx
index d4a0a5b518e8..7760b6427da4 100644
--- a/svtools/source/inc/svtaccessiblefactory.hxx
+++ b/svtools/source/inc/svtaccessiblefactory.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: svtaccessiblefactory.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/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 80ceda96fab5..5d34ea6f47ed 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.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: unoiface.hxx,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/svtools/source/inc/xbmread.hxx b/svtools/source/inc/xbmread.hxx
index c9623fbb2cda..aab52eeffa63 100644
--- a/svtools/source/inc/xbmread.hxx
+++ b/svtools/source/inc/xbmread.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: xbmread.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/svtools/source/inc/xpmread.hxx b/svtools/source/inc/xpmread.hxx
index f1a76c9bc62f..29edd15a3b1c 100644
--- a/svtools/source/inc/xpmread.hxx
+++ b/svtools/source/inc/xpmread.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: xpmread.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/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx
index 399cf041d915..7ebd3ea76d1f 100644
--- a/svtools/source/java/javacontext.cxx
+++ b/svtools/source/java/javacontext.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: javacontext.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/svtools/source/java/javaerror.src b/svtools/source/java/javaerror.src
index 3460df859c2b..e16992a3473d 100644
--- a/svtools/source/java/javaerror.src
+++ b/svtools/source/java/javaerror.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: javaerror.src,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/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx
index a7808c80992b..3dde9c33cd48 100644
--- a/svtools/source/java/javainteractionhandler.cxx
+++ b/svtools/source/java/javainteractionhandler.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: javainteractionhandler.cxx,v $
- * $Revision: 1.7.152.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/java/makefile.mk b/svtools/source/java/makefile.mk
index 9d9679644685..6db57388dca0 100644
--- a/svtools/source/java/makefile.mk
+++ b/svtools/source/java/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/java/patchjavaerror.src b/svtools/source/java/patchjavaerror.src
index 2d2ad06a9592..e16992a3473d 100644
--- a/svtools/source/java/patchjavaerror.src
+++ b/svtools/source/java/patchjavaerror.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: patchjavaerror.src,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/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 16bc8339a0d9..6458e359a49c 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.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: acceleratorexecute.cxx,v $
- * $Revision: 1.14.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/misc/chartprettypainter.cxx b/svtools/source/misc/chartprettypainter.cxx
index 7e9a16879789..bc2d02384816 100644
--- a/svtools/source/misc/chartprettypainter.cxx
+++ b/svtools/source/misc/chartprettypainter.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: chartprettypainter.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/svtools/source/misc/cliplistener.cxx b/svtools/source/misc/cliplistener.cxx
index c8c6428233e8..8fb61a5a1cb9 100644
--- a/svtools/source/misc/cliplistener.cxx
+++ b/svtools/source/misc/cliplistener.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: cliplistener.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/svtools/source/misc/dialogclosedlistener.cxx b/svtools/source/misc/dialogclosedlistener.cxx
index 582d2bbf4879..a08c8a3b6dd5 100644
--- a/svtools/source/misc/dialogclosedlistener.cxx
+++ b/svtools/source/misc/dialogclosedlistener.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: dialogclosedlistener.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/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx
index d461e5898227..7565dad731f7 100644
--- a/svtools/source/misc/dialogcontrolling.cxx
+++ b/svtools/source/misc/dialogcontrolling.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: dialogcontrolling.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/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 4084aa47bc80..cf476098056b 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.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: ehdl.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -321,16 +318,21 @@ BOOL SfxErrorHandler::GetClassString(ULONG lClassId, String &rStr) const
     */
 
 {
-
-    ResId aId(RID_ERRHDL, *pMgr);
-    ErrorResource_Impl aEr(aId, (USHORT)lClassId);
-    if(aEr)
+    BOOL bRet = FALSE;
+    com::sun::star::lang::Locale aLocale( Application::GetSettings().GetUILocale() );
+    ResMgr* pResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(ofa), aLocale );
+    if( pResMgr )
     {
-        rStr=((ResString)aEr).GetString();
-        return TRUE;
+        ResId aId(RID_ERRHDL, *pResMgr );
+        ErrorResource_Impl aEr(aId, (USHORT)lClassId);
+        if(aEr)
+        {
+            rStr=((ResString)aEr).GetString();
+            bRet = TRUE;
+        }
     }
-    else
-        return FALSE;
+    delete pResMgr;
+    return bRet;
 }
 
 //-------------------------------------------------------------------------
@@ -379,10 +381,10 @@ BOOL SfxErrorHandler::GetErrorString(
 
     BOOL bRet = FALSE;
     rStr=String(SvtResId(RID_ERRHDL_CLASS));
-    ResId *pResId = new ResId(nId, *pMgr);
+    ResId aResId(nId, *pMgr);
 
     {
-        ErrorResource_Impl aEr(*pResId, (USHORT)lErrId);
+        ErrorResource_Impl aEr(aResId, (USHORT)lErrId);
         if(aEr)
         {
             ResString aErrorString(aEr);
@@ -408,7 +410,6 @@ BOOL SfxErrorHandler::GetErrorString(
         rStr.SearchAndReplace(String::CreateFromAscii( "$(CLASS)" ),aErrStr);
     }
 
-    delete pResId;
     return bRet;
 }
 
diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src
index 5267d13765c3..55ab99b93bdf 100644
--- a/svtools/source/misc/ehdl.src
+++ b/svtools/source/misc/ehdl.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: ehdl.src,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/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index 3554f6955171..f606e1e2e4b1 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: embedhlp.cxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index d667580b41fb..cbf87f40b7fc 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.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: embedtransfer.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/svtools/source/misc/errtxt.src b/svtools/source/misc/errtxt.src
index 3ab58ef92dbf..4e9a316308e0 100644
--- a/svtools/source/misc/errtxt.src
+++ b/svtools/source/misc/errtxt.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: errtxt.src,v $
- * $Revision: 1.63 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/misc/helpagent.src b/svtools/source/misc/helpagent.src
index 181583bc8f6d..c649c1f17a40 100644
--- a/svtools/source/misc/helpagent.src
+++ b/svtools/source/misc/helpagent.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: helpagent.src,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/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx
index 51cd7ebfb740..55800a213a2e 100644
--- a/svtools/source/misc/helpagentwindow.cxx
+++ b/svtools/source/misc/helpagentwindow.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: helpagentwindow.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/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index 76752b27354e..e57c0d21d98a 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.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: imagemgr.cxx,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/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index e082398beaa1..0664cdc6bc87 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.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: imagemgr.src,v $
- * $Revision: 1.69 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/misc/imageresourceaccess.cxx b/svtools/source/misc/imageresourceaccess.cxx
index b27bf6fa0174..a4f19d9e004a 100644
--- a/svtools/source/misc/imageresourceaccess.cxx
+++ b/svtools/source/misc/imageresourceaccess.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: imageresourceaccess.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/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index df7760f7931b..25f23e2ef00b 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.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: imap.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,6 +61,12 @@ UINT16 IMapObject::nActualTextEncoding = (UINT16) RTL_TEXTENCODING_DONTKNOW;
 #pragma optimize ( "", off )
 #endif
 
+IMapObject::IMapObject()
+    : bActive( false )
+    , nReadVersion( 0 )
+{
+}
+
 IMapObject::IMapObject( const String& rURL, const String& rAltText, const String& rDesc,
                         const String& rTarget, const String& rName, BOOL bURLActive )
 : aURL( rURL )
@@ -72,6 +75,7 @@ IMapObject::IMapObject( const String& rURL, const String& rAltText, const String
 , aTarget( rTarget )
 , aName( rName )
 , bActive( bURLActive )
+, nReadVersion( 0 )
 {
 }
 
diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx
index 1dd10c36c81a..9834fe0fcb76 100644
--- a/svtools/source/misc/imap2.cxx
+++ b/svtools/source/misc/imap2.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: imap2.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/svtools/source/misc/imap3.cxx b/svtools/source/misc/imap3.cxx
index 7e0dd4d4c5f1..76763ae422f2 100644
--- a/svtools/source/misc/imap3.cxx
+++ b/svtools/source/misc/imap3.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: imap3.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/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx
index 9db70f852d30..559d31cdeb1d 100644
--- a/svtools/source/misc/itemdel.cxx
+++ b/svtools/source/misc/itemdel.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: itemdel.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/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index ef2cedcc50c2..b656dbf501c4 100644..100755
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.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: langtab.cxx,v $
- * $Revision: 1.3.140.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -166,6 +163,12 @@ const String& SvtLanguageTable::GetString( const LanguageType eType ) const
     return aEmptyStr;
 }
 
+String SvtLanguageTable::GetLanguageString( const LanguageType eType )
+{
+    static const SvtLanguageTable aLangTable;
+    return aLangTable.GetString( eType );
+}
+
 //------------------------------------------------------------------------
 
 LanguageType SvtLanguageTable::GetType( const String& rStr ) const
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 5f67eddfb801..39f9362e3940 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.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: langtab.src,v $
- * $Revision: 1.6.126.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/misc/makefile.mk b/svtools/source/misc/makefile.mk
index 77cf8a41a8bd..65e43747a586 100644
--- a/svtools/source/misc/makefile.mk
+++ b/svtools/source/misc/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.45 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -78,6 +74,7 @@ SLOFILES=\
     $(SLO)$/templatefoldercache.obj \
     $(SLO)$/transfer.obj            \
     $(SLO)$/transfer2.obj           \
+    $(SLO)$/unitconv.obj           \
     $(SLO)$/wallitem.obj
 
 # --- Targets -------------------------------------------------------
diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx
index 323093ae76a2..fa216b27f99c 100644
--- a/svtools/source/misc/stringtransfer.cxx
+++ b/svtools/source/misc/stringtransfer.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: stringtransfer.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/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index a4b3cc1e8ecc..1a8284642698 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.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: svtaccessiblefactory.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/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
index 2bc1977e9197..65715f635883 100644
--- a/svtools/source/misc/svtdata.cxx
+++ b/svtools/source/misc/svtdata.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: svtdata.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/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx
index 348a9638399b..62f3ec39eb6f 100644
--- a/svtools/source/misc/templatefoldercache.cxx
+++ b/svtools/source/misc/templatefoldercache.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: templatefoldercache.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/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 4a814637e1af..4628c0d4b846 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.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: transfer.cxx,v $
- * $Revision: 1.81 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx
index 027dbc31572d..dcd0f81b2758 100644
--- a/svtools/source/misc/transfer2.cxx
+++ b/svtools/source/misc/transfer2.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: transfer2.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/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx
new file mode 100644
index 000000000000..612bcb4f0221
--- /dev/null
+++ b/svtools/source/misc/unitconv.cxx
@@ -0,0 +1,763 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dlgutil.cxx,v $
+ * $Revision: 1.17 $
+ *
+ * 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_svtools.hxx"
+
+// include ---------------------------------------------------------------
+
+#include <svtools/unitconv.hxx>
+
+// -----------------------------------------------------------------------
+
+void SetFieldUnit( MetricField& rField, FieldUnit eUnit, BOOL bAll )
+{
+    sal_Int64 nFirst    = rField.Denormalize( rField.GetFirst( FUNIT_TWIP ) );
+    sal_Int64 nLast = rField.Denormalize( rField.GetLast( FUNIT_TWIP ) );
+    sal_Int64 nMin = rField.Denormalize( rField.GetMin( FUNIT_TWIP ) );
+    sal_Int64 nMax = rField.Denormalize( rField.GetMax( FUNIT_TWIP ) );
+
+    if ( !bAll )
+    {
+        switch ( eUnit )
+        {
+            case FUNIT_M:
+            case FUNIT_KM:
+                eUnit = FUNIT_CM;
+                break;
+
+            case FUNIT_FOOT:
+            case FUNIT_MILE:
+                eUnit = FUNIT_INCH;
+                break;
+            default: ;//prevent warning
+        }
+    }
+    rField.SetUnit( eUnit );
+    switch( eUnit )
+    {
+        case FUNIT_MM:
+            rField.SetSpinSize( 50 );
+            break;
+
+        case FUNIT_INCH:
+            rField.SetSpinSize( 2 );
+            break;
+
+        default:
+            rField.SetSpinSize( 10 );
+    }
+
+    if ( FUNIT_POINT == eUnit )
+    {
+        if( rField.GetDecimalDigits() > 1 )
+            rField.SetDecimalDigits( 1 );
+    }
+    else
+        rField.SetDecimalDigits( 2 );
+
+    if ( !bAll )
+    {
+        rField.SetFirst( rField.Normalize( nFirst ), FUNIT_TWIP );
+        rField.SetLast( rField.Normalize( nLast ), FUNIT_TWIP );
+        rField.SetMin( rField.Normalize( nMin ), FUNIT_TWIP );
+        rField.SetMax( rField.Normalize( nMax ), FUNIT_TWIP );
+    }
+}
+
+// -----------------------------------------------------------------------
+
+void SetFieldUnit( MetricBox& rBox, FieldUnit eUnit, BOOL bAll )
+{
+    sal_Int64 nMin = rBox.Denormalize( rBox.GetMin( FUNIT_TWIP ) );
+    sal_Int64 nMax = rBox.Denormalize( rBox.GetMax( FUNIT_TWIP ) );
+
+    if ( !bAll )
+    {
+        switch ( eUnit )
+        {
+            case FUNIT_M:
+            case FUNIT_KM:
+                eUnit = FUNIT_CM;
+                break;
+
+            case FUNIT_FOOT:
+            case FUNIT_MILE:
+                eUnit = FUNIT_INCH;
+                break;
+            default: ;//prevent warning
+        }
+    }
+    rBox.SetUnit( eUnit );
+
+    if ( FUNIT_POINT == eUnit && rBox.GetDecimalDigits() > 1 )
+        rBox.SetDecimalDigits( 1 );
+    else
+        rBox.SetDecimalDigits( 2 );
+
+    if ( !bAll )
+    {
+        rBox.SetMin( rBox.Normalize( nMin ), FUNIT_TWIP );
+        rBox.SetMax( rBox.Normalize( nMax ), FUNIT_TWIP );
+    }
+}
+
+// -----------------------------------------------------------------------
+void SetMetricValue( MetricField& rField, long nCoreValue, SfxMapUnit eUnit )
+{
+    sal_Int64 nVal = OutputDevice::LogicToLogic( nCoreValue, (MapUnit)eUnit, MAP_100TH_MM );
+    nVal = rField.Normalize( nVal );
+    rField.SetValue( nVal, FUNIT_100TH_MM );
+
+}
+
+// -----------------------------------------------------------------------
+
+long GetCoreValue( const MetricField& rField, SfxMapUnit eUnit )
+{
+    sal_Int64 nVal = rField.GetValue( FUNIT_100TH_MM );
+    // avoid rounding issues
+    const sal_Int64 nSizeMask = 0xffffffffff000000LL;
+    bool bRoundBefore = true;
+    if( nVal >= 0 )
+    {
+        if( (nVal & nSizeMask) == 0 )
+            bRoundBefore = false;
+    }
+    else
+    {
+        if( ((-nVal) & nSizeMask ) == 0 )
+            bRoundBefore = false;
+    }
+    if( bRoundBefore )
+        nVal = rField.Denormalize( nVal );
+    sal_Int64 nUnitVal = OutputDevice::LogicToLogic( static_cast<long>(nVal), MAP_100TH_MM, (MapUnit)eUnit );
+    if( ! bRoundBefore )
+        nUnitVal = rField.Denormalize( nUnitVal );
+    return static_cast<long>(nUnitVal);
+}
+
+// -----------------------------------------------------------------------
+
+long CalcToUnit( float nIn, SfxMapUnit eUnit )
+{
+    // nIn ist in Points
+
+    DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP       ||
+                eUnit == SFX_MAPUNIT_100TH_MM   ||
+                eUnit == SFX_MAPUNIT_10TH_MM    ||
+                eUnit == SFX_MAPUNIT_MM         ||
+                eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" );
+
+    float nTmp = nIn;
+
+    if ( SFX_MAPUNIT_TWIP != eUnit )
+        nTmp = nIn * 10 / 567;
+
+    switch ( eUnit )
+    {
+        case SFX_MAPUNIT_100TH_MM:  nTmp *= 100; break;
+        case SFX_MAPUNIT_10TH_MM:   nTmp *= 10;  break;
+        case SFX_MAPUNIT_MM:                     break;
+        case SFX_MAPUNIT_CM:        nTmp /= 10;  break;
+        default: ;//prevent warning
+    }
+
+    nTmp *= 20;
+    long nRet = (long)nTmp;
+    return nRet;
+//! return (long)(nTmp * 20);
+}
+
+// -----------------------------------------------------------------------
+
+long ItemToControl( long nIn, SfxMapUnit eItem, SfxFieldUnit eCtrl )
+{
+    long nOut = 0;
+
+    switch ( eItem )
+    {
+        case SFX_MAPUNIT_100TH_MM:
+        case SFX_MAPUNIT_10TH_MM:
+        case SFX_MAPUNIT_MM:
+        {
+            if ( eItem == SFX_MAPUNIT_10TH_MM )
+                nIn /= 10;
+            else if ( eItem == SFX_MAPUNIT_100TH_MM )
+                nIn /= 100;
+            nOut = TransformMetric( nIn, FUNIT_MM, (FieldUnit)eCtrl );
+        }
+        break;
+
+        case SFX_MAPUNIT_CM:
+        {
+            nOut = TransformMetric( nIn, FUNIT_CM, (FieldUnit)eCtrl );
+        }
+        break;
+
+        case SFX_MAPUNIT_1000TH_INCH:
+        case SFX_MAPUNIT_100TH_INCH:
+        case SFX_MAPUNIT_10TH_INCH:
+        case SFX_MAPUNIT_INCH:
+        {
+            if ( eItem == SFX_MAPUNIT_10TH_INCH )
+                nIn /= 10;
+            else if ( eItem == SFX_MAPUNIT_100TH_INCH )
+                nIn /= 100;
+            else if ( eItem == SFX_MAPUNIT_1000TH_INCH )
+                nIn /= 1000;
+            nOut = TransformMetric( nIn, FUNIT_INCH, (FieldUnit)eCtrl );
+        }
+        break;
+
+        case SFX_MAPUNIT_POINT:
+        {
+            nOut = TransformMetric( nIn, FUNIT_POINT, (FieldUnit)eCtrl );
+        }
+        break;
+
+        case SFX_MAPUNIT_TWIP:
+        {
+            nOut = TransformMetric( nIn, FUNIT_TWIP, (FieldUnit)eCtrl );
+        }
+        break;
+        default: ;//prevent warning
+    }
+    return nOut;
+}
+
+// -----------------------------------------------------------------------
+
+long ControlToItem( long nIn, SfxFieldUnit eCtrl, SfxMapUnit eItem )
+{
+    return ItemToControl( nIn, eItem, eCtrl );
+}
+
+// -----------------------------------------------------------------------
+
+FieldUnit MapToFieldUnit( const SfxMapUnit eUnit )
+{
+    switch ( eUnit )
+    {
+        case SFX_MAPUNIT_100TH_MM:
+        case SFX_MAPUNIT_10TH_MM:
+        case SFX_MAPUNIT_MM:
+            return FUNIT_MM;
+
+        case SFX_MAPUNIT_CM:
+            return FUNIT_CM;
+
+        case SFX_MAPUNIT_1000TH_INCH:
+        case SFX_MAPUNIT_100TH_INCH:
+        case SFX_MAPUNIT_10TH_INCH:
+        case SFX_MAPUNIT_INCH:
+            return FUNIT_INCH;
+
+        case SFX_MAPUNIT_POINT:
+            return FUNIT_POINT;
+
+        case SFX_MAPUNIT_TWIP:
+            return FUNIT_TWIP;
+        default: ;//prevent warning
+    }
+    return FUNIT_NONE;
+}
+
+// -----------------------------------------------------------------------
+
+MapUnit FieldToMapUnit( const SfxFieldUnit /*eUnit*/ )
+{
+    return MAP_APPFONT;
+}
+
+// -----------------------------------------------------------------------
+
+long ConvertValueToMap( long nVal, SfxMapUnit eUnit )
+{
+    long nNew = nVal;
+
+    switch ( eUnit )
+    {
+        case SFX_MAPUNIT_10TH_MM:
+        case SFX_MAPUNIT_10TH_INCH:
+            nNew *= 10;
+            break;
+
+        case SFX_MAPUNIT_100TH_MM:
+        case SFX_MAPUNIT_100TH_INCH:
+            nNew *= 100;
+            break;
+
+        case SFX_MAPUNIT_1000TH_INCH:
+            nNew *= 1000;
+        default: ;//prevent warning
+    }
+    return nNew;
+}
+
+// -----------------------------------------------------------------------
+
+long ConvertValueToUnit( long nVal, SfxMapUnit eUnit )
+{
+    long nNew = nVal;
+
+    switch ( eUnit )
+    {
+        case SFX_MAPUNIT_10TH_MM:
+        case SFX_MAPUNIT_10TH_INCH:
+            nNew /= 10;
+            break;
+
+        case SFX_MAPUNIT_100TH_MM:
+        case SFX_MAPUNIT_100TH_INCH:
+            nNew /= 100;
+            break;
+
+        case SFX_MAPUNIT_1000TH_INCH:
+            nNew /= 1000;
+        break;
+        default: ;//prevent warning
+    }
+    return nNew;
+}
+
+// -----------------------------------------------------------------------
+
+long CalcToPoint( long nIn, SfxMapUnit eUnit, USHORT nFaktor )
+{
+    DBG_ASSERT( eUnit == SFX_MAPUNIT_TWIP       ||
+                eUnit == SFX_MAPUNIT_100TH_MM   ||
+                eUnit == SFX_MAPUNIT_10TH_MM    ||
+                eUnit == SFX_MAPUNIT_MM         ||
+                eUnit == SFX_MAPUNIT_CM, "this unit is not implemented" );
+
+    long nRet = 0;
+
+    if ( SFX_MAPUNIT_TWIP == eUnit )
+        nRet = nIn;
+    else
+        nRet = nIn * 567;
+
+    switch ( eUnit )
+    {
+        case SFX_MAPUNIT_100TH_MM:  nRet /= 100; break;
+        case SFX_MAPUNIT_10TH_MM:   nRet /= 10;  break;
+        case SFX_MAPUNIT_MM:                     break;
+        case SFX_MAPUNIT_CM:        nRet *= 10;  break;
+        default: ;//prevent warning
+    }
+
+    // ggf. aufrunden
+    if ( SFX_MAPUNIT_TWIP != eUnit )
+    {
+        long nMod = 10;
+        long nTmp = nRet % nMod;
+
+        if ( nTmp >= 4 )
+            nRet += 10 - nTmp;
+        nRet /= 10;
+    }
+    return nRet * nFaktor / 20;
+}
+
+// -----------------------------------------------------------------------
+
+long CMToTwips( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
+        nRet = nIn * 567;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long MMToTwips( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
+        nRet = nIn * 567 / 10;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long InchToTwips( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 1440 ) && nIn >= ( LONG_MIN / 1440 ) )
+        nRet = nIn * 1440;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PointToTwips( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 20 ) && nIn >= ( LONG_MIN / 20 ) )
+        nRet = nIn * 20;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PicaToTwips( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 240 ) && nIn >= ( LONG_MIN / 240 ) )
+        nRet = nIn * 240;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long TwipsToCM( long nIn )
+{
+    long nRet = nIn / 567;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long InchToCM( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 254 ) && nIn >= ( LONG_MIN / 254 ) )
+        nRet = nIn * 254 / 100;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long MMToCM( long nIn )
+{
+    long nRet = nIn / 10;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PointToCM( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 20 ) && nIn >= ( LONG_MIN / 20 ) )
+        nRet = nIn * 20 / 567;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PicaToCM( long nIn)
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 12 / 20 ) && nIn >= ( LONG_MIN / 12 / 20 ) )
+        nRet = nIn * 12 * 20 / 567;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long TwipsToMM( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 10 ) && nIn >= ( LONG_MIN / 10 ) )
+        nRet = nIn * 10 / 566;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long CMToMM( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 10 ) && nIn >= ( LONG_MIN / 10 ) )
+        nRet = nIn * 10;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long InchToMM( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 254 ) && nIn >= ( LONG_MIN / 254 ) )
+        nRet = nIn * 254 / 10;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PointToMM( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 200 ) && nIn >= ( LONG_MIN / 200 ) )
+        nRet = nIn * 200 / 567;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PicaToMM( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 12 / 200 ) && nIn >= ( LONG_MIN / 12 / 200 ) )
+        nRet = nIn * 12 * 200 / 567;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long TwipsToInch( long nIn )
+{
+    long nRet = nIn / 1440;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long CMToInch( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 100 ) && nIn >= ( LONG_MIN / 100 ) )
+        nRet = nIn * 100 / 254;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long MMToInch( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 10 ) && nIn >= ( LONG_MIN / 10 ) )
+        nRet = nIn * 10 / 254;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PointToInch( long nIn )
+{
+    long nRet = nIn / 72;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PicaToInch( long nIn )
+{
+    long nRet = nIn / 6;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long TwipsToPoint( long nIn )
+{
+    long nRet = nIn / 20;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long InchToPoint( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 72 ) && nIn >= ( LONG_MIN / 72 ) )
+        nRet = nIn * 72;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long CMToPoint( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
+        nRet = nIn * 567 / 20;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long MMToPoint( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
+        nRet = nIn * 567 / 200;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PicaToPoint( long nIn )
+{
+    long nRet = nIn / 12;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long TwipsToPica( long nIn )
+{
+    long nRet = nIn / 240;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long InchToPica( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 6 ) && nIn >= ( LONG_MIN / 6 ) )
+        nRet = nIn * 6;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long PointToPica( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 12 ) && nIn >= ( LONG_MIN / 12 ) )
+        nRet = nIn * 12;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long CMToPica( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
+        nRet = nIn * 567 / 20 / 12;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long MMToPica( long nIn )
+{
+    long nRet = 0;
+
+    if ( nIn <= ( LONG_MAX / 567 ) && nIn >= ( LONG_MIN / 567 ) )
+        nRet = nIn * 567 / 200 / 12;
+    return nRet;
+}
+
+// -----------------------------------------------------------------------
+
+long Nothing( long nIn )
+{
+    long nRet = nIn;
+    return nRet;
+}
+
+FUNC_CONVERT ConvertTable[6][6] =
+{
+//  CM,         MM          INCH         POINT        PICAS=32     TWIPS
+    { Nothing,  CMToMM,     CMToInch,    CMToPoint,   CMToPica,    CMToTwips },
+    { MMToCM,       Nothing,    MMToInch,    MMToPoint,   MMToPica,    MMToTwips },
+    { InchToCM, InchToMM,   Nothing,     InchToPoint, InchToPica,  InchToTwips },
+    { PointToCM,    PointToMM,  PointToInch, Nothing,     PointToPica, PointToTwips },
+    { PicaToCM, PicaToMM,   PicaToInch,  PicaToPoint, Nothing,     PicaToTwips },
+    { TwipsToCM,    TwipsToMM,  TwipsToInch, TwipsToPoint,TwipsToPica, Nothing }
+};
+
+// -----------------------------------------------------------------------
+
+long TransformMetric( long nVal, FieldUnit aOld, FieldUnit aNew )
+{
+    if ( aOld == FUNIT_NONE   || aNew == FUNIT_NONE ||
+         aOld == FUNIT_CUSTOM || aNew == FUNIT_CUSTOM )
+    {
+        return nVal;
+    }
+
+    USHORT nOld = 0;
+    USHORT nNew = 0;
+
+    switch ( aOld )
+    {
+        case FUNIT_CM:
+            nOld = 0; break;
+        case FUNIT_MM:
+            nOld = 1; break;
+        case FUNIT_INCH:
+            nOld = 2; break;
+        case FUNIT_POINT:
+            nOld = 3; break;
+        case FUNIT_PICA:
+            nOld = 4; break;
+        case FUNIT_TWIP:
+            nOld = 5; break;
+        default: ;//prevent warning
+    }
+
+    switch ( aNew )
+    {
+        case FUNIT_CM:
+            nNew = 0; break;
+        case FUNIT_MM:
+            nNew = 1; break;
+        case FUNIT_INCH:
+            nNew = 2; break;
+        case FUNIT_POINT:
+            nNew = 3; break;
+        case FUNIT_PICA:
+            nNew = 4; break;
+        case FUNIT_TWIP:
+            nNew = 5; break;
+        default: ;//prevent warning
+    }
+    return ConvertTable[nOld][nNew]( nVal );
+}
+
diff --git a/svtools/source/misc/wallitem.cxx b/svtools/source/misc/wallitem.cxx
index 6ceb414db003..505af52c9908 100644
--- a/svtools/source/misc/wallitem.cxx
+++ b/svtools/source/misc/wallitem.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: wallitem.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/svtools/source/plugapp/commtest.cxx b/svtools/source/plugapp/commtest.cxx
index 7ae43194c2c9..3a235afcc61b 100644
--- a/svtools/source/plugapp/commtest.cxx
+++ b/svtools/source/plugapp/commtest.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: commtest.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/svtools/source/plugapp/commtest.hrc b/svtools/source/plugapp/commtest.hrc
index c2e1db262e6a..f0f646b49bfc 100644
--- a/svtools/source/plugapp/commtest.hrc
+++ b/svtools/source/plugapp/commtest.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: commtest.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/svtools/source/plugapp/commtest.src b/svtools/source/plugapp/commtest.src
index beb9be750eb1..7073699f4956 100644
--- a/svtools/source/plugapp/commtest.src
+++ b/svtools/source/plugapp/commtest.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: commtest.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/svtools/source/plugapp/makefile.mk b/svtools/source/plugapp/makefile.mk
index d37e374917ac..f1dd0a4a8334 100644
--- a/svtools/source/plugapp/makefile.mk
+++ b/svtools/source/plugapp/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/plugapp/testtool.hrc b/svtools/source/plugapp/testtool.hrc
index a1f539c64bd6..d6a234b74236 100644
--- a/svtools/source/plugapp/testtool.hrc
+++ b/svtools/source/plugapp/testtool.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: testtool.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/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src
index 78b63c2fb819..9cc52c58f013 100644
--- a/svtools/source/plugapp/testtool.src
+++ b/svtools/source/plugapp/testtool.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: testtool.src,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/svtools/source/plugapp/ttprops.cxx b/svtools/source/plugapp/ttprops.cxx
index 2cbb86938836..2ae41a4c50c1 100644
--- a/svtools/source/plugapp/ttprops.cxx
+++ b/svtools/source/plugapp/ttprops.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: ttprops.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/svtools/source/productregistration/makefile.mk b/svtools/source/productregistration/makefile.mk
index 1892f1600dd8..0b970b651059 100644
--- a/svtools/source/productregistration/makefile.mk
+++ b/svtools/source/productregistration/makefile.mk
@@ -1,15 +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: makefile.mk,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/svtools/source/productregistration/productregistration.cxx b/svtools/source/productregistration/productregistration.cxx
index f5fc03337cd6..4a5db9cf47c4 100644
--- a/svtools/source/productregistration/productregistration.cxx
+++ b/svtools/source/productregistration/productregistration.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: productregistration.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/svtools/source/productregistration/productregistration.hxx b/svtools/source/productregistration/productregistration.hxx
index 6dc3dbe253e5..efaa624887b0 100644
--- a/svtools/source/productregistration/productregistration.hxx
+++ b/svtools/source/productregistration/productregistration.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: productregistration.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/svtools/source/productregistration/registrationdlg.cxx b/svtools/source/productregistration/registrationdlg.cxx
index d3969828cb1f..93b7e5c88462 100644
--- a/svtools/source/productregistration/registrationdlg.cxx
+++ b/svtools/source/productregistration/registrationdlg.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: registrationdlg.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/svtools/source/productregistration/registrationdlg.hrc b/svtools/source/productregistration/registrationdlg.hrc
index d62e5b1dfcca..cfcde5f8c9b3 100644
--- a/svtools/source/productregistration/registrationdlg.hrc
+++ b/svtools/source/productregistration/registrationdlg.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: registrationdlg.hrc,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/svtools/source/productregistration/registrationdlg.hxx b/svtools/source/productregistration/registrationdlg.hxx
index ce1bf08ac950..16761aff08fc 100644
--- a/svtools/source/productregistration/registrationdlg.hxx
+++ b/svtools/source/productregistration/registrationdlg.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: registrationdlg.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/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src
index f9462a420061..e0598ab05e60 100644
--- a/svtools/source/productregistration/registrationdlg.src
+++ b/svtools/source/productregistration/registrationdlg.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: registrationdlg.src,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/svtools/source/svhtml/htmlkywd.cxx b/svtools/source/svhtml/htmlkywd.cxx
index 052b10d2c564..96377a1b7efb 100644
--- a/svtools/source/svhtml/htmlkywd.cxx
+++ b/svtools/source/svhtml/htmlkywd.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: htmlkywd.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/svtools/source/svhtml/htmlout.cxx b/svtools/source/svhtml/htmlout.cxx
index 5bb26367075e..af0d0dff9667 100644
--- a/svtools/source/svhtml/htmlout.cxx
+++ b/svtools/source/svhtml/htmlout.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: htmlout.cxx,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/svtools/source/svhtml/htmlsupp.cxx b/svtools/source/svhtml/htmlsupp.cxx
index 9103161afb51..4c08d9c41ec9 100644
--- a/svtools/source/svhtml/htmlsupp.cxx
+++ b/svtools/source/svhtml/htmlsupp.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: htmlsupp.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/svtools/source/svhtml/makefile.mk b/svtools/source/svhtml/makefile.mk
index b597763ac390..7a8552f2b672 100644
--- a/svtools/source/svhtml/makefile.mk
+++ b/svtools/source/svhtml/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/svhtml/parhtml.cxx b/svtools/source/svhtml/parhtml.cxx
index b4eb6c05cffd..67fc5f619fdf 100644
--- a/svtools/source/svhtml/parhtml.cxx
+++ b/svtools/source/svhtml/parhtml.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: parhtml.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2341,3 +2338,38 @@ rtl_TextEncoding HTMLParser::GetEncodingByMIME( const String& rMime )
     return RTL_TEXTENCODING_DONTKNOW;
 }
 
+rtl_TextEncoding HTMLParser::GetEncodingByHttpHeader( SvKeyValueIterator *pHTTPHeader )
+{
+    rtl_TextEncoding eRet = RTL_TEXTENCODING_DONTKNOW;
+    if( pHTTPHeader )
+    {
+        SvKeyValue aKV;
+        for( BOOL bCont = pHTTPHeader->GetFirst( aKV ); bCont;
+             bCont = pHTTPHeader->GetNext( aKV ) )
+        {
+            if( aKV.GetKey().EqualsIgnoreCaseAscii( OOO_STRING_SVTOOLS_HTML_META_content_type ) )
+            {
+                if( aKV.GetValue().Len() )
+                {
+                    eRet = HTMLParser::GetEncodingByMIME( aKV.GetValue() );
+                }
+            }
+        }
+    }
+    return eRet;
+}
+
+BOOL HTMLParser::SetEncodingByHTTPHeader(
+                                SvKeyValueIterator *pHTTPHeader )
+{
+    BOOL bRet = FALSE;
+    rtl_TextEncoding eEnc = HTMLParser::GetEncodingByHttpHeader( pHTTPHeader );
+    if(RTL_TEXTENCODING_DONTKNOW != eEnc)
+    {
+        SetSrcEncoding( eEnc );
+        bRet = TRUE;
+    }
+    return bRet;
+}
+
+
diff --git a/svtools/source/svrtf/makefile.mk b/svtools/source/svrtf/makefile.mk
index 549b67897ecb..5ebb0e28c69e 100644
--- a/svtools/source/svrtf/makefile.mk
+++ b/svtools/source/svrtf/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/svrtf/parrtf.cxx b/svtools/source/svrtf/parrtf.cxx
index cb40b1d1f4e9..1c578d160307 100644
--- a/svtools/source/svrtf/parrtf.cxx
+++ b/svtools/source/svrtf/parrtf.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: parrtf.cxx,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/svtools/source/svrtf/rtfkey2.cxx b/svtools/source/svrtf/rtfkey2.cxx
index 5c4e1039d92c..03a7667f48e2 100644
--- a/svtools/source/svrtf/rtfkey2.cxx
+++ b/svtools/source/svrtf/rtfkey2.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: rtfkey2.cxx,v $
- * $Revision: 1.14.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/svrtf/rtfkeywd.cxx b/svtools/source/svrtf/rtfkeywd.cxx
index 0dc90d0da8ab..27ce3643f8cf 100644
--- a/svtools/source/svrtf/rtfkeywd.cxx
+++ b/svtools/source/svrtf/rtfkeywd.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: rtfkeywd.cxx,v $
- * $Revision: 1.18.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/svrtf/rtfout.cxx b/svtools/source/svrtf/rtfout.cxx
index 21dfefb14232..d97e838d2450 100644
--- a/svtools/source/svrtf/rtfout.cxx
+++ b/svtools/source/svrtf/rtfout.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: rtfout.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/svtools/source/svrtf/svparser.cxx b/svtools/source/svrtf/svparser.cxx
index 2af7af71adac..53b7ee497754 100644
--- a/svtools/source/svrtf/svparser.cxx
+++ b/svtools/source/svrtf/svparser.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: svparser.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/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index 17ee0222857f..b11357db95d1 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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
diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx
index 2c4fda711009..ada2e463c8af 100644
--- a/svtools/source/table/gridtablerenderer.cxx
+++ b/svtools/source/table/gridtablerenderer.cxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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
diff --git a/svtools/source/table/makefile.mk b/svtools/source/table/makefile.mk
index 8feb7fee10d8..cf1adc76fe92 100644
--- a/svtools/source/table/makefile.mk
+++ b/svtools/source/table/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.16 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 1d7b046ae94b..71c753d3ea86 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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
@@ -491,48 +492,48 @@ sal_Int32 TableControl::GetFieldIndexAtPoint(sal_Int32 _nRow,sal_Int32 _nColumnP
 {
     (void)_nRow;
     (void)_nColumnPos;
-    return GetIndexForPoint(_rPoint);

+    return GetIndexForPoint(_rPoint);
 ;
 }
- // -----------------------------------------------------------------------------

-sal_Bool TableControl::isAccessibleAlive( ) const

-{

-    return ( NULL != m_pAccessTable->m_pAccessible ) && m_pAccessTable->m_pAccessible->isAlive();

-}

+ // -----------------------------------------------------------------------------
+sal_Bool TableControl::isAccessibleAlive( ) const
+{
+    return ( NULL != m_pAccessTable->m_pAccessible ) && m_pAccessTable->m_pAccessible->isAlive();
+}
 
 // -----------------------------------------------------------------------------
 ::svt::IAccessibleFactory& TableControl::getAccessibleFactory()
 {
     return m_pAccessTable->m_aFactoryAccess.getFactory();
 }
-// -----------------------------------------------------------------------------

-void TableControl::commitGridControlEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )

-{

-     if ( isAccessibleAlive() )

-         m_pAccessTable->m_pAccessible->commitEvent( _nEventId, _rNewValue, _rOldValue);

+// -----------------------------------------------------------------------------
+void TableControl::commitGridControlEvent( sal_Int16 _nEventId, const Any& _rNewValue, const Any& _rOldValue )
+{
+     if ( isAccessibleAlive() )
+         m_pAccessTable->m_pAccessible->commitEvent( _nEventId, _rNewValue, _rOldValue);
+}
+// -----------------------------------------------------------------------------
+Rectangle TableControl::calcHeaderRect(sal_Bool _bIsColumnBar,BOOL _bOnScreen)
+{
+    (void)_bOnScreen;
+    Rectangle aRectTable, aRectTableWithHeaders;
+    m_pImpl->impl_getAllVisibleDataCellArea(aRectTable);
+    m_pImpl->impl_getAllVisibleCellsArea(aRectTableWithHeaders);
+    Size aSizeTable(aRectTable.GetSize());
+    Size aSizeTableWithHeaders(aRectTableWithHeaders.GetSize());
+    if(_bIsColumnBar)
+        return Rectangle(aRectTableWithHeaders.TopLeft(),Size(aSizeTableWithHeaders.Width()-aSizeTable.Width(), aSizeTableWithHeaders.Height()));
+    else
+        return Rectangle(aRectTableWithHeaders.TopLeft(),Size(aSizeTableWithHeaders.Width(), aSizeTableWithHeaders.Height()-aSizeTable.Height()));
+}
+// -----------------------------------------------------------------------------
+Rectangle TableControl::calcTableRect(BOOL _bOnScreen)
+{
+    (void)_bOnScreen;
+    Rectangle aRect;
+    m_pImpl->impl_getAllVisibleDataCellArea(aRect);
+    return aRect;
 }
-// -----------------------------------------------------------------------------

-Rectangle TableControl::calcHeaderRect(sal_Bool _bIsColumnBar,BOOL _bOnScreen)

-{

-    (void)_bOnScreen;

-    Rectangle aRectTable, aRectTableWithHeaders;

-    m_pImpl->impl_getAllVisibleDataCellArea(aRectTable);

-    m_pImpl->impl_getAllVisibleCellsArea(aRectTableWithHeaders);

-    Size aSizeTable(aRectTable.GetSize());

-    Size aSizeTableWithHeaders(aRectTableWithHeaders.GetSize());

-    if(_bIsColumnBar)

-        return Rectangle(aRectTableWithHeaders.TopLeft(),Size(aSizeTableWithHeaders.Width()-aSizeTable.Width(), aSizeTableWithHeaders.Height()));

-    else

-        return Rectangle(aRectTableWithHeaders.TopLeft(),Size(aSizeTableWithHeaders.Width(), aSizeTableWithHeaders.Height()-aSizeTable.Height()));

-}

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

-Rectangle TableControl::calcTableRect(BOOL _bOnScreen)

-{

-    (void)_bOnScreen;

-    Rectangle aRect;

-    m_pImpl->impl_getAllVisibleDataCellArea(aRect);

-    return aRect;

-}

 
 //........................................................................
 }} // namespace svt::table
diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 89c0eed4229a..aacfc28d05be 100644
--- a/svtools/source/table/tablecontrol_impl.cxx
+++ b/svtools/source/table/tablecontrol_impl.cxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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
diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx
index 0a25e82e4502..dc875cd137fe 100644
--- a/svtools/source/table/tablecontrol_impl.hxx
+++ b/svtools/source/table/tablecontrol_impl.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_TABLECONTROL_IMPL_HXX
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index 71a313bb2e00..246710488b42 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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
diff --git a/svtools/source/table/tablegeometry.cxx b/svtools/source/table/tablegeometry.cxx
index 569e14c61726..58bdb531c921 100644
--- a/svtools/source/table/tablegeometry.cxx
+++ b/svtools/source/table/tablegeometry.cxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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
diff --git a/svtools/source/table/tablegeometry.hxx b/svtools/source/table/tablegeometry.hxx
index 18b40c1e3781..3ddde0c98c64 100644
--- a/svtools/source/table/tablegeometry.hxx
+++ b/svtools/source/table/tablegeometry.hxx
@@ -1,26 +1,27 @@
 /*************************************************************************
-* 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 SVTOOLS_TABLEGEOMETRY_HXX
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index b2aff7ae711d..2f25a8f2f9b2 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.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: addrtempuno.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/svtools/source/uno/contextmenuhelper.cxx b/svtools/source/uno/contextmenuhelper.cxx
index b3ae322aa3ba..9eb36cf18a45 100644
--- a/svtools/source/uno/contextmenuhelper.cxx
+++ b/svtools/source/uno/contextmenuhelper.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: contextmenuhelper.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/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 79b496187b5a..20176160b396 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.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: framestatuslistener.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/svtools/source/uno/generictoolboxcontroller.cxx b/svtools/source/uno/generictoolboxcontroller.cxx
index d4af28d51c57..a58d9b784cca 100644
--- a/svtools/source/uno/generictoolboxcontroller.cxx
+++ b/svtools/source/uno/generictoolboxcontroller.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: generictoolboxcontroller.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/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index a5899834fd59..a7ece1acc369 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.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: genericunodialog.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/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
index 82e509f1ce08..7bfe37624947 100644
--- a/svtools/source/uno/makefile.mk
+++ b/svtools/source/uno/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.21 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/uno/miscservices.cxx b/svtools/source/uno/miscservices.cxx
index 0f7b79720179..433c1e1acbcb 100644
--- a/svtools/source/uno/miscservices.cxx
+++ b/svtools/source/uno/miscservices.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: miscservices.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,13 +34,27 @@
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/registry/XRegistryKey.hpp>
+#include <osl/diagnose.h>
+#include <uno/mapping.hxx>
+#include "provider.hxx"
+#include "renderer.hxx"
+
+#include <com/sun/star/registry/XRegistryKey.hpp>
+#include "comphelper/servicedecl.hxx"
 
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::registry;
 using namespace ::com::sun::star::lang;
+using namespace unographic;
 
 using rtl::OUString;
 
+namespace sdecl = comphelper::service_decl;
+
+namespace unographic {
+extern sdecl::ServiceDecl const serviceDecl;
+}
+
 // -------------------------------------------------------------------------------------
 
 // for CreateInstance functions implemented elsewhere
@@ -60,10 +71,10 @@ using rtl::OUString;
 
 DECLARE_CREATEINSTANCE_NAMESPACE( svt, OAddressBookSourceDialogUno )
 DECLARE_CREATEINSTANCE( SvFilterOptionsDialog )
-DECLARE_CREATEINSTANCE( PathService )
+DECLARE_CREATEINSTANCE_NAMESPACE( unographic, GraphicProvider )
+DECLARE_CREATEINSTANCE_NAMESPACE( unographic, GraphicRendererVCL )
 
 // -------------------------------------------------------------------------------------
-
 extern "C"
 {
 
@@ -74,13 +85,14 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment (
 }
 
 SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
-    void * /* _pServiceManager */, void * _pRegistryKey )
+    void * pServiceManager, void * _pRegistryKey )
 {
     if (_pRegistryKey)
     {
         Reference< XRegistryKey > xRegistryKey (
             reinterpret_cast< XRegistryKey* >( _pRegistryKey ));
         Reference< XRegistryKey > xNewKey;
+        uno::Sequence< ::rtl::OUString >            aServices;
 
         xNewKey = xRegistryKey->createKey (
             OUString::createFromAscii( "/com.sun.star.comp.svtools.OAddressBookSourceDialogUno/UNO/SERVICES" ) );
@@ -92,13 +104,37 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo (
         xNewKey->createKey (
             OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ) );
 
+        // GraphicProvider
+        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey(
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+                    GraphicProvider::getImplementationName_Static() +
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
+
+        aServices = GraphicProvider::getSupportedServiceNames_Static();
+        int i;
+        for( i = 0; i < aServices.getLength(); i++ )
+            xNewKey->createKey( aServices.getConstArray()[ i ] );
+
+        // GraphicRendererVCL
+        xNewKey = reinterpret_cast< registry::XRegistryKey * >( _pRegistryKey )->createKey(
+                    ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/") ) +
+                    GraphicRendererVCL::getImplementationName_Static() +
+                    ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") ) );
+
+        aServices = ( GraphicRendererVCL::getSupportedServiceNames_Static() );
+        for( i = 0; i < aServices.getLength(); i++ )
+            xNewKey->createKey( aServices.getConstArray()[ i ] );
+
+        if ( !component_writeInfoHelper( reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ), reinterpret_cast< registry::XRegistryKey* >( _pRegistryKey ), serviceDecl ) )
+                return false;
+
         return sal_True;
     }
     return sal_False;
 }
 
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
-    const sal_Char * pImplementationName, void * _pServiceManager, void * /* _pRegistryKey */)
+    const sal_Char * pImplementationName, void * _pServiceManager, void * pRegistryKey)
 {
     void * pResult = 0;
     if ( _pServiceManager )
@@ -130,6 +166,27 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory (
                 SvFilterOptionsDialog_CreateInstance,
                 aServiceNames);
         }
+        else if( 0 == GraphicProvider::getImplementationName_Static().compareToAscii( pImplementationName ) )
+        {
+            xFactory =  ::cppu::createOneInstanceFactory(
+                reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ),
+                GraphicProvider::getImplementationName_Static(),
+                GraphicProvider_CreateInstance,
+                GraphicProvider::getSupportedServiceNames_Static() );
+        }
+        else if( 0 == GraphicRendererVCL::getImplementationName_Static().compareToAscii( pImplementationName ) )
+        {
+            xFactory = ::cppu::createOneInstanceFactory(
+                reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ),
+                GraphicRendererVCL::getImplementationName_Static(),
+                GraphicRendererVCL_CreateInstance,
+                GraphicRendererVCL::getSupportedServiceNames_Static() );
+        }
+        else
+        {
+            pResult =  component_getFactoryHelper( pImplementationName, reinterpret_cast< lang::XMultiServiceFactory * >( _pServiceManager ),reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ), serviceDecl );
+        }
+
         if ( xFactory.is() )
         {
             xFactory->acquire();
diff --git a/svtools/source/uno/statusbarcontroller.cxx b/svtools/source/uno/statusbarcontroller.cxx
index 91c895f416a0..14b802a1bf90 100644
--- a/svtools/source/uno/statusbarcontroller.cxx
+++ b/svtools/source/uno/statusbarcontroller.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: statusbarcontroller.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/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx
index 2f2c896ee6a8..80c31e65d4f1 100755..100644
--- a/svtools/source/uno/svtxgridcontrol.cxx
+++ b/svtools/source/uno/svtxgridcontrol.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: SVTXGridControl.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,9 +39,9 @@
 #include <toolkit/helper/property.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
-#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>

-#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>

-#include <com/sun/star/accessibility/AccessibleEventId.hpp>

+#include <com/sun/star/accessibility/AccessibleTableModelChange.hpp>
+#include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>
+#include <com/sun/star/accessibility/AccessibleEventId.hpp>
 
 
 using ::rtl::OUString;
@@ -54,9 +51,9 @@ using namespace ::com::sun::star::awt::grid;
 using namespace ::com::sun::star::view;
 using namespace ::toolkit;
 using namespace ::com::sun::star::accessibility;
-using namespace ::com::sun::star::accessibility::AccessibleEventId;

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

-using ::com::sun::star::accessibility::AccessibleTableModelChange;

+using namespace ::com::sun::star::accessibility::AccessibleEventId;
+using namespace ::com::sun::star::accessibility::AccessibleTableModelChangeType;
+using ::com::sun::star::accessibility::AccessibleTableModelChange;
 
 
 SVTXGridControl::SVTXGridControl()
@@ -319,19 +316,19 @@ void SAL_CALL SVTXGridControl::rowAdded(const ::com::sun::star::awt::grid::GridD
     //pTable->GrabFocus();
     if(pTable->isAccessibleAlive())
     {
-        pTable->commitGridControlEvent(TABLE_MODEL_CHANGED,

-             makeAny( AccessibleTableModelChange(INSERT, m_pTableModel->getRowCount()-1, m_pTableModel->getRowCount(), 0, m_pTableModel->getColumnCount())),

-            Any());

-        pTable->commitGridControlEvent(CHILD,

-             makeAny( pTable->m_pAccessTable->m_pAccessible->getTableHeader(TCTYPE_ROWHEADERBAR)),

-            Any());

+        pTable->commitGridControlEvent(TABLE_MODEL_CHANGED,
+             makeAny( AccessibleTableModelChange(INSERT, m_pTableModel->getRowCount()-1, m_pTableModel->getRowCount(), 0, m_pTableModel->getColumnCount())),
+            Any());
+        pTable->commitGridControlEvent(CHILD,
+             makeAny( pTable->m_pAccessTable->m_pAccessible->getTableHeader(TCTYPE_ROWHEADERBAR)),
+            Any());
         for (sal_Int32 i = 0 ; i <= m_pTableModel->getColumnCount() ; ++i)
         {
             pTable->commitGridControlEvent(
                 CHILD,
                 makeAny( pTable->m_pAccessTable->m_pAccessible->getTable() ),
                 Any());
-        }

+        }
     }
 }
 
@@ -346,9 +343,9 @@ void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::Gri
         m_pTableModel->getCellContent().clear();
         if(pTable->isAccessibleAlive())
         {
-            pTable->commitGridControlEvent(TABLE_MODEL_CHANGED,

-                 makeAny( AccessibleTableModelChange(DELETE, 0, m_pTableModel->getColumnCount(), 0, m_pTableModel->getColumnCount())),

-                Any());

+            pTable->commitGridControlEvent(TABLE_MODEL_CHANGED,
+                 makeAny( AccessibleTableModelChange(DELETE, 0, m_pTableModel->getColumnCount(), 0, m_pTableModel->getColumnCount())),
+                Any());
         }
     }
     else
@@ -374,19 +371,19 @@ void SAL_CALL SVTXGridControl::rowRemoved(const ::com::sun::star::awt::grid::Gri
     pTable->InvalidateDataWindow(Event.index, true);
     if(pTable->isAccessibleAlive())
     {
-        pTable->commitGridControlEvent(TABLE_MODEL_CHANGED,

-             makeAny( AccessibleTableModelChange(DELETE, Event.index, Event.index+1, 0, m_pTableModel->getColumnCount())),

-            Any());

-        //pTable->commitGridControlEvent(CHILD,

-     //     makeAny( pTable->m_pAccessTable->m_pAccessible->getTableHeader(TCTYPE_ROWHEADERBAR)),

-        //  Any());

+        pTable->commitGridControlEvent(TABLE_MODEL_CHANGED,
+             makeAny( AccessibleTableModelChange(DELETE, Event.index, Event.index+1, 0, m_pTableModel->getColumnCount())),
+            Any());
+        //pTable->commitGridControlEvent(CHILD,
+     //     makeAny( pTable->m_pAccessTable->m_pAccessible->getTableHeader(TCTYPE_ROWHEADERBAR)),
+        //  Any());
         //for (sal_Int32 i = 0 ; i <= m_pTableModel->getColumnCount() ; ++i)
         //{
         //  pTable->commitGridControlEvent(
   //              CHILD,
         //      makeAny( pTable->m_pAccessTable->m_pAccessible->getTable() ),
         //      Any());
-        //}

+        //}
     }
     //pTable->Invalidate();
 }
diff --git a/svtools/source/uno/svtxgridcontrol.hxx b/svtools/source/uno/svtxgridcontrol.hxx
index 9ca6901681c9..8e6931d0d805 100755..100644
--- a/svtools/source/uno/svtxgridcontrol.hxx
+++ b/svtools/source/uno/svtxgridcontrol.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: SVTXGridControl.hxx,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/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index a8d05c49a7ae..3f0b4e7c0ee6 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.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: toolboxcontroller.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/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 22a86f473703..a46b9605a00d 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.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: treecontrolpeer.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/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx
index e3738c1639eb..015e131321f8 100644
--- a/svtools/source/uno/treecontrolpeer.hxx
+++ b/svtools/source/uno/treecontrolpeer.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: treecontrolpeer.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/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
index b4ddc2cc472d..febb187fb289 100644
--- a/svtools/source/uno/unocontroltablemodel.cxx
+++ b/svtools/source/uno/unocontroltablemodel.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: unocontroltablemodel.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/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
index fe3d1f28e9ed..5be4ff2a16f7 100644
--- a/svtools/source/uno/unocontroltablemodel.hxx
+++ b/svtools/source/uno/unocontroltablemodel.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: unocontroltablemodel.hxx,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/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 6fc8b0017ad8..526cdbb5d03a 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.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: unoevent.cxx,v $
- * $Revision: 1.13.136.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/source/uno/unoifac2.hrc b/svtools/source/uno/unoifac2.hrc
index 4f46edffdc51..a31d07e0bd27 100644
--- a/svtools/source/uno/unoifac2.hrc
+++ b/svtools/source/uno/unoifac2.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: unoifac2.hrc,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/svtools/source/uno/unoifac2.src b/svtools/source/uno/unoifac2.src
index 661e3a68d248..406701ca4fc1 100644
--- a/svtools/source/uno/unoifac2.src
+++ b/svtools/source/uno/unoifac2.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: unoifac2.src,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/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index a1ff1ad2ac3e..f2090be1655f 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.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: unoiface.cxx,v $
- * $Revision: 1.32 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -549,86 +546,6 @@ void VCLXMultiLineEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
 
 }
 //  ----------------------------------------------------
-//  class VCLXFileDialog
-//  ----------------------------------------------------
-/*
-VCLXFileDialog::VCLXFileDialog()
-{
-}
-
-VCLXFileDialog::~VCLXFileDialog()
-{
-}
-
-::com::sun::star::uno::Any VCLXFileDialog::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
-{
-    ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
-                                        SAL_STATIC_CAST( ::com::sun::star::awt::XXX*, this ) );
-    return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
-}
-
-// ::com::sun::star::lang::XTypeProvider
-IMPL_XTYPEPROVIDER_START( VCLXFileDialog )
-    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XXX>* ) NULL )
-IMPL_XTYPEPROVIDER_END
-
-void VCLXFileDialog::setPath( const ::rtl::OUString& rPath )
-{
-    ::vos::OGuard aGuard( GetMutex() );
-
-    FileDialog* pDlg = (FileDialog*)GetWindow();
-    if ( pDlg )
-        pDlg->SetPath( ::rtl::OUStringToOString( rPath, CHARSET_SYSTEM ) );
-}
-
-::rtl::OUString VCLXFileDialog::getPath()
-{
-    ::vos::OGuard aGuard( GetMutex() );
-
-    ::rtl::OUString aPath;
-    FileDialog* pDlg = (FileDialog*)GetWindow();
-    if ( pDlg )
-        aPath = StringToOUString( pDlg->GetPath(), CHARSET_SYSTEM );
-    return aPath;
-}
-
-void VCLXFileDialog::setFilters( const ::com::sun::star::uno::Sequence< ::rtl::OUString>& rFilterNames, const ::com::sun::star::uno::Sequence< ::rtl::OUString>& rMasks )
-{
-    ::vos::OGuard aGuard( GetMutex() );
-
-    FileDialog* pDlg = (FileDialog*)GetWindow();
-    if ( pDlg )
-    {
-        sal_uInt32 nFlts = rFilterNames.getLength();
-        for ( sal_uInt32 n = 0; n < nFlts; n++ )
-            pDlg->AddFilter(
-                    ::rtl::OUStringToOString( rFilterNames.getConstArray()[n], CHARSET_SYSTEM ),
-                    ::rtl::OUStringToOString( rMasks.getConstArray()[n], CHARSET_SYSTEM ) );
-    }
-}
-
-void VCLXFileDialog::setCurrentFilter( const ::rtl::OUString& rFilterName )
-{
-    ::vos::OGuard aGuard( GetMutex() );
-
-    FileDialog* pDlg = (FileDialog*)GetWindow();
-    if ( pDlg )
-        pDlg->SetCurFilter( ::rtl::OUStringToOString( rFilterName, CHARSET_SYSTEM ) );
-}
-
-::rtl::OUString VCLXFileDialog::getCurrentFilter()
-{
-    ::vos::OGuard aGuard( GetMutex() );
-
-    ::rtl::OUString aFilter;
-    FileDialog* pDlg = (FileDialog*)GetWindow();
-    if ( pDlg )
-        aFilter = StringToOUString( pDlg->GetCurFilter(), CHARSET_SYSTEM );
-    return aFilter;
-}
-*/
-
-//  ----------------------------------------------------
 //  class VCLXFileControl
 //  ----------------------------------------------------
 VCLXFileControl::VCLXFileControl() : maTextListeners( *this )
@@ -1133,7 +1050,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const
         case ::com::sun::star::uno::TypeClass_DOUBLE:
             if (pField->TreatingAsNumber())
             {
-                double d;
+                double d = 0.0;
                 rValue >>= d;
                 aReturn <<= d;
             }
@@ -1145,7 +1062,7 @@ void SVTXFormattedField::setProperty( const ::rtl::OUString& PropertyName, const
                     // should never fail
 
                 Color* pDum;
-                double d;
+                double d = 0.0;
                 rValue >>= d;
                 String sConverted;
                 pFormatter->GetOutputString(d, 0, sConverted, &pDum);
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index 28d8c7acdc70..6b6e35482ae9 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.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: unoimap.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/svtools/source/urlobj/inetimg.cxx b/svtools/source/urlobj/inetimg.cxx
index 61781c2b3500..7e81f17209f2 100644
--- a/svtools/source/urlobj/inetimg.cxx
+++ b/svtools/source/urlobj/inetimg.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: inetimg.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/svtools/source/urlobj/makefile.mk b/svtools/source/urlobj/makefile.mk
index cb115ae5f701..c75e592ea10b 100644
--- a/svtools/source/urlobj/makefile.mk
+++ b/svtools/source/urlobj/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/util/hidother.src b/svtools/util/hidother.src
index 7fd1dadeb09f..77dd98115221 100644
--- a/svtools/util/hidother.src
+++ b/svtools/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.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/util/makefile.mk b/svtools/util/makefile.mk
index 22be04f95d3f..ab05facdb065 100644
--- a/svtools/util/makefile.mk
+++ b/svtools/util/makefile.mk
@@ -1,15 +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: makefile.mk,v $
-#
-# $Revision: 1.67 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,6 +58,7 @@ LIB1FILES=	\
         $(SLB)$/edit.lib		\
         $(SLB)$/filter.lib		\
         $(SLB)$/filter.uno.lib	\
+        $(SLB)$/graphic.lib	\
         $(SLB)$/igif.lib		\
         $(SLB)$/jpeg.lib		\
         $(SLB)$/ixpm.lib		\
diff --git a/svtools/util/svt.pmk b/svtools/util/svt.pmk
index 5f36197ce089..24d898f030c1 100644
--- a/svtools/util/svt.pmk
+++ b/svtools/util/svt.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: svt.pmk,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/svtools/workben/browser.cxx b/svtools/workben/browser.cxx
index e2bea14ef545..2f4f120a276b 100644
--- a/svtools/workben/browser.cxx
+++ b/svtools/workben/browser.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: browser.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/svtools/workben/cui/loadlib.cxx b/svtools/workben/cui/loadlib.cxx
index 4d27515dd6d1..85869e25cb97 100644
--- a/svtools/workben/cui/loadlib.cxx
+++ b/svtools/workben/cui/loadlib.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: loadlib.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/svtools/workben/cui/makefile.mk b/svtools/workben/cui/makefile.mk
index 2e59bbe20194..2c7d06682c77 100644
--- a/svtools/workben/cui/makefile.mk
+++ b/svtools/workben/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/workben/makefile.mk b/svtools/workben/makefile.mk
index 895bcda27292..9e50208b9ee9 100644
--- a/svtools/workben/makefile.mk
+++ b/svtools/workben/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/workben/stest.cxx b/svtools/workben/stest.cxx
index 0500367f72c5..85b7013663da 100644
--- a/svtools/workben/stest.cxx
+++ b/svtools/workben/stest.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: stest.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/svtools/workben/svdem.cxx b/svtools/workben/svdem.cxx
index 9144f97b2733..fd40d3d645fa 100644
--- a/svtools/workben/svdem.cxx
+++ b/svtools/workben/svdem.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: svdem.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/svtools/workben/treecontrol/makefile.mk b/svtools/workben/treecontrol/makefile.mk
index 4068abe8666a..2558ed2c9a94 100644
--- a/svtools/workben/treecontrol/makefile.mk
+++ b/svtools/workben/treecontrol/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/workben/treecontrol/treetest.cxx b/svtools/workben/treecontrol/treetest.cxx
index f0dc4959205e..f82c4ae388f5 100644
--- a/svtools/workben/treecontrol/treetest.cxx
+++ b/svtools/workben/treecontrol/treetest.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: treetest.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/svtools/workben/unodialog/makefile.mk b/svtools/workben/unodialog/makefile.mk
index c6cd6e5d8491..e9adb63d9b09 100644
--- a/svtools/workben/unodialog/makefile.mk
+++ b/svtools/workben/unodialog/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/svtools/workben/unodialog/roadmapskeleton.cxx b/svtools/workben/unodialog/roadmapskeleton.cxx
index f878e8b21435..f261f219c3fd 100644
--- a/svtools/workben/unodialog/roadmapskeleton.cxx
+++ b/svtools/workben/unodialog/roadmapskeleton.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: roadmapskeleton.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/svtools/workben/unodialog/roadmapskeleton.hrc b/svtools/workben/unodialog/roadmapskeleton.hrc
index bc312eb9724e..9b704e4a8f11 100644
--- a/svtools/workben/unodialog/roadmapskeleton.hrc
+++ b/svtools/workben/unodialog/roadmapskeleton.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: roadmapskeleton.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/svtools/workben/unodialog/roadmapskeleton.hxx b/svtools/workben/unodialog/roadmapskeleton.hxx
index fc5cfb39221e..216c940b842a 100644
--- a/svtools/workben/unodialog/roadmapskeleton.hxx
+++ b/svtools/workben/unodialog/roadmapskeleton.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: roadmapskeleton.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/svtools/workben/unodialog/roadmapskeleton.src b/svtools/workben/unodialog/roadmapskeleton.src
index e84ff356bea9..797490273b5f 100644
--- a/svtools/workben/unodialog/roadmapskeleton.src
+++ b/svtools/workben/unodialog/roadmapskeleton.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: roadmapskeleton.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/svtools/workben/unodialog/roadmapskeletonpages.cxx b/svtools/workben/unodialog/roadmapskeletonpages.cxx
index b6f57474cbef..9d9291f92da5 100644
--- a/svtools/workben/unodialog/roadmapskeletonpages.cxx
+++ b/svtools/workben/unodialog/roadmapskeletonpages.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: roadmapskeletonpages.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/svtools/workben/unodialog/roadmapskeletonpages.hxx b/svtools/workben/unodialog/roadmapskeletonpages.hxx
index 568125bead64..6b1d9b01710d 100644
--- a/svtools/workben/unodialog/roadmapskeletonpages.hxx
+++ b/svtools/workben/unodialog/roadmapskeletonpages.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: roadmapskeletonpages.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/svtools/workben/unodialog/udlg_global.hrc b/svtools/workben/unodialog/udlg_global.hrc
index bde0e5e86ce2..572de306f0df 100644
--- a/svtools/workben/unodialog/udlg_global.hrc
+++ b/svtools/workben/unodialog/udlg_global.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: udlg_global.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/svtools/workben/unodialog/udlg_module.cxx b/svtools/workben/unodialog/udlg_module.cxx
index 74486b15f233..da16bc5657ab 100644
--- a/svtools/workben/unodialog/udlg_module.cxx
+++ b/svtools/workben/unodialog/udlg_module.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: udlg_module.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/svtools/workben/unodialog/udlg_module.hxx b/svtools/workben/unodialog/udlg_module.hxx
index 87f35faf7a89..2f1b30d9afed 100644
--- a/svtools/workben/unodialog/udlg_module.hxx
+++ b/svtools/workben/unodialog/udlg_module.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: udlg_module.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/svtools/workben/unodialog/udlg_services.cxx b/svtools/workben/unodialog/udlg_services.cxx
index dcc66d87d90e..b71dceed5eba 100644
--- a/svtools/workben/unodialog/udlg_services.cxx
+++ b/svtools/workben/unodialog/udlg_services.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: udlg_services.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/svtools/workben/unodialog/unodialogsample.cxx b/svtools/workben/unodialog/unodialogsample.cxx
index 61a027478cf7..4eadc646fef5 100644
--- a/svtools/workben/unodialog/unodialogsample.cxx
+++ b/svtools/workben/unodialog/unodialogsample.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: unodialogsample.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/svtools/workben/urange.cxx b/svtools/workben/urange.cxx
index e73b7a319687..aa5eba3d5543 100644
--- a/svtools/workben/urange.cxx
+++ b/svtools/workben/urange.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: urange.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/toolkit/inc/layout/layout-post.hxx b/toolkit/inc/layout/layout-post.hxx
index d5597bb0073b..8ef66bf04470 100644
--- a/toolkit/inc/layout/layout-post.hxx
+++ b/toolkit/inc/layout/layout-post.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: layout-post.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/toolkit/inc/layout/layout-pre.hxx b/toolkit/inc/layout/layout-pre.hxx
index d8a1e5d9665c..09605ad440d5 100644
--- a/toolkit/inc/layout/layout-pre.hxx
+++ b/toolkit/inc/layout/layout-pre.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: layout-pre.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/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx
index 19179507b294..78c7ea29272a 100644
--- a/toolkit/inc/layout/layout.hxx
+++ b/toolkit/inc/layout/layout.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: layout.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/toolkit/inc/makefile.mk b/toolkit/inc/makefile.mk
index 6d5ff5cf1111..41100071a4d8 100644
--- a/toolkit/inc/makefile.mk
+++ b/toolkit/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/inc/pch/precompiled_toolkit.cxx b/toolkit/inc/pch/precompiled_toolkit.cxx
index 291093af142f..b448e489dc90 100644
--- a/toolkit/inc/pch/precompiled_toolkit.cxx
+++ b/toolkit/inc/pch/precompiled_toolkit.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: precompiled_toolkit.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/toolkit/inc/pch/precompiled_toolkit.hxx b/toolkit/inc/pch/precompiled_toolkit.hxx
index 93e0a2248a6b..386bd6803ca4 100644
--- a/toolkit/inc/pch/precompiled_toolkit.hxx
+++ b/toolkit/inc/pch/precompiled_toolkit.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_toolkit.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/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
index ccbd30436c5f..12e7b10d8330 100644
--- a/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/toolkit/inc/toolkit/awt/vclxaccessiblecomponent.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: vclxaccessiblecomponent.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/toolkit/inc/toolkit/awt/vclxbitmap.hxx b/toolkit/inc/toolkit/awt/vclxbitmap.hxx
index c689a2e3e00f..7712372dfaee 100644
--- a/toolkit/inc/toolkit/awt/vclxbitmap.hxx
+++ b/toolkit/inc/toolkit/awt/vclxbitmap.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: vclxbitmap.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/toolkit/inc/toolkit/awt/vclxcontainer.hxx b/toolkit/inc/toolkit/awt/vclxcontainer.hxx
index 4dea1683653c..b854844ae7f1 100644
--- a/toolkit/inc/toolkit/awt/vclxcontainer.hxx
+++ b/toolkit/inc/toolkit/awt/vclxcontainer.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: vclxcontainer.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/toolkit/inc/toolkit/awt/vclxdevice.hxx b/toolkit/inc/toolkit/awt/vclxdevice.hxx
index fa2196a92d66..62753a36136d 100644
--- a/toolkit/inc/toolkit/awt/vclxdevice.hxx
+++ b/toolkit/inc/toolkit/awt/vclxdevice.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: vclxdevice.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/toolkit/inc/toolkit/awt/vclxfont.hxx b/toolkit/inc/toolkit/awt/vclxfont.hxx
index 45a76ccfea9e..e912f2d13114 100644
--- a/toolkit/inc/toolkit/awt/vclxfont.hxx
+++ b/toolkit/inc/toolkit/awt/vclxfont.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: vclxfont.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/toolkit/inc/toolkit/awt/vclxgraphics.hxx b/toolkit/inc/toolkit/awt/vclxgraphics.hxx
index 1fcbe6ff7dc0..5fda9ac947ee 100644
--- a/toolkit/inc/toolkit/awt/vclxgraphics.hxx
+++ b/toolkit/inc/toolkit/awt/vclxgraphics.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: vclxgraphics.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/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx
index 74db73207250..c675ad1d4bd9 100644
--- a/toolkit/inc/toolkit/awt/vclxmenu.hxx
+++ b/toolkit/inc/toolkit/awt/vclxmenu.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: vclxmenu.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/toolkit/inc/toolkit/awt/vclxpointer.hxx b/toolkit/inc/toolkit/awt/vclxpointer.hxx
index aa7a244eb423..2dd694f6e742 100644
--- a/toolkit/inc/toolkit/awt/vclxpointer.hxx
+++ b/toolkit/inc/toolkit/awt/vclxpointer.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: vclxpointer.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/toolkit/inc/toolkit/awt/vclxprinter.hxx b/toolkit/inc/toolkit/awt/vclxprinter.hxx
index e94864b51280..a7991d38a387 100644
--- a/toolkit/inc/toolkit/awt/vclxprinter.hxx
+++ b/toolkit/inc/toolkit/awt/vclxprinter.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: vclxprinter.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,9 +40,7 @@
 #include <toolkit/helper/mutexandbroadcasthelper.hxx>
 #include <cppuhelper/propshlp.hxx>
 
-class Printer;
-class String;
-
+#include "vcl/oldprintadaptor.hxx"
 
 // Fuer den Drucker relevante Properties:
 /*
@@ -65,20 +60,17 @@ class VCLXPrinterPropertySet :  public ::com::sun::star::awt::XPrinterPropertySe
                                 public MutexAndBroadcastHelper,
                                 public ::cppu::OPropertySetHelper
 {
-private:
-    Printer*                    mpPrinter;
+protected:
+    boost::shared_ptr<Printer>                      mpPrinter;
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >  mxPrnDevice;
 
     sal_Int16                   mnOrientation;
     sal_Bool                    mbHorizontal;
-
-protected:
-
 public:
     VCLXPrinterPropertySet( const String& rPrinterName );
     virtual ~VCLXPrinterPropertySet();
 
-    Printer*                    GetPrinter() const { return mpPrinter; }
+    Printer*                    GetPrinter() const { return mpPrinter.get(); }
     ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >  GetDevice();
 
     // ::com::sun::star::uno::XInterface
@@ -120,6 +112,8 @@ class VCLXPrinter:  public ::com::sun::star::awt::XPrinter,
                     public VCLXPrinterPropertySet,
                     public ::cppu::OWeakObject
 {
+    boost::shared_ptr<vcl::OldStylePrintAdaptor>    mpListener;
+    JobSetup                                        maInitJobSetup;
 public:
                     VCLXPrinter( const String& rPrinterName );
                     ~VCLXPrinter();
diff --git a/toolkit/inc/toolkit/awt/vclxregion.hxx b/toolkit/inc/toolkit/awt/vclxregion.hxx
index fe15bc1e60c6..3e95c880558b 100644
--- a/toolkit/inc/toolkit/awt/vclxregion.hxx
+++ b/toolkit/inc/toolkit/awt/vclxregion.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: vclxregion.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/toolkit/inc/toolkit/awt/vclxspinbutton.hxx b/toolkit/inc/toolkit/awt/vclxspinbutton.hxx
index 4808e2d2dacd..f855b6efb948 100644
--- a/toolkit/inc/toolkit/awt/vclxspinbutton.hxx
+++ b/toolkit/inc/toolkit/awt/vclxspinbutton.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: vclxspinbutton.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/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx b/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx
index a664d0637746..5448bfaff320 100644
--- a/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.hxx
+++ b/toolkit/inc/toolkit/awt/vclxsystemdependentwindow.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: vclxsystemdependentwindow.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/toolkit/inc/toolkit/awt/vclxtoolkit.hxx b/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
index 7fda213683f2..3f37ac58200f 100644
--- a/toolkit/inc/toolkit/awt/vclxtoolkit.hxx
+++ b/toolkit/inc/toolkit/awt/vclxtoolkit.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: vclxtoolkit.hxx,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/toolkit/inc/toolkit/awt/vclxtopwindow.hxx b/toolkit/inc/toolkit/awt/vclxtopwindow.hxx
index 4716120a347b..d8e467b01499 100644
--- a/toolkit/inc/toolkit/awt/vclxtopwindow.hxx
+++ b/toolkit/inc/toolkit/awt/vclxtopwindow.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: vclxtopwindow.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/toolkit/inc/toolkit/awt/vclxwindow.hxx b/toolkit/inc/toolkit/awt/vclxwindow.hxx
index 8aab5a769df1..97f36850dff9 100644
--- a/toolkit/inc/toolkit/awt/vclxwindow.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindow.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: vclxwindow.hxx,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/toolkit/inc/toolkit/awt/vclxwindows.hxx b/toolkit/inc/toolkit/awt/vclxwindows.hxx
index b6958c720f29..c334e4d9af65 100644
--- a/toolkit/inc/toolkit/awt/vclxwindows.hxx
+++ b/toolkit/inc/toolkit/awt/vclxwindows.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: vclxwindows.hxx,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/toolkit/inc/toolkit/awt/xsimpleanimation.hxx b/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
index bb4564d3dcfd..dc8fbe4506ed 100644
--- a/toolkit/inc/toolkit/awt/xsimpleanimation.hxx
+++ b/toolkit/inc/toolkit/awt/xsimpleanimation.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: xsimpleanimation.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/toolkit/inc/toolkit/awt/xthrobber.hxx b/toolkit/inc/toolkit/awt/xthrobber.hxx
index 83b6ef0a844b..511f3f76ecf6 100644
--- a/toolkit/inc/toolkit/awt/xthrobber.hxx
+++ b/toolkit/inc/toolkit/awt/xthrobber.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: xthrobber.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/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx b/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx
index 01b61577c29d..bc5f1e1295a2 100644
--- a/toolkit/inc/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/toolkit/inc/toolkit/controls/accessiblecontrolcontext.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: accessiblecontrolcontext.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/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 903e400eed32..b6a0e66b2430 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.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: dialogcontrol.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/toolkit/inc/toolkit/controls/eventcontainer.hxx b/toolkit/inc/toolkit/controls/eventcontainer.hxx
index 665df23c81d2..d0b7adbbe497 100644
--- a/toolkit/inc/toolkit/controls/eventcontainer.hxx
+++ b/toolkit/inc/toolkit/controls/eventcontainer.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: eventcontainer.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/toolkit/inc/toolkit/controls/formattedcontrol.hxx b/toolkit/inc/toolkit/controls/formattedcontrol.hxx
index aafd645c76ce..f589dabd47aa 100644
--- a/toolkit/inc/toolkit/controls/formattedcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/formattedcontrol.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: formattedcontrol.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/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
index 849a993c0c8f..05b3016e690a 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel.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: geometrycontrolmodel.hxx,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/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
index 5d2b3cdb4868..d6491877c7ad 100644
--- a/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.hxx
+++ b/toolkit/inc/toolkit/controls/geometrycontrolmodel_impl.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: geometrycontrolmodel_impl.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/toolkit/inc/toolkit/controls/roadmapcontrol.hxx b/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
index 1ca850cdabfa..7ac858a6a7b7 100644
--- a/toolkit/inc/toolkit/controls/roadmapcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/roadmapcontrol.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: roadmapcontrol.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/toolkit/inc/toolkit/controls/roadmapentry.hxx b/toolkit/inc/toolkit/controls/roadmapentry.hxx
index 16ba58841a28..6f43f0510465 100644
--- a/toolkit/inc/toolkit/controls/roadmapentry.hxx
+++ b/toolkit/inc/toolkit/controls/roadmapentry.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: roadmapentry.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/toolkit/inc/toolkit/controls/stdtabcontroller.hxx b/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
index 98b52e725c18..9dc5ae1a2d5a 100644
--- a/toolkit/inc/toolkit/controls/stdtabcontroller.hxx
+++ b/toolkit/inc/toolkit/controls/stdtabcontroller.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: stdtabcontroller.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/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx
index 9708430d25ad..d49fa720d5fd 100644
--- a/toolkit/inc/toolkit/controls/stdtabcontrollermodel.hxx
+++ b/toolkit/inc/toolkit/controls/stdtabcontrollermodel.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: stdtabcontrollermodel.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/toolkit/inc/toolkit/controls/tkscrollbar.hxx b/toolkit/inc/toolkit/controls/tkscrollbar.hxx
index 7f8fce5900d1..78795aa240c2 100644
--- a/toolkit/inc/toolkit/controls/tkscrollbar.hxx
+++ b/toolkit/inc/toolkit/controls/tkscrollbar.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: tkscrollbar.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/toolkit/inc/toolkit/controls/tksimpleanimation.hxx b/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
index 9c47deddf86c..697d1679af45 100644
--- a/toolkit/inc/toolkit/controls/tksimpleanimation.hxx
+++ b/toolkit/inc/toolkit/controls/tksimpleanimation.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: tksimpleanimation.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/toolkit/inc/toolkit/controls/tkspinbutton.hxx b/toolkit/inc/toolkit/controls/tkspinbutton.hxx
index 40a6048190f6..48c602f76cfc 100644
--- a/toolkit/inc/toolkit/controls/tkspinbutton.hxx
+++ b/toolkit/inc/toolkit/controls/tkspinbutton.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: tkspinbutton.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/toolkit/inc/toolkit/controls/tkthrobber.hxx b/toolkit/inc/toolkit/controls/tkthrobber.hxx
index 27c82380f794..d6c3a3d8a511 100644
--- a/toolkit/inc/toolkit/controls/tkthrobber.hxx
+++ b/toolkit/inc/toolkit/controls/tkthrobber.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: tkthrobber.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/toolkit/inc/toolkit/controls/unocontrol.hxx b/toolkit/inc/toolkit/controls/unocontrol.hxx
index d7a6d749902b..578b5070e8e8 100644
--- a/toolkit/inc/toolkit/controls/unocontrol.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrol.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: unocontrol.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/toolkit/inc/toolkit/controls/unocontrolbase.hxx b/toolkit/inc/toolkit/controls/unocontrolbase.hxx
index 08a82642a402..60dcc040e0e7 100644
--- a/toolkit/inc/toolkit/controls/unocontrolbase.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolbase.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: unocontrolbase.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/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
index 6f9fa9a95f1f..1175d0e85abb 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainer.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainer.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: unocontrolcontainer.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/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
index 264afd0fc614..ef0d9a4068ee 100644
--- a/toolkit/inc/toolkit/controls/unocontrolcontainermodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolcontainermodel.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: unocontrolcontainermodel.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/toolkit/inc/toolkit/controls/unocontrolmodel.hxx b/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
index d1e3cd3af3a8..2de5e36aa02c 100644
--- a/toolkit/inc/toolkit/controls/unocontrolmodel.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrolmodel.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: unocontrolmodel.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/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 97ba5fb045b6..a4015dfd3b44 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.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: unocontrols.hxx,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/toolkit/inc/toolkit/dllapi.h b/toolkit/inc/toolkit/dllapi.h
index 256c93c077e4..02e64153310c 100644
--- a/toolkit/inc/toolkit/dllapi.h
+++ b/toolkit/inc/toolkit/dllapi.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: dllapi.h,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/toolkit/inc/toolkit/helper/accessibilityclient.hxx b/toolkit/inc/toolkit/helper/accessibilityclient.hxx
index a6c218599a0e..732e2d76279a 100644
--- a/toolkit/inc/toolkit/helper/accessibilityclient.hxx
+++ b/toolkit/inc/toolkit/helper/accessibilityclient.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: accessibilityclient.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/toolkit/inc/toolkit/helper/accessiblefactory.hxx b/toolkit/inc/toolkit/helper/accessiblefactory.hxx
index bd25045768f9..f3f28287d460 100644
--- a/toolkit/inc/toolkit/helper/accessiblefactory.hxx
+++ b/toolkit/inc/toolkit/helper/accessiblefactory.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: accessiblefactory.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/toolkit/inc/toolkit/helper/convert.hxx b/toolkit/inc/toolkit/helper/convert.hxx
index 72037e5c96e7..5de2b8861abf 100644
--- a/toolkit/inc/toolkit/helper/convert.hxx
+++ b/toolkit/inc/toolkit/helper/convert.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: convert.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/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx b/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx
index dabf0953382c..e35b1395eb54 100644
--- a/toolkit/inc/toolkit/helper/emptyfontdescriptor.hxx
+++ b/toolkit/inc/toolkit/helper/emptyfontdescriptor.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: emptyfontdescriptor.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/toolkit/inc/toolkit/helper/externallock.hxx b/toolkit/inc/toolkit/helper/externallock.hxx
index dd488ee26135..75246a829790 100644
--- a/toolkit/inc/toolkit/helper/externallock.hxx
+++ b/toolkit/inc/toolkit/helper/externallock.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: externallock.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/toolkit/inc/toolkit/helper/fixedhyperbase.hxx b/toolkit/inc/toolkit/helper/fixedhyperbase.hxx
index b0a124e74d24..4688e2a3f33d 100644
--- a/toolkit/inc/toolkit/helper/fixedhyperbase.hxx
+++ b/toolkit/inc/toolkit/helper/fixedhyperbase.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: fixedhyperbase.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/toolkit/inc/toolkit/helper/formpdfexport.hxx b/toolkit/inc/toolkit/helper/formpdfexport.hxx
index cc245b3fef17..502f25520145 100644
--- a/toolkit/inc/toolkit/helper/formpdfexport.hxx
+++ b/toolkit/inc/toolkit/helper/formpdfexport.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: formpdfexport.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/toolkit/inc/toolkit/helper/imagealign.hxx b/toolkit/inc/toolkit/helper/imagealign.hxx
index bd9ce2a026aa..5d725a692bc6 100644
--- a/toolkit/inc/toolkit/helper/imagealign.hxx
+++ b/toolkit/inc/toolkit/helper/imagealign.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: imagealign.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/toolkit/inc/toolkit/helper/listenermultiplexer.hxx b/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
index 543c8a85c401..65e555f9d799 100644
--- a/toolkit/inc/toolkit/helper/listenermultiplexer.hxx
+++ b/toolkit/inc/toolkit/helper/listenermultiplexer.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: listenermultiplexer.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/toolkit/inc/toolkit/helper/macros.hxx b/toolkit/inc/toolkit/helper/macros.hxx
index 2d9ef1ad6d7d..48386d9a404c 100644
--- a/toolkit/inc/toolkit/helper/macros.hxx
+++ b/toolkit/inc/toolkit/helper/macros.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: macros.hxx,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/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx
index 6ab1d9440ed9..c84a6e54d73b 100644
--- a/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.hxx
+++ b/toolkit/inc/toolkit/helper/mutexandbroadcasthelper.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: mutexandbroadcasthelper.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/toolkit/inc/toolkit/helper/mutexhelper.hxx b/toolkit/inc/toolkit/helper/mutexhelper.hxx
index d2d79870a13b..43d5e77b353e 100644
--- a/toolkit/inc/toolkit/helper/mutexhelper.hxx
+++ b/toolkit/inc/toolkit/helper/mutexhelper.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: mutexhelper.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/toolkit/inc/toolkit/helper/property.hxx b/toolkit/inc/toolkit/helper/property.hxx
index f82df1f5b53f..b6d4fee27e00 100644
--- a/toolkit/inc/toolkit/helper/property.hxx
+++ b/toolkit/inc/toolkit/helper/property.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: property.hxx,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/toolkit/inc/toolkit/helper/servicenames.hxx b/toolkit/inc/toolkit/helper/servicenames.hxx
index 89810ae69482..70f18f91fb09 100644
--- a/toolkit/inc/toolkit/helper/servicenames.hxx
+++ b/toolkit/inc/toolkit/helper/servicenames.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: servicenames.hxx,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/toolkit/inc/toolkit/helper/solarrelease.hxx b/toolkit/inc/toolkit/helper/solarrelease.hxx
index 9e09d9740467..d8938b41c220 100644
--- a/toolkit/inc/toolkit/helper/solarrelease.hxx
+++ b/toolkit/inc/toolkit/helper/solarrelease.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: solarrelease.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/toolkit/inc/toolkit/helper/throbberimpl.hxx b/toolkit/inc/toolkit/helper/throbberimpl.hxx
index 441f0674ba53..5ca6ec83d330 100644
--- a/toolkit/inc/toolkit/helper/throbberimpl.hxx
+++ b/toolkit/inc/toolkit/helper/throbberimpl.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: throbberimpl.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/toolkit/inc/toolkit/helper/tkresmgr.hxx b/toolkit/inc/toolkit/helper/tkresmgr.hxx
index c94c0dd33153..d7a1c42ea13c 100644
--- a/toolkit/inc/toolkit/helper/tkresmgr.hxx
+++ b/toolkit/inc/toolkit/helper/tkresmgr.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: tkresmgr.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/toolkit/inc/toolkit/helper/unomemorystream.hxx b/toolkit/inc/toolkit/helper/unomemorystream.hxx
index 50c41303018e..c7d91e076f73 100644
--- a/toolkit/inc/toolkit/helper/unomemorystream.hxx
+++ b/toolkit/inc/toolkit/helper/unomemorystream.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: unomemorystream.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/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
index 1741f3f8629c..2a42d05b72fd 100644
--- a/toolkit/inc/toolkit/helper/unopropertyarrayhelper.hxx
+++ b/toolkit/inc/toolkit/helper/unopropertyarrayhelper.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: unopropertyarrayhelper.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/toolkit/inc/toolkit/helper/unowrapper.hxx b/toolkit/inc/toolkit/helper/unowrapper.hxx
index e77f1962ca1a..31cc259b7fd0 100644
--- a/toolkit/inc/toolkit/helper/unowrapper.hxx
+++ b/toolkit/inc/toolkit/helper/unowrapper.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: unowrapper.hxx,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/toolkit/inc/toolkit/helper/vclunohelper.hxx b/toolkit/inc/toolkit/helper/vclunohelper.hxx
index e29b7237abb8..cc11f3a586bb 100644
--- a/toolkit/inc/toolkit/helper/vclunohelper.hxx
+++ b/toolkit/inc/toolkit/helper/vclunohelper.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: vclunohelper.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/toolkit/qa/complex/toolkit/CallbackClass.java b/toolkit/qa/complex/toolkit/CallbackClass.java
index 2be0e3aac14d..efc0ef91f7c0 100644
--- a/toolkit/qa/complex/toolkit/CallbackClass.java
+++ b/toolkit/qa/complex/toolkit/CallbackClass.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: CallbackClass.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/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java
index 52b1b9bb12d2..fee95f2e6de0 100755
--- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.java
+++ b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBar.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: CheckAccessibleStatusBar.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/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java
index c5579cffbf61..36394732ce78 100755
--- a/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.java
+++ b/toolkit/qa/complex/toolkit/CheckAccessibleStatusBarItem.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: CheckAccessibleStatusBarItem.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/toolkit/qa/complex/toolkit/CheckAsyncCallback.java b/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
index e4d1338b9998..cc184f3c1a73 100644
--- a/toolkit/qa/complex/toolkit/CheckAsyncCallback.java
+++ b/toolkit/qa/complex/toolkit/CheckAsyncCallback.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: CheckAsyncCallback.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/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java
index 4c559bb0126e..e3d80629be40 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleComponent.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: _XAccessibleComponent.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/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java
index 99e16fa7b60e..230eb3d098d3 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleContext.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: _XAccessibleContext.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/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java
index df95cb98d2d6..18a20d02e233 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleEventBroadcaster.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: _XAccessibleEventBroadcaster.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/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java
index 614fd005f5dc..e022e60d90c0 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleExtendedComponent.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: _XAccessibleExtendedComponent.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/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java
index c2ed9f217d5d..d6357e8f24bc 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XAccessibleText.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: _XAccessibleText.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/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java b/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java
index 64a97f003b9c..472412e80aa6 100644
--- a/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.java
+++ b/toolkit/qa/complex/toolkit/interface_tests/_XRequestCallback.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: _XRequestCallback.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/toolkit/qa/complex/toolkit/interface_tests/makefile.mk b/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
index ed7855663f36..0e324109f28d 100755
--- a/toolkit/qa/complex/toolkit/interface_tests/makefile.mk
+++ b/toolkit/qa/complex/toolkit/interface_tests/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.5.42.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/qa/complex/toolkit/makefile.mk b/toolkit/qa/complex/toolkit/makefile.mk
index c895c8403498..3a4e096719bb 100755
--- a/toolkit/qa/complex/toolkit/makefile.mk
+++ b/toolkit/qa/complex/toolkit/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.5.42.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java b/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
index 8f2d5ca839c5..654f5ec69da5 100644
--- a/toolkit/qa/complex/xunitconversion/XUnitConversionTest.java
+++ b/toolkit/qa/complex/xunitconversion/XUnitConversionTest.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: XUnitConversionTest.java,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/toolkit/qa/complex/xunitconversion/makefile.mk b/toolkit/qa/complex/xunitconversion/makefile.mk
index a8be7a6ffb42..18b59ee19f18 100644
--- a/toolkit/qa/complex/xunitconversion/makefile.mk
+++ b/toolkit/qa/complex/xunitconversion/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.2.26.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/qa/unoapi/makefile.mk b/toolkit/qa/unoapi/makefile.mk
index 2002e0d02978..a24f81d7c6ef 100644
--- a/toolkit/qa/unoapi/makefile.mk
+++ b/toolkit/qa/unoapi/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/awt/asynccallback.cxx b/toolkit/source/awt/asynccallback.cxx
index f804faff5b12..593feb582274 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.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: asynccallback.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/toolkit/source/awt/forward.hxx b/toolkit/source/awt/forward.hxx
index 2ec346dbdcf9..0228be562b2c 100644
--- a/toolkit/source/awt/forward.hxx
+++ b/toolkit/source/awt/forward.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: forward.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/toolkit/source/awt/makefile.mk b/toolkit/source/awt/makefile.mk
index 406386c5723e..a53e9e22ba2d 100644
--- a/toolkit/source/awt/makefile.mk
+++ b/toolkit/source/awt/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.35 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx
index 9bdbfcfc21f7..7a3b9ff5b2ec 100644
--- a/toolkit/source/awt/vclxaccessiblecomponent.cxx
+++ b/toolkit/source/awt/vclxaccessiblecomponent.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: vclxaccessiblecomponent.cxx,v $
- * $Revision: 1.59 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/awt/vclxbitmap.cxx b/toolkit/source/awt/vclxbitmap.cxx
index 37cd8291d3e6..44d909674ca4 100644
--- a/toolkit/source/awt/vclxbitmap.cxx
+++ b/toolkit/source/awt/vclxbitmap.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: vclxbitmap.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/toolkit/source/awt/vclxbutton.cxx b/toolkit/source/awt/vclxbutton.cxx
index 2665c5e1e44d..3701eee409c3 100644
--- a/toolkit/source/awt/vclxbutton.cxx
+++ b/toolkit/source/awt/vclxbutton.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: vclxbutton.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/toolkit/source/awt/vclxbutton.hxx b/toolkit/source/awt/vclxbutton.hxx
index 6e433caca0be..5ec29321cb4f 100644
--- a/toolkit/source/awt/vclxbutton.hxx
+++ b/toolkit/source/awt/vclxbutton.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: vclxbutton.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/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx
index da5764e14ef2..d86b3bbb5591 100644
--- a/toolkit/source/awt/vclxcontainer.cxx
+++ b/toolkit/source/awt/vclxcontainer.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: vclxcontainer.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/toolkit/source/awt/vclxdevice.cxx b/toolkit/source/awt/vclxdevice.cxx
index 79c3da6093ab..310f01a97679 100644
--- a/toolkit/source/awt/vclxdevice.cxx
+++ b/toolkit/source/awt/vclxdevice.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: vclxdevice.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/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx
index 32f2931e7438..43861c3ed347 100644
--- a/toolkit/source/awt/vclxdialog.cxx
+++ b/toolkit/source/awt/vclxdialog.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: vclxdialog.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/toolkit/source/awt/vclxdialog.hxx b/toolkit/source/awt/vclxdialog.hxx
index 65d4c5d42130..64b2c03f90d5 100644
--- a/toolkit/source/awt/vclxdialog.hxx
+++ b/toolkit/source/awt/vclxdialog.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: vclxdialog.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/toolkit/source/awt/vclxfixedline.cxx b/toolkit/source/awt/vclxfixedline.cxx
index 2517c449946e..8c77a4f35e19 100644
--- a/toolkit/source/awt/vclxfixedline.cxx
+++ b/toolkit/source/awt/vclxfixedline.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: vclxfixedline.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/toolkit/source/awt/vclxfixedline.hxx b/toolkit/source/awt/vclxfixedline.hxx
index a84d579bd24a..d7dfd76d961f 100644
--- a/toolkit/source/awt/vclxfixedline.hxx
+++ b/toolkit/source/awt/vclxfixedline.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: vclxfixedline.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/toolkit/source/awt/vclxfont.cxx b/toolkit/source/awt/vclxfont.cxx
index 2917ff8fd9ca..53175ec79d24 100644
--- a/toolkit/source/awt/vclxfont.cxx
+++ b/toolkit/source/awt/vclxfont.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: vclxfont.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/toolkit/source/awt/vclxgraphics.cxx b/toolkit/source/awt/vclxgraphics.cxx
index 34468697d447..bfbdb531e8d2 100644
--- a/toolkit/source/awt/vclxgraphics.cxx
+++ b/toolkit/source/awt/vclxgraphics.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: vclxgraphics.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/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index 5200849d66ed..1992a8d721a6 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.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: vclxmenu.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/toolkit/source/awt/vclxplugin.cxx b/toolkit/source/awt/vclxplugin.cxx
index 4ad306d31e70..29264ef0a85d 100644
--- a/toolkit/source/awt/vclxplugin.cxx
+++ b/toolkit/source/awt/vclxplugin.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$
+ * 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., 51 Franklin Street, 5th Floor, Boston,
- *    MA  02110-1301  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/toolkit/source/awt/vclxplugin.hxx b/toolkit/source/awt/vclxplugin.hxx
index b6a7f04b56f6..49a2b2950854 100644
--- a/toolkit/source/awt/vclxplugin.hxx
+++ b/toolkit/source/awt/vclxplugin.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$
+ * 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., 51 Franklin Street, 5th Floor, Boston,
- *    MA  02110-1301  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/toolkit/source/awt/vclxpointer.cxx b/toolkit/source/awt/vclxpointer.cxx
index e0e81b079c97..d6f2160fb694 100644
--- a/toolkit/source/awt/vclxpointer.cxx
+++ b/toolkit/source/awt/vclxpointer.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: vclxpointer.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/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx
index 69d8dd827497..3c100c7c2186 100644
--- a/toolkit/source/awt/vclxprinter.cxx
+++ b/toolkit/source/awt/vclxprinter.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: vclxprinter.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -102,10 +99,10 @@ IMPL_XTYPEPROVIDER_END
 
 VCLXPrinterPropertySet::VCLXPrinterPropertySet( const String& rPrinterName )
     : OPropertySetHelper( BrdcstHelper )
+    , mpPrinter( new Printer( rPrinterName ) )
 {
     osl::Guard< vos::IMutex > aSolarGuard( Application::GetSolarMutex() );
 
-    mpPrinter = new Printer( rPrinterName );
     mnOrientation = 0;
     mbHorizontal = sal_False;
 }
@@ -113,8 +110,7 @@ VCLXPrinterPropertySet::VCLXPrinterPropertySet( const String& rPrinterName )
 VCLXPrinterPropertySet::~VCLXPrinterPropertySet()
 {
     osl::Guard< vos::IMutex > aSolarGuard( Application::GetSolarMutex() );
-
-     delete mpPrinter;
+    mpPrinter.reset();
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice >  VCLXPrinterPropertySet::GetDevice()
@@ -326,13 +322,16 @@ IMPL_XTYPEPROVIDER_START( VCLXPrinter )
     VCLXPrinterPropertySet::getTypes()
 IMPL_XTYPEPROVIDER_END
 
-sal_Bool VCLXPrinter::start( const ::rtl::OUString& rJobName, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
+sal_Bool VCLXPrinter::start( const ::rtl::OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
 
     sal_Bool bDone = sal_True;
-    if ( GetPrinter() )
-        bDone = GetPrinter()->StartJob( rJobName );
+    if ( mpListener.get() )
+    {
+        maInitJobSetup = mpPrinter->GetJobSetup();
+        mpListener.reset( new vcl::OldStylePrintAdaptor( mpPrinter ) );
+    }
 
     return bDone;
 }
@@ -341,24 +340,28 @@ void VCLXPrinter::end(  ) throw(::com::sun::star::awt::PrinterException, ::com::
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
 
-    if ( GetPrinter() )
-        GetPrinter()->EndJob();
+    if ( mpListener.get() )
+    {
+        Printer::PrintJob( mpListener, maInitJobSetup );
+        mpListener.reset();
+    }
 }
 
 void VCLXPrinter::terminate(  ) throw(::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
 
-    if ( GetPrinter() )
-        GetPrinter()->AbortJob();
+    mpListener.reset();
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXPrinter::startPage(  ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException)
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
 
-    if ( GetPrinter() )
-        GetPrinter()->StartPage();
+    if ( mpListener.get() )
+    {
+        mpListener->StartPage();
+    }
     return GetDevice();
 }
 
@@ -366,8 +369,10 @@ void VCLXPrinter::endPage(  ) throw(::com::sun::star::awt::PrinterException, ::c
 {
     ::osl::Guard< ::osl::Mutex > aGuard( Mutex );
 
-    if ( GetPrinter() )
-        GetPrinter()->EndPage();
+    if ( mpListener.get() )
+    {
+        mpListener->EndPage();
+    }
 }
 
 
diff --git a/toolkit/source/awt/vclxregion.cxx b/toolkit/source/awt/vclxregion.cxx
index 8a09c6ad49f9..3c4bbcad2d79 100644
--- a/toolkit/source/awt/vclxregion.cxx
+++ b/toolkit/source/awt/vclxregion.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: vclxregion.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/toolkit/source/awt/vclxscroller.cxx b/toolkit/source/awt/vclxscroller.cxx
index c2729a0bfeb3..834632a7548b 100644
--- a/toolkit/source/awt/vclxscroller.cxx
+++ b/toolkit/source/awt/vclxscroller.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: vclxscroller.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/toolkit/source/awt/vclxscroller.hxx b/toolkit/source/awt/vclxscroller.hxx
index 745e4d5588d7..be2524020c72 100644
--- a/toolkit/source/awt/vclxscroller.hxx
+++ b/toolkit/source/awt/vclxscroller.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: vclxscroller.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/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx
index 79e9b027e8cd..e9c2b3271396 100644
--- a/toolkit/source/awt/vclxspinbutton.cxx
+++ b/toolkit/source/awt/vclxspinbutton.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: vclxspinbutton.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/toolkit/source/awt/vclxsplitter.cxx b/toolkit/source/awt/vclxsplitter.cxx
index 33c1beb6ed41..07fcf96cb813 100644
--- a/toolkit/source/awt/vclxsplitter.cxx
+++ b/toolkit/source/awt/vclxsplitter.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: vclxsplitter.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/toolkit/source/awt/vclxsplitter.hxx b/toolkit/source/awt/vclxsplitter.hxx
index 8ed5d572e030..69be466e6be8 100644
--- a/toolkit/source/awt/vclxsplitter.hxx
+++ b/toolkit/source/awt/vclxsplitter.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: vclxsplitter.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/toolkit/source/awt/vclxsystemdependentwindow.cxx b/toolkit/source/awt/vclxsystemdependentwindow.cxx
index ff25d16c4841..a0d8febb44f0 100644
--- a/toolkit/source/awt/vclxsystemdependentwindow.cxx
+++ b/toolkit/source/awt/vclxsystemdependentwindow.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: vclxsystemdependentwindow.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/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx
index 908554c9ae0c..1dfd52678957 100644
--- a/toolkit/source/awt/vclxtabcontrol.cxx
+++ b/toolkit/source/awt/vclxtabcontrol.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: vclxtabcontrol.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/toolkit/source/awt/vclxtabcontrol.hxx b/toolkit/source/awt/vclxtabcontrol.hxx
index 0db5d9707a3f..8f5debf2626c 100644
--- a/toolkit/source/awt/vclxtabcontrol.hxx
+++ b/toolkit/source/awt/vclxtabcontrol.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: vclxtabcontrol.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/toolkit/source/awt/vclxtabpage.cxx b/toolkit/source/awt/vclxtabpage.cxx
index 0b7bbd008a86..6523f7e98c5f 100644
--- a/toolkit/source/awt/vclxtabpage.cxx
+++ b/toolkit/source/awt/vclxtabpage.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$
+ * 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., 51 Franklin Street, 5th Floor, Boston,
- *    MA  02110-1301  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/toolkit/source/awt/vclxtabpage.hxx b/toolkit/source/awt/vclxtabpage.hxx
index a31db2e69781..215ee49c5716 100644
--- a/toolkit/source/awt/vclxtabpage.hxx
+++ b/toolkit/source/awt/vclxtabpage.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$
+ * 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., 51 Franklin Street, 5th Floor, Boston,
- *    MA  02110-1301  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/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index eeacd037d7c1..2eeafa73d2d2 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.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: vclxtoolkit.cxx,v $
- * $Revision: 1.71 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/awt/vclxtopwindow.cxx b/toolkit/source/awt/vclxtopwindow.cxx
index 6e532c7bef3e..10220a87de63 100644
--- a/toolkit/source/awt/vclxtopwindow.cxx
+++ b/toolkit/source/awt/vclxtopwindow.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: vclxtopwindow.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/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 3d2069ab8385..045a46729961 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.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: vclxwindow.cxx,v $
- * $Revision: 1.90 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/awt/vclxwindow1.cxx b/toolkit/source/awt/vclxwindow1.cxx
index 4a5315008b9f..daea557d241a 100644
--- a/toolkit/source/awt/vclxwindow1.cxx
+++ b/toolkit/source/awt/vclxwindow1.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: vclxwindow1.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/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx
index 7757d170256a..e2fc78421d5e 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.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: vclxwindows.cxx,v $
- * $Revision: 1.69.4.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -3390,6 +3387,7 @@ void VCLXEdit::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
                      BASEPROPERTY_PAINTTRANSPARENT,
                      BASEPROPERTY_AUTOHSCROLL,
                      BASEPROPERTY_AUTOVSCROLL,
+                     BASEPROPERTY_VERTICALALIGN,
                      BASEPROPERTY_WRITING_MODE,
                      BASEPROPERTY_CONTEXT_WRITING_MODE,
                      0);
@@ -4283,6 +4281,7 @@ void VCLXDateField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
                      BASEPROPERTY_ENFORCE_FORMAT,
                      BASEPROPERTY_TEXT,
                      BASEPROPERTY_HIDEINACTIVESELECTION,
+                     BASEPROPERTY_VERTICALALIGN,
                      BASEPROPERTY_WRITING_MODE,
                      BASEPROPERTY_CONTEXT_WRITING_MODE,
                      BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR,
@@ -4624,6 +4623,7 @@ void VCLXTimeField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
                      BASEPROPERTY_ENFORCE_FORMAT,
                      BASEPROPERTY_TEXT,
                      BASEPROPERTY_HIDEINACTIVESELECTION,
+                     BASEPROPERTY_VERTICALALIGN,
                      BASEPROPERTY_WRITING_MODE,
                      BASEPROPERTY_CONTEXT_WRITING_MODE,
                      BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR,
@@ -4927,6 +4927,7 @@ void VCLXNumericField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
                      BASEPROPERTY_VALUE_DOUBLE,
                      BASEPROPERTY_ENFORCE_FORMAT,
                      BASEPROPERTY_HIDEINACTIVESELECTION,
+                     BASEPROPERTY_VERTICALALIGN,
                      BASEPROPERTY_WRITING_MODE,
                      BASEPROPERTY_CONTEXT_WRITING_MODE,
                      BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR,
@@ -5521,6 +5522,7 @@ void VCLXCurrencyField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
                      BASEPROPERTY_VALUE_DOUBLE,
                      BASEPROPERTY_ENFORCE_FORMAT,
                      BASEPROPERTY_HIDEINACTIVESELECTION,
+                     BASEPROPERTY_VERTICALALIGN,
                      BASEPROPERTY_WRITING_MODE,
                      BASEPROPERTY_CONTEXT_WRITING_MODE,
                      BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR,
@@ -5868,6 +5870,7 @@ void VCLXPatternField::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
                      BASEPROPERTY_TABSTOP,
                      BASEPROPERTY_TEXT,
                      BASEPROPERTY_HIDEINACTIVESELECTION,
+                     BASEPROPERTY_VERTICALALIGN,
                      BASEPROPERTY_WRITING_MODE,
                      BASEPROPERTY_CONTEXT_WRITING_MODE,
                      BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR,
diff --git a/toolkit/source/awt/xsimpleanimation.cxx b/toolkit/source/awt/xsimpleanimation.cxx
index 3349f751540b..c7ccbde118f4 100644
--- a/toolkit/source/awt/xsimpleanimation.cxx
+++ b/toolkit/source/awt/xsimpleanimation.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: xsimpleanimation.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/toolkit/source/awt/xthrobber.cxx b/toolkit/source/awt/xthrobber.cxx
index ad905ba47efe..439fb49c1cbe 100644
--- a/toolkit/source/awt/xthrobber.cxx
+++ b/toolkit/source/awt/xthrobber.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: xthrobber.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/toolkit/source/awt/xthrobber.hrc b/toolkit/source/awt/xthrobber.hrc
index 30471a5fa54e..32c068ff8a85 100644
--- a/toolkit/source/awt/xthrobber.hrc
+++ b/toolkit/source/awt/xthrobber.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: xthrobber.hrc,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/toolkit/source/awt/xthrobber.src b/toolkit/source/awt/xthrobber.src
index edd8e1953b6c..199b25015056 100644
--- a/toolkit/source/awt/xthrobber.src
+++ b/toolkit/source/awt/xthrobber.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: xthrobber.src,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/toolkit/source/controls/accessiblecontrolcontext.cxx b/toolkit/source/controls/accessiblecontrolcontext.cxx
index 96bf73bacd7a..2611b2f37a91 100644
--- a/toolkit/source/controls/accessiblecontrolcontext.cxx
+++ b/toolkit/source/controls/accessiblecontrolcontext.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: accessiblecontrolcontext.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/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index 07d459a6111a..db9634fb44a1 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.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: dialogcontrol.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/toolkit/source/controls/eventcontainer.cxx b/toolkit/source/controls/eventcontainer.cxx
index b841badd8b0a..0cbf9d4e7281 100644
--- a/toolkit/source/controls/eventcontainer.cxx
+++ b/toolkit/source/controls/eventcontainer.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: eventcontainer.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/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx
index 6171067f1185..67c9c40ebd38 100644
--- a/toolkit/source/controls/formattedcontrol.cxx
+++ b/toolkit/source/controls/formattedcontrol.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: formattedcontrol.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -160,6 +157,7 @@ namespace toolkit
         ImplRegisterProperty( BASEPROPERTY_TEXTCOLOR );
         ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION );
         ImplRegisterProperty( BASEPROPERTY_ENFORCE_FORMAT );
+        ImplRegisterProperty( BASEPROPERTY_VERTICALALIGN );
         ImplRegisterProperty( BASEPROPERTY_WRITING_MODE );
         ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE );
         ImplRegisterProperty( BASEPROPERTY_MOUSE_WHEEL_BEHAVIOUR );
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx b/toolkit/source/controls/geometrycontrolmodel.cxx
index 8c4a5d864165..ac8a6e83ae28 100644
--- a/toolkit/source/controls/geometrycontrolmodel.cxx
+++ b/toolkit/source/controls/geometrycontrolmodel.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: geometrycontrolmodel.cxx,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/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index bdd7fb475afe..fdf91d6a6593 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.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: treedatamodel.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/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
index b230188f9107..896427ce3e2b 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.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: griddatamodel.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/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 865be80f55a7..70c79e0bcbfa 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.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: treedatamodel.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/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx
index 18000c9f5a71..1aebc07bc2a8 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.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: griddatamodel.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/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index 8b398b4aed58..39c4960351d3 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.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: treedatamodel.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/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx
index a451054ce93f..7f6d104127ec 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.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: griddatamodel.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/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index c642d8a0dcce..f19648ab0af2 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.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: gridcontrol.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/toolkit/source/controls/grid/gridcontrol.hxx b/toolkit/source/controls/grid/gridcontrol.hxx
index 5648c812fbff..4195a1f624e5 100644
--- a/toolkit/source/controls/grid/gridcontrol.hxx
+++ b/toolkit/source/controls/grid/gridcontrol.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: gridcontrol.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/toolkit/source/controls/grid/makefile.mk b/toolkit/source/controls/grid/makefile.mk
index 7c904b3ef02e..70bfc34b9d02 100644
--- a/toolkit/source/controls/grid/makefile.mk
+++ b/toolkit/source/controls/grid/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/controls/makefile.mk b/toolkit/source/controls/makefile.mk
index 0194b96f634f..1ce9f7b22c8c 100644
--- a/toolkit/source/controls/makefile.mk
+++ b/toolkit/source/controls/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/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx
index da3a265130b8..acfbee0c5bb6 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.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: roadmapcontrol.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/toolkit/source/controls/roadmapentry.cxx b/toolkit/source/controls/roadmapentry.cxx
index 4fb0d44cf131..fb760e404b93 100644
--- a/toolkit/source/controls/roadmapentry.cxx
+++ b/toolkit/source/controls/roadmapentry.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: roadmapentry.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/toolkit/source/controls/stdtabcontroller.cxx b/toolkit/source/controls/stdtabcontroller.cxx
index c9a85f3f7eb7..012a7bc0a084 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.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: stdtabcontroller.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/toolkit/source/controls/stdtabcontrollermodel.cxx b/toolkit/source/controls/stdtabcontrollermodel.cxx
index 5dee86da18e4..db0555762511 100644
--- a/toolkit/source/controls/stdtabcontrollermodel.cxx
+++ b/toolkit/source/controls/stdtabcontrollermodel.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: stdtabcontrollermodel.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/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx
index f2940526d320..2de8b56131c8 100644
--- a/toolkit/source/controls/tkscrollbar.cxx
+++ b/toolkit/source/controls/tkscrollbar.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: tkscrollbar.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/toolkit/source/controls/tksimpleanimation.cxx b/toolkit/source/controls/tksimpleanimation.cxx
index 8d83b3a953d9..9c32ba500407 100644
--- a/toolkit/source/controls/tksimpleanimation.cxx
+++ b/toolkit/source/controls/tksimpleanimation.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: tksimpleanimation.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/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx
index 138b849a190c..5929dc7a4635 100644
--- a/toolkit/source/controls/tkspinbutton.cxx
+++ b/toolkit/source/controls/tkspinbutton.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: tkspinbutton.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/toolkit/source/controls/tkthrobber.cxx b/toolkit/source/controls/tkthrobber.cxx
index 153a19bf38c9..978d3183fe23 100644
--- a/toolkit/source/controls/tkthrobber.cxx
+++ b/toolkit/source/controls/tkthrobber.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: tkthrobber.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/toolkit/source/controls/tree/makefile.mk b/toolkit/source/controls/tree/makefile.mk
index 89e6f87d9fde..4e72b62b416b 100644
--- a/toolkit/source/controls/tree/makefile.mk
+++ b/toolkit/source/controls/tree/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx
index 2949954bb13c..5655e4e10abc 100644
--- a/toolkit/source/controls/tree/treecontrol.cxx
+++ b/toolkit/source/controls/tree/treecontrol.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: treecontrol.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/toolkit/source/controls/tree/treecontrol.hxx b/toolkit/source/controls/tree/treecontrol.hxx
index 0e7f33b5a912..0cae86616aa4 100644
--- a/toolkit/source/controls/tree/treecontrol.hxx
+++ b/toolkit/source/controls/tree/treecontrol.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: treecontrol.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/toolkit/source/controls/tree/treedatamodel.cxx b/toolkit/source/controls/tree/treedatamodel.cxx
index 65969fc486b0..8ca76c0e57a8 100644
--- a/toolkit/source/controls/tree/treedatamodel.cxx
+++ b/toolkit/source/controls/tree/treedatamodel.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: treedatamodel.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/toolkit/source/controls/unocontrol.cxx b/toolkit/source/controls/unocontrol.cxx
index 21876feb072b..1abe0b34004f 100644
--- a/toolkit/source/controls/unocontrol.cxx
+++ b/toolkit/source/controls/unocontrol.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: unocontrol.cxx,v $
- * $Revision: 1.54.42.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx
index b59b8e05b9d9..bbd0fc507e80 100644
--- a/toolkit/source/controls/unocontrolbase.cxx
+++ b/toolkit/source/controls/unocontrolbase.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: unocontrolbase.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/toolkit/source/controls/unocontrolcontainer.cxx b/toolkit/source/controls/unocontrolcontainer.cxx
index e7695b8fb819..c3149a8cc869 100644
--- a/toolkit/source/controls/unocontrolcontainer.cxx
+++ b/toolkit/source/controls/unocontrolcontainer.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: unocontrolcontainer.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/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx
index 6262c3f77839..7630971d8a57 100644
--- a/toolkit/source/controls/unocontrolcontainermodel.cxx
+++ b/toolkit/source/controls/unocontrolcontainermodel.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: unocontrolcontainermodel.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/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx
index a4febcd33b33..29b683a5ed40 100644
--- a/toolkit/source/controls/unocontrolmodel.cxx
+++ b/toolkit/source/controls/unocontrolmodel.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: unocontrolmodel.cxx,v $
- * $Revision: 1.62 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 3abacef7b67f..ae9e59d045e7 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.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: unocontrols.cxx,v $
- * $Revision: 1.87 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -476,6 +473,7 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) t
 //  ----------------------------------------------------
 UnoControlFileControlModel::UnoControlFileControlModel()
 {
+    ImplRegisterProperty( BASEPROPERTY_ALIGN );
     ImplRegisterProperty( BASEPROPERTY_BACKGROUNDCOLOR );
     ImplRegisterProperty( BASEPROPERTY_BORDER );
     ImplRegisterProperty( BASEPROPERTY_BORDERCOLOR );
@@ -489,6 +487,7 @@ UnoControlFileControlModel::UnoControlFileControlModel()
     ImplRegisterProperty( BASEPROPERTY_READONLY );
     ImplRegisterProperty( BASEPROPERTY_TABSTOP );
     ImplRegisterProperty( BASEPROPERTY_TEXT );
+    ImplRegisterProperty( BASEPROPERTY_VERTICALALIGN );
     ImplRegisterProperty( BASEPROPERTY_WRITING_MODE );
     ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE );
     ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION );
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index c26ef961d0be..ba466ac6959d 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.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: accessibilityclient.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/toolkit/source/helper/externallock.cxx b/toolkit/source/helper/externallock.cxx
index 6803fabbd862..c0eb2427936f 100644
--- a/toolkit/source/helper/externallock.cxx
+++ b/toolkit/source/helper/externallock.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: externallock.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/toolkit/source/helper/fixedhyperbase.cxx b/toolkit/source/helper/fixedhyperbase.cxx
index d00b5ff978c0..d6c22e936116 100644
--- a/toolkit/source/helper/fixedhyperbase.cxx
+++ b/toolkit/source/helper/fixedhyperbase.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: fixedhyperbase.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/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx
index 2b5fe908bedf..bff2d6008d10 100644
--- a/toolkit/source/helper/formpdfexport.cxx
+++ b/toolkit/source/helper/formpdfexport.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: formpdfexport.cxx,v $
- *
- * $Revision: 1.2.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/helper/imagealign.cxx b/toolkit/source/helper/imagealign.cxx
index f60dbc6a39a5..c5e8781d478b 100644
--- a/toolkit/source/helper/imagealign.cxx
+++ b/toolkit/source/helper/imagealign.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: imagealign.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/toolkit/source/helper/listenermultiplexer.cxx b/toolkit/source/helper/listenermultiplexer.cxx
index cdbb156cd0f5..fcfd6214780e 100644
--- a/toolkit/source/helper/listenermultiplexer.cxx
+++ b/toolkit/source/helper/listenermultiplexer.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: listenermultiplexer.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/toolkit/source/helper/makefile.mk b/toolkit/source/helper/makefile.mk
index c1e6043ad39b..bf10b0aa0178 100644
--- a/toolkit/source/helper/makefile.mk
+++ b/toolkit/source/helper/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/toolkit/source/helper/property.cxx b/toolkit/source/helper/property.cxx
index a59af95a2e1f..dd22ea331830 100644
--- a/toolkit/source/helper/property.cxx
+++ b/toolkit/source/helper/property.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: property.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/toolkit/source/helper/registerservices.cxx b/toolkit/source/helper/registerservices.cxx
index ea29c9810beb..7d1dcaeb2762 100644
--- a/toolkit/source/helper/registerservices.cxx
+++ b/toolkit/source/helper/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.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/helper/servicenames.cxx b/toolkit/source/helper/servicenames.cxx
index f00e7a2b09fa..1885387561cb 100644
--- a/toolkit/source/helper/servicenames.cxx
+++ b/toolkit/source/helper/servicenames.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: servicenames.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/toolkit/source/helper/throbberimpl.cxx b/toolkit/source/helper/throbberimpl.cxx
index 423e40c4f305..7a8e260ab4b8 100644
--- a/toolkit/source/helper/throbberimpl.cxx
+++ b/toolkit/source/helper/throbberimpl.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: throbberimpl.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/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx
index 24446270f245..4e1e4153daf1 100644
--- a/toolkit/source/helper/tkresmgr.cxx
+++ b/toolkit/source/helper/tkresmgr.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: tkresmgr.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/toolkit/source/helper/unomemorystream.cxx b/toolkit/source/helper/unomemorystream.cxx
index dd2fe446cec4..b07cee100406 100644
--- a/toolkit/source/helper/unomemorystream.cxx
+++ b/toolkit/source/helper/unomemorystream.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: unomemorystream.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/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx
index 52f293693d23..da946ffdc08a 100644
--- a/toolkit/source/helper/unopropertyarrayhelper.cxx
+++ b/toolkit/source/helper/unopropertyarrayhelper.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: unopropertyarrayhelper.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/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index 96b8908558a7..d7cec7c17354 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.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: unowrapper.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/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx
index 89bde88d018e..da91945c0b0e 100644
--- a/toolkit/source/helper/vclunohelper.cxx
+++ b/toolkit/source/helper/vclunohelper.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: vclunohelper.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/toolkit/source/layout/core/bin.cxx b/toolkit/source/layout/core/bin.cxx
index 390c574c46c6..0f0719f12bbd 100644
--- a/toolkit/source/layout/core/bin.cxx
+++ b/toolkit/source/layout/core/bin.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/bin.hxx b/toolkit/source/layout/core/bin.hxx
index 23d082076359..554f6f1bbcf9 100644
--- a/toolkit/source/layout/core/bin.hxx
+++ b/toolkit/source/layout/core/bin.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/box-base.cxx b/toolkit/source/layout/core/box-base.cxx
index 63cb49901ec4..dbe9163e2117 100644
--- a/toolkit/source/layout/core/box-base.cxx
+++ b/toolkit/source/layout/core/box-base.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/box-base.hxx b/toolkit/source/layout/core/box-base.hxx
index c4958a303540..4f50f55bf5c4 100644
--- a/toolkit/source/layout/core/box-base.hxx
+++ b/toolkit/source/layout/core/box-base.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/box.cxx b/toolkit/source/layout/core/box.cxx
index 254099d96411..a173bb5b7633 100644
--- a/toolkit/source/layout/core/box.cxx
+++ b/toolkit/source/layout/core/box.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/box.hxx b/toolkit/source/layout/core/box.hxx
index 0c36ce335213..9e4652a37b2f 100644
--- a/toolkit/source/layout/core/box.hxx
+++ b/toolkit/source/layout/core/box.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/byteseq.cxx b/toolkit/source/layout/core/byteseq.cxx
index ffa9852bd303..b49297d8b1c9 100644
--- a/toolkit/source/layout/core/byteseq.cxx
+++ b/toolkit/source/layout/core/byteseq.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$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/container.cxx b/toolkit/source/layout/core/container.cxx
index 5978ae7f04a4..43f837f32de5 100644
--- a/toolkit/source/layout/core/container.cxx
+++ b/toolkit/source/layout/core/container.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/container.hxx b/toolkit/source/layout/core/container.hxx
index 4dbd61cd398c..f236139fb1cb 100644
--- a/toolkit/source/layout/core/container.hxx
+++ b/toolkit/source/layout/core/container.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/dialogbuttonhbox.cxx b/toolkit/source/layout/core/dialogbuttonhbox.cxx
index 9334ef688135..4a54fcecaf8c 100644
--- a/toolkit/source/layout/core/dialogbuttonhbox.cxx
+++ b/toolkit/source/layout/core/dialogbuttonhbox.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/dialogbuttonhbox.hxx b/toolkit/source/layout/core/dialogbuttonhbox.hxx
index 26bab6d0602c..b1e5ca0f6ba3 100644
--- a/toolkit/source/layout/core/dialogbuttonhbox.hxx
+++ b/toolkit/source/layout/core/dialogbuttonhbox.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/factory.cxx b/toolkit/source/layout/core/factory.cxx
index 3462ba51648d..db9616a8cc77 100644
--- a/toolkit/source/layout/core/factory.cxx
+++ b/toolkit/source/layout/core/factory.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/factory.hxx b/toolkit/source/layout/core/factory.hxx
index 3715b1f7efcb..3e2af712b961 100644
--- a/toolkit/source/layout/core/factory.hxx
+++ b/toolkit/source/layout/core/factory.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/flow.cxx b/toolkit/source/layout/core/flow.cxx
index 7d856de1f714..9a573b7487f4 100644
--- a/toolkit/source/layout/core/flow.cxx
+++ b/toolkit/source/layout/core/flow.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/flow.hxx b/toolkit/source/layout/core/flow.hxx
index d650d61f4e40..e2b4708cf261 100644
--- a/toolkit/source/layout/core/flow.hxx
+++ b/toolkit/source/layout/core/flow.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/helper.cxx b/toolkit/source/layout/core/helper.cxx
index 02c10ed9dc2b..d18a4f615d04 100644
--- a/toolkit/source/layout/core/helper.cxx
+++ b/toolkit/source/layout/core/helper.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/helper.hxx b/toolkit/source/layout/core/helper.hxx
index 787e4f4132b4..2fac41ebc493 100644
--- a/toolkit/source/layout/core/helper.hxx
+++ b/toolkit/source/layout/core/helper.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx
index dede47ad3ceb..daaa8c239f50 100644
--- a/toolkit/source/layout/core/import.cxx
+++ b/toolkit/source/layout/core/import.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/import.hxx b/toolkit/source/layout/core/import.hxx
index d72e8a337f56..7af8f16eb5d3 100644
--- a/toolkit/source/layout/core/import.hxx
+++ b/toolkit/source/layout/core/import.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/localized-string.cxx b/toolkit/source/layout/core/localized-string.cxx
index 9bc9df372832..bbf067011f6b 100644
--- a/toolkit/source/layout/core/localized-string.cxx
+++ b/toolkit/source/layout/core/localized-string.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$
+ * 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., 51 Franklin Street, 5th Floor, Boston,
- *    MA  02110-1301  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/toolkit/source/layout/core/localized-string.hxx b/toolkit/source/layout/core/localized-string.hxx
index 7c897f2c713d..a6310336ceb6 100644
--- a/toolkit/source/layout/core/localized-string.hxx
+++ b/toolkit/source/layout/core/localized-string.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$
+ * 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., 51 Franklin Street, 5th Floor, Boston,
- *    MA  02110-1301  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/toolkit/source/layout/core/makefile.mk b/toolkit/source/layout/core/makefile.mk
index 131be7eb237c..2c90921799af 100644
--- a/toolkit/source/layout/core/makefile.mk
+++ b/toolkit/source/layout/core/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$
-#
-# $Revision$
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/precompiled_xmlscript.hxx b/toolkit/source/layout/core/precompiled_xmlscript.hxx
index f8ad22b56678..0fc538151348 100644
--- a/toolkit/source/layout/core/precompiled_xmlscript.hxx
+++ b/toolkit/source/layout/core/precompiled_xmlscript.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/proplist.cxx b/toolkit/source/layout/core/proplist.cxx
index 9b154077eaa8..7cd27473a8c7 100644
--- a/toolkit/source/layout/core/proplist.cxx
+++ b/toolkit/source/layout/core/proplist.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/proplist.hxx b/toolkit/source/layout/core/proplist.hxx
index 27682faf8902..6a98cf449df3 100644
--- a/toolkit/source/layout/core/proplist.hxx
+++ b/toolkit/source/layout/core/proplist.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/root.cxx b/toolkit/source/layout/core/root.cxx
index b316fdfc8e9e..af56e77f9aac 100644
--- a/toolkit/source/layout/core/root.cxx
+++ b/toolkit/source/layout/core/root.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/root.hxx b/toolkit/source/layout/core/root.hxx
index 92824f0d8ada..321c891bbe50 100644
--- a/toolkit/source/layout/core/root.hxx
+++ b/toolkit/source/layout/core/root.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/table.cxx b/toolkit/source/layout/core/table.cxx
index f8b2639c2258..48156b1d730e 100644
--- a/toolkit/source/layout/core/table.cxx
+++ b/toolkit/source/layout/core/table.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/table.hxx b/toolkit/source/layout/core/table.hxx
index f4fd70d0a1f9..dd05eba38c41 100644
--- a/toolkit/source/layout/core/table.hxx
+++ b/toolkit/source/layout/core/table.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/timer.cxx b/toolkit/source/layout/core/timer.cxx
index 0da0f2c2abee..f0975fd3f76b 100644
--- a/toolkit/source/layout/core/timer.cxx
+++ b/toolkit/source/layout/core/timer.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/timer.hxx b/toolkit/source/layout/core/timer.hxx
index b1d7c7597b2e..f8432141c2f1 100644
--- a/toolkit/source/layout/core/timer.hxx
+++ b/toolkit/source/layout/core/timer.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/translate.cxx b/toolkit/source/layout/core/translate.cxx
index cca51632557b..fa09d02190d2 100644
--- a/toolkit/source/layout/core/translate.cxx
+++ b/toolkit/source/layout/core/translate.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/translate.hxx b/toolkit/source/layout/core/translate.hxx
index 05043baa4fb6..597b4a88530e 100644
--- a/toolkit/source/layout/core/translate.hxx
+++ b/toolkit/source/layout/core/translate.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/vcl.cxx b/toolkit/source/layout/core/vcl.cxx
index 418229351084..2b8d910584e9 100644
--- a/toolkit/source/layout/core/vcl.cxx
+++ b/toolkit/source/layout/core/vcl.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/core/vcl.hxx b/toolkit/source/layout/core/vcl.hxx
index d072fa4bf25e..20cc77dc7f82 100644
--- a/toolkit/source/layout/core/vcl.hxx
+++ b/toolkit/source/layout/core/vcl.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/vcl/makefile.mk b/toolkit/source/layout/vcl/makefile.mk
index a6cc754efa1b..529ddc31d97e 100644
--- a/toolkit/source/layout/vcl/makefile.mk
+++ b/toolkit/source/layout/vcl/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$
-#
-# $Revision$
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/vcl/wbutton.cxx b/toolkit/source/layout/vcl/wbutton.cxx
index 0b8b41299315..26d4410ccf9a 100644
--- a/toolkit/source/layout/vcl/wbutton.cxx
+++ b/toolkit/source/layout/vcl/wbutton.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/vcl/wcontainer.cxx b/toolkit/source/layout/vcl/wcontainer.cxx
index e4f5a92f69e0..712aae19934d 100644
--- a/toolkit/source/layout/vcl/wcontainer.cxx
+++ b/toolkit/source/layout/vcl/wcontainer.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/vcl/wfield.cxx b/toolkit/source/layout/vcl/wfield.cxx
index 281d909530b0..fb26d04a478b 100644
--- a/toolkit/source/layout/vcl/wfield.cxx
+++ b/toolkit/source/layout/vcl/wfield.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx
index 0e2eec91773e..a8133250eb58 100644
--- a/toolkit/source/layout/vcl/wrapper.cxx
+++ b/toolkit/source/layout/vcl/wrapper.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/source/layout/vcl/wrapper.hxx b/toolkit/source/layout/vcl/wrapper.hxx
index a9d5a6490c31..2f7e24211150 100644
--- a/toolkit/source/layout/vcl/wrapper.hxx
+++ b/toolkit/source/layout/vcl/wrapper.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$
- *
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/src2xml/include.lst b/toolkit/src2xml/include.lst
index d4be6f5e3517..a93449625585 100644
--- a/toolkit/src2xml/include.lst
+++ b/toolkit/src2xml/include.lst
@@ -223,8 +223,6 @@
 ../../xmlsecurity/inc
 ../../xmlsecurity/unxlngi6.pro/inc
 ../../padmin/unxlngi6.pro/inc
-../../goodies/inc
-../../goodies/unxlngi6.pro/inc
 ../../regexp/inc
 ../../regexp/unxlngi6.pro/inc
 ../../ucbhelper/inc
diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst
index 5375af00b8f0..4a5876b84a08 100644
--- a/toolkit/src2xml/src.lst
+++ b/toolkit/src2xml/src.lst
@@ -629,22 +629,6 @@
 ../../xmlsecurity/source/component/warnbox.src
 ../../padmin/source/rtsetup.src
 ../../padmin/source/padialog.src
-../../goodies/source/inv/strings.src
-../../goodies/source/inv/gegner.src
-../../goodies/source/filter.vcl/eps/epsstr.src
-../../goodies/source/filter.vcl/eps/dlgeps.src
-../../goodies/source/filter.vcl/egif/dlgegif.src
-../../goodies/source/filter.vcl/egif/egifstr.src
-../../goodies/source/filter.vcl/epbm/dlgepbm.src
-../../goodies/source/filter.vcl/epbm/epbmstr.src
-../../goodies/source/filter.vcl/epgm/dlgepgm.src
-../../goodies/source/filter.vcl/epgm/epgmstr.src
-../../goodies/source/filter.vcl/eppm/dlgeppm.src
-../../goodies/source/filter.vcl/eppm/eppmstr.src
-../../goodies/source/filter.vcl/epict/dlgepct.src
-../../goodies/source/filter.vcl/epict/epictstr.src
-../../goodies/source/filter.vcl/eos2met/dlgeos2.src
-../../goodies/source/filter.vcl/eos2met/eos2mstr.src
 ../../ucbhelper/workben/ucbexplorer/ucbexplorer.src
 ../../starmath/util/hidother.src
 ../../starmath/source/commands.src
diff --git a/toolkit/uiconfig/layout/makefile.mk b/toolkit/uiconfig/layout/makefile.mk
index f0fe9159fc04..46d0b187b744 100644
--- a/toolkit/uiconfig/layout/makefile.mk
+++ b/toolkit/uiconfig/layout/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.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
-#   $RCSfile$
+# OpenOffice.org - a multi-platform office productivity suite
 #
-#   $Revision$
+# This file is part of OpenOffice.org.
 #
-#   last change: $Author$ $Date$
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
 #
-#   The Contents of this file are made available subject to
-#   the terms of GNU Lesser General Public License Version 2.1.
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  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., 51 Franklin Street, 5th Floor, Boston,
-#     MA  02110-1301  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/toolkit/util/makefile.mk b/toolkit/util/makefile.mk
index 3c5da82d0dd9..48d534a8a9b3 100644
--- a/toolkit/util/makefile.mk
+++ b/toolkit/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.26 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/util/makefile.pmk b/toolkit/util/makefile.pmk
index 720cb4b913fa..f04a39bac91b 100644
--- a/toolkit/util/makefile.pmk
+++ b/toolkit/util/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: makefile.pmk,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/toolkit/workben/controls.cxx b/toolkit/workben/controls.cxx
index 903925ba625b..9047e914a76d 100644
--- a/toolkit/workben/controls.cxx
+++ b/toolkit/workben/controls.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: controls.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/toolkit/workben/layout/editor.cxx b/toolkit/workben/layout/editor.cxx
index 3b5bd768566b..699c103d2ee8 100644
--- a/toolkit/workben/layout/editor.cxx
+++ b/toolkit/workben/layout/editor.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: editor.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/toolkit/workben/layout/editor.hxx b/toolkit/workben/layout/editor.hxx
index 1224f65b5711..b955732e32c9 100644
--- a/toolkit/workben/layout/editor.hxx
+++ b/toolkit/workben/layout/editor.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: editor.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/toolkit/workben/layout/makefile.mk b/toolkit/workben/layout/makefile.mk
index 0741a210d2e3..53797e5a3102 100644
--- a/toolkit/workben/layout/makefile.mk
+++ b/toolkit/workben/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/workben/layout/plugin.cxx b/toolkit/workben/layout/plugin.cxx
index 28dafc2bba78..d20fad8c71b9 100644
--- a/toolkit/workben/layout/plugin.cxx
+++ b/toolkit/workben/layout/plugin.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$
+ * 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/toolkit/workben/layout/plugin.hxx b/toolkit/workben/layout/plugin.hxx
index 4fe8edf36dc9..6c8f238b0f57 100644
--- a/toolkit/workben/layout/plugin.hxx
+++ b/toolkit/workben/layout/plugin.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$
+ * 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 _LAYOUT_PLUGIN_HXX
diff --git a/toolkit/workben/layout/recover.cxx b/toolkit/workben/layout/recover.cxx
index c9a826688dc9..fc54fc0be28d 100644
--- a/toolkit/workben/layout/recover.cxx
+++ b/toolkit/workben/layout/recover.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: recover.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/toolkit/workben/layout/recover.hxx b/toolkit/workben/layout/recover.hxx
index 0d0eee278e6b..d01350121375 100644
--- a/toolkit/workben/layout/recover.hxx
+++ b/toolkit/workben/layout/recover.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: recover.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/toolkit/workben/layout/simple-paragraph.cxx b/toolkit/workben/layout/simple-paragraph.cxx
index c3f54a35f963..721dd9030c67 100644
--- a/toolkit/workben/layout/simple-paragraph.cxx
+++ b/toolkit/workben/layout/simple-paragraph.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: simple-paragraph.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/toolkit/workben/layout/simple-paragraph.hxx b/toolkit/workben/layout/simple-paragraph.hxx
index 73c2af08b3cd..07d85da29723 100644
--- a/toolkit/workben/layout/simple-paragraph.hxx
+++ b/toolkit/workben/layout/simple-paragraph.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: simple-paragraph.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/toolkit/workben/layout/sortdlg.cxx b/toolkit/workben/layout/sortdlg.cxx
index 9666e5a39124..cc3aa08c105d 100644
--- a/toolkit/workben/layout/sortdlg.cxx
+++ b/toolkit/workben/layout/sortdlg.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: sortdlg.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/toolkit/workben/layout/sortdlg.hrc b/toolkit/workben/layout/sortdlg.hrc
index 4bf07ad3f59a..0cecd39e8541 100644
--- a/toolkit/workben/layout/sortdlg.hrc
+++ b/toolkit/workben/layout/sortdlg.hrc
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sortdlg.hrc,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: rt $ $Date: 2005/09/08 21:51: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/toolkit/workben/layout/sortdlg.hxx b/toolkit/workben/layout/sortdlg.hxx
index 2be123f091ab..e5b3b289434d 100644
--- a/toolkit/workben/layout/sortdlg.hxx
+++ b/toolkit/workben/layout/sortdlg.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: sortdlg.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/toolkit/workben/layout/sortdlg.src b/toolkit/workben/layout/sortdlg.src
index 06453e54fd29..5e855962af96 100644
--- a/toolkit/workben/layout/sortdlg.src
+++ b/toolkit/workben/layout/sortdlg.src
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: sortdlg.src,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.41 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: ihi $ $Date: 2007/04/19 16:48: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.
  *
  ************************************************************************/
 #include "sortdlg.hrc"
diff --git a/toolkit/workben/layout/test.cxx b/toolkit/workben/layout/test.cxx
index 1bd9603fc5ac..6a09518ebc4f 100644
--- a/toolkit/workben/layout/test.cxx
+++ b/toolkit/workben/layout/test.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: test.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/toolkit/workben/layout/tpsort.cxx b/toolkit/workben/layout/tpsort.cxx
index 3463eff4efab..949f3b777a71 100644
--- a/toolkit/workben/layout/tpsort.cxx
+++ b/toolkit/workben/layout/tpsort.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: tpsort.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/toolkit/workben/layout/tpsort.hxx b/toolkit/workben/layout/tpsort.hxx
index bb8b30e396df..9cc851914fd5 100644
--- a/toolkit/workben/layout/tpsort.hxx
+++ b/toolkit/workben/layout/tpsort.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: tpsort.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/toolkit/workben/layout/uno.hxx b/toolkit/workben/layout/uno.hxx
index a449429338fc..89b1bedd4e11 100644
--- a/toolkit/workben/layout/uno.hxx
+++ b/toolkit/workben/layout/uno.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: uno.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/toolkit/workben/layout/wordcountdialog.cxx b/toolkit/workben/layout/wordcountdialog.cxx
index 49aa2f9ae7a7..0f391f7f7d5e 100644
--- a/toolkit/workben/layout/wordcountdialog.cxx
+++ b/toolkit/workben/layout/wordcountdialog.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: wordcountdialog.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/toolkit/workben/layout/wordcountdialog.hxx b/toolkit/workben/layout/wordcountdialog.hxx
index b19b3cca8c94..a228b8bdea77 100644
--- a/toolkit/workben/layout/wordcountdialog.hxx
+++ b/toolkit/workben/layout/wordcountdialog.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: wordcountdialog.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/toolkit/workben/layout/zoom.cxx b/toolkit/workben/layout/zoom.cxx
index 39fcb5e94401..bf27ad3feaf6 100644
--- a/toolkit/workben/layout/zoom.cxx
+++ b/toolkit/workben/layout/zoom.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: zoom.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/toolkit/workben/layout/zoom.hrc b/toolkit/workben/layout/zoom.hrc
index 3f0f979bd4ae..49412ad085f0 100644
--- a/toolkit/workben/layout/zoom.hrc
+++ b/toolkit/workben/layout/zoom.hrc
@@ -1,35 +1,27 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: zoom.hrc,v $
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
- *  $Revision: 1.4 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: kz $ $Date: 2008/03/07 15:16:57 $
+ * 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 _SVX_ZOOM_HRC
diff --git a/toolkit/workben/layout/zoom.hxx b/toolkit/workben/layout/zoom.hxx
index f16e08d558aa..f0c617a4b4d6 100644
--- a/toolkit/workben/layout/zoom.hxx
+++ b/toolkit/workben/layout/zoom.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: zoom.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/toolkit/workben/layout/zoom_def.hxx b/toolkit/workben/layout/zoom_def.hxx
index c231f9af970d..5af749f2abde 100644
--- a/toolkit/workben/layout/zoom_def.hxx
+++ b/toolkit/workben/layout/zoom_def.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: zoom_def.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/toolkit/workben/makefile.mk b/toolkit/workben/makefile.mk
index 146c3b358288..8e54c7737a20 100644
--- a/toolkit/workben/makefile.mk
+++ b/toolkit/workben/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/toolkit/workben/unodialog.cxx b/toolkit/workben/unodialog.cxx
index 97f5c62b6ec6..052ece9ac7fd 100644
--- a/toolkit/workben/unodialog.cxx
+++ b/toolkit/workben/unodialog.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: unodialog.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/tools/bootstrp/addexes/makefile.mk b/tools/bootstrp/addexes/makefile.mk
index b196d5cd0a73..324de9479502 100644
--- a/tools/bootstrp/addexes/makefile.mk
+++ b/tools/bootstrp/addexes/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/tools/bootstrp/addexes/replace.cxx b/tools/bootstrp/addexes/replace.cxx
index b4e89246cbc9..3c451ae54be0 100644
--- a/tools/bootstrp/addexes/replace.cxx
+++ b/tools/bootstrp/addexes/replace.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: replace.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/tools/bootstrp/addexes2/makefile.mk b/tools/bootstrp/addexes2/makefile.mk
index cd006a35ddd8..492d6f3105ed 100644
--- a/tools/bootstrp/addexes2/makefile.mk
+++ b/tools/bootstrp/addexes2/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/tools/bootstrp/addexes2/mkfilt.cxx b/tools/bootstrp/addexes2/mkfilt.cxx
index 329e9d97c696..2d03aaa153e5 100644
--- a/tools/bootstrp/addexes2/mkfilt.cxx
+++ b/tools/bootstrp/addexes2/mkfilt.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: mkfilt.cxx,v $
- * $Revision: 1.11.34.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/bootstrp/appdef.cxx b/tools/bootstrp/appdef.cxx
index 36dabe97e3af..ac6212724afc 100644
--- a/tools/bootstrp/appdef.cxx
+++ b/tools/bootstrp/appdef.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: appdef.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/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx
index 05e981b64a0e..605965339b0e 100644
--- a/tools/bootstrp/command.cxx
+++ b/tools/bootstrp/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.18.40.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx
index 7733b2f4bcec..6263c719df51 100644
--- a/tools/bootstrp/cppdep.cxx
+++ b/tools/bootstrp/cppdep.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: cppdep.cxx,v $
- * $Revision: 1.16.42.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/bootstrp/cppdep.hxx b/tools/bootstrp/cppdep.hxx
index dda10341c8f1..cdc3ac2e9758 100644
--- a/tools/bootstrp/cppdep.hxx
+++ b/tools/bootstrp/cppdep.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: cppdep.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/tools/bootstrp/inimgr.cxx b/tools/bootstrp/inimgr.cxx
index 90b7f8ae26bf..a0a69f06f7af 100644
--- a/tools/bootstrp/inimgr.cxx
+++ b/tools/bootstrp/inimgr.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: inimgr.cxx,v $
- * $Revision: 1.10.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/bootstrp/iserver.cxx b/tools/bootstrp/iserver.cxx
index 3690848dc6a1..0b2c1df15203 100644
--- a/tools/bootstrp/iserver.cxx
+++ b/tools/bootstrp/iserver.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: iserver.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/tools/bootstrp/makefile.mk b/tools/bootstrp/makefile.mk
index 60bfc57bf96b..b592cb900630 100644
--- a/tools/bootstrp/makefile.mk
+++ b/tools/bootstrp/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.24 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/bootstrp/md5.cxx b/tools/bootstrp/md5.cxx
index a234f278cc9d..687441c5c511 100644
--- a/tools/bootstrp/md5.cxx
+++ b/tools/bootstrp/md5.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: md5.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/tools/bootstrp/md5.hxx b/tools/bootstrp/md5.hxx
index fe7c0230f4ca..55aa97e941c9 100644
--- a/tools/bootstrp/md5.hxx
+++ b/tools/bootstrp/md5.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: md5.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/tools/bootstrp/mkcreate.cxx b/tools/bootstrp/mkcreate.cxx
index efc083a666f3..398a3a4c4143 100644
--- a/tools/bootstrp/mkcreate.cxx
+++ b/tools/bootstrp/mkcreate.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: mkcreate.cxx,v $
- *
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -714,14 +710,10 @@ BOOL SourceDirectory::CreateRecursiveMakefile( BOOL bAllChilds )
         "#\n"
         "# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.\n"
         "#\n"
-        "# Copyright 2008 by Sun Microsystems, Inc.\n"
+        "# Copyright 2000, 2010 Oracle and/or its affiliates.\n"
         "#\n"
         "# OpenOffice.org - a multi-platform office productivity suite\n"
         "#\n"
-        "# $RCSfile: mkcreate.cxx,v $\n"
-        "#\n"
-        "# $Revision: 1.18 $\n"
-        "#\n"
         "# This file is part of OpenOffice.org.\n"
         "#\n"
         "# OpenOffice.org is free software: you can redistribute it and/or modify\n"
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx
index 7e3ebe207964..4f4d44a33536 100644
--- a/tools/bootstrp/prj.cxx
+++ b/tools/bootstrp/prj.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: prj.cxx,v $
- * $Revision: 1.29.40.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx
index d4411058a6fb..35968654b5cd 100644
--- a/tools/bootstrp/rscdep.cxx
+++ b/tools/bootstrp/rscdep.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: rscdep.cxx,v $
- * $Revision: 1.25.42.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/bootstrp/so_checksum.cxx b/tools/bootstrp/so_checksum.cxx
index c6d559631f89..716e99eff9f1 100644
--- a/tools/bootstrp/so_checksum.cxx
+++ b/tools/bootstrp/so_checksum.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: so_checksum.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/tools/bootstrp/sspretty.cxx b/tools/bootstrp/sspretty.cxx
index 6c946bdd91dc..143705b6a2ea 100644
--- a/tools/bootstrp/sspretty.cxx
+++ b/tools/bootstrp/sspretty.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: sspretty.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/tools/bootstrp/sstring.cxx b/tools/bootstrp/sstring.cxx
index b41455221d25..8c83dedf72ec 100644
--- a/tools/bootstrp/sstring.cxx
+++ b/tools/bootstrp/sstring.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: sstring.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/tools/inc/bootstrp/appdef.hxx b/tools/inc/bootstrp/appdef.hxx
index 5e5adcb945e4..bf73b215205e 100644
--- a/tools/inc/bootstrp/appdef.hxx
+++ b/tools/inc/bootstrp/appdef.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: appdef.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/tools/inc/bootstrp/command.hxx b/tools/inc/bootstrp/command.hxx
index 3b481371908b..e0d8f1e39aeb 100644
--- a/tools/inc/bootstrp/command.hxx
+++ b/tools/inc/bootstrp/command.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: command.hxx,v $
- * $Revision: 1.6.40.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/inc/bootstrp/inimgr.hxx b/tools/inc/bootstrp/inimgr.hxx
index c22b93b1fdbb..7be00ce14d48 100644
--- a/tools/inc/bootstrp/inimgr.hxx
+++ b/tools/inc/bootstrp/inimgr.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: inimgr.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/tools/inc/bootstrp/listmacr.hxx b/tools/inc/bootstrp/listmacr.hxx
index 2974005b6864..8c678ff32275 100644
--- a/tools/inc/bootstrp/listmacr.hxx
+++ b/tools/inc/bootstrp/listmacr.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: listmacr.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/tools/inc/bootstrp/mkcreate.hxx b/tools/inc/bootstrp/mkcreate.hxx
index ffff8107716a..991b5961a096 100644
--- a/tools/inc/bootstrp/mkcreate.hxx
+++ b/tools/inc/bootstrp/mkcreate.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: mkcreate.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/tools/inc/bootstrp/prj.hxx b/tools/inc/bootstrp/prj.hxx
index d0c68fecec05..2d7664b8b69f 100644
--- a/tools/inc/bootstrp/prj.hxx
+++ b/tools/inc/bootstrp/prj.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: prj.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/tools/inc/bootstrp/sstring.hxx b/tools/inc/bootstrp/sstring.hxx
index 9fc83cb33c9a..933770887e37 100644
--- a/tools/inc/bootstrp/sstring.hxx
+++ b/tools/inc/bootstrp/sstring.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: sstring.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/tools/inc/impcont.hxx b/tools/inc/impcont.hxx
index 3db7fc1b5453..224d5a4429ef 100644
--- a/tools/inc/impcont.hxx
+++ b/tools/inc/impcont.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: impcont.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/tools/inc/impstrg.hxx b/tools/inc/impstrg.hxx
index cd309e08d36e..60b25a4c3fd6 100644
--- a/tools/inc/impstrg.hxx
+++ b/tools/inc/impstrg.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: impstrg.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/tools/inc/makefile.mk b/tools/inc/makefile.mk
index 4e97d67cd6ec..a3a76dc94a11 100644
--- a/tools/inc/makefile.mk
+++ b/tools/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/inc/pch/precompiled_tools.cxx b/tools/inc/pch/precompiled_tools.cxx
index 4a889e81629e..cafe6444a55d 100644
--- a/tools/inc/pch/precompiled_tools.cxx
+++ b/tools/inc/pch/precompiled_tools.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: precompiled_tools.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/tools/inc/pch/precompiled_tools.hxx b/tools/inc/pch/precompiled_tools.hxx
index fe178f696d09..2bc615738a08 100644
--- a/tools/inc/pch/precompiled_tools.hxx
+++ b/tools/inc/pch/precompiled_tools.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_tools.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/tools/inc/poly.h b/tools/inc/poly.h
index 4f281a9b1359..e6678e071f28 100644
--- a/tools/inc/poly.h
+++ b/tools/inc/poly.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: poly.h,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/tools/inc/tools/StringListResource.hxx b/tools/inc/tools/StringListResource.hxx
index 6bddcbfa2139..9709435407fb 100644
--- a/tools/inc/tools/StringListResource.hxx
+++ b/tools/inc/tools/StringListResource.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: formcomponenthandler.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/tools/inc/tools/agapi.hxx b/tools/inc/tools/agapi.hxx
index 729845758cc7..9c71bd35c6cc 100644
--- a/tools/inc/tools/agapi.hxx
+++ b/tools/inc/tools/agapi.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: agapi.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/tools/inc/tools/agitem.hxx b/tools/inc/tools/agitem.hxx
index a7f39be1bdcd..3177bdffa0a8 100644
--- a/tools/inc/tools/agitem.hxx
+++ b/tools/inc/tools/agitem.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: agitem.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/tools/inc/tools/appendunixshellword.hxx b/tools/inc/tools/appendunixshellword.hxx
index b72aa3b8ef74..66b333bb62a5 100644
--- a/tools/inc/tools/appendunixshellword.hxx
+++ b/tools/inc/tools/appendunixshellword.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: appendunixshellword.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/goodies/inc/b3dtrans.hxx b/tools/inc/tools/b3dtrans.hxx
index 0d78c918c22c..5b812bde15a2 100644
--- a/goodies/inc/b3dtrans.hxx
+++ b/tools/inc/tools/b3dtrans.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: b3dtrans.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,6 +36,7 @@
 #include <tools/gen.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/point/b2dpoint.hxx>
+#include <tools/toolsdllapi.h>
 
 // Vorausdeklarationen
 
@@ -73,7 +71,7 @@ enum Base3DProjectionType
 |*
 \************************************************************************/
 
-class B3dTransformationSet
+class TOOLS_DLLPUBLIC B3dTransformationSet
 {
 private:
     // Object Matrix Object -> World
@@ -272,7 +270,7 @@ protected:
 |*
 \************************************************************************/
 
-class B3dViewport : public B3dTransformationSet
+class TOOLS_DLLPUBLIC B3dViewport : public B3dTransformationSet
 {
 private:
     basegfx::B3DPoint               aVRP;           // View Reference Point
@@ -305,7 +303,7 @@ protected:
 |*
 \************************************************************************/
 
-class B3dCamera : public B3dViewport
+class TOOLS_DLLPUBLIC B3dCamera : public B3dViewport
 {
 private:
     basegfx::B3DPoint       aPosition;
diff --git a/tools/inc/tools/bigint.hxx b/tools/inc/tools/bigint.hxx
index e68363b22e48..353fbb063191 100644
--- a/tools/inc/tools/bigint.hxx
+++ b/tools/inc/tools/bigint.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: bigint.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/tools/inc/tools/cachestr.hxx b/tools/inc/tools/cachestr.hxx
index c8be9d5c5570..1819792bb386 100644
--- a/tools/inc/tools/cachestr.hxx
+++ b/tools/inc/tools/cachestr.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: cachestr.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/tools/inc/tools/chapi.hxx b/tools/inc/tools/chapi.hxx
index bbeece0dcf3d..0acfe4cb2ca5 100644
--- a/tools/inc/tools/chapi.hxx
+++ b/tools/inc/tools/chapi.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: chapi.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/tools/inc/tools/color.hxx b/tools/inc/tools/color.hxx
index 4af82e4f1003..56d596453740 100644
--- a/tools/inc/tools/color.hxx
+++ b/tools/inc/tools/color.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: color.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/tools/inc/tools/config.hxx b/tools/inc/tools/config.hxx
index f464e1ace128..cb64cc2ec5bd 100644
--- a/tools/inc/tools/config.hxx
+++ b/tools/inc/tools/config.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: config.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/tools/inc/tools/contnr.hxx b/tools/inc/tools/contnr.hxx
index f85725fa7a09..5cf8e7b74569 100644
--- a/tools/inc/tools/contnr.hxx
+++ b/tools/inc/tools/contnr.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: contnr.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/tools/inc/tools/date.hxx b/tools/inc/tools/date.hxx
index e14be54b7df1..50b31edb0f83 100644
--- a/tools/inc/tools/date.hxx
+++ b/tools/inc/tools/date.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: date.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/tools/inc/tools/datetime.hxx b/tools/inc/tools/datetime.hxx
index 076d87092890..1a782486250b 100644
--- a/tools/inc/tools/datetime.hxx
+++ b/tools/inc/tools/datetime.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: datetime.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/tools/inc/tools/debug.hxx b/tools/inc/tools/debug.hxx
index 843f620649a2..e764ed2fc79a 100644
--- a/tools/inc/tools/debug.hxx
+++ b/tools/inc/tools/debug.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: debug.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/tools/inc/tools/diagnose_ex.h b/tools/inc/tools/diagnose_ex.h
index 5ca7a71cf62c..73b7bd9f96a5 100644
--- a/tools/inc/tools/diagnose_ex.h
+++ b/tools/inc/tools/diagnose_ex.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: diagnose_ex.h,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/tools/inc/tools/download.hxx b/tools/inc/tools/download.hxx
index de6f59e7ddfb..b187433927cd 100644
--- a/tools/inc/tools/download.hxx
+++ b/tools/inc/tools/download.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: download.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/tools/inc/tools/dynary.hxx b/tools/inc/tools/dynary.hxx
index 425c4997a63f..1693be40e435 100644
--- a/tools/inc/tools/dynary.hxx
+++ b/tools/inc/tools/dynary.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: dynary.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/tools/inc/tools/eacopier.hxx b/tools/inc/tools/eacopier.hxx
index f4b1b224b50d..c80eeb0d35cc 100644
--- a/tools/inc/tools/eacopier.hxx
+++ b/tools/inc/tools/eacopier.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: eacopier.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/tools/inc/tools/errcode.hxx b/tools/inc/tools/errcode.hxx
index 337fedfea44a..cf767b842b7a 100644
--- a/tools/inc/tools/errcode.hxx
+++ b/tools/inc/tools/errcode.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: errcode.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/tools/inc/tools/errinf.hxx b/tools/inc/tools/errinf.hxx
index d94f751661f2..45141af278b1 100644
--- a/tools/inc/tools/errinf.hxx
+++ b/tools/inc/tools/errinf.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: errinf.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/tools/inc/tools/extendapplicationenvironment.hxx b/tools/inc/tools/extendapplicationenvironment.hxx
index 5a6c72fc91b3..05eac33effba 100644
--- a/tools/inc/tools/extendapplicationenvironment.hxx
+++ b/tools/inc/tools/extendapplicationenvironment.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: extendapplicationenvironment.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/tools/inc/tools/fldunit.hxx b/tools/inc/tools/fldunit.hxx
index 786796030eb3..637539f6dd6f 100644
--- a/tools/inc/tools/fldunit.hxx
+++ b/tools/inc/tools/fldunit.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: fldunit.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/tools/inc/tools/fontenum.hxx b/tools/inc/tools/fontenum.hxx
index 6c529cedb30d..0e0f1b2f7368 100644
--- a/tools/inc/tools/fontenum.hxx
+++ b/tools/inc/tools/fontenum.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: vclenum.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/tools/inc/tools/fract.hxx b/tools/inc/tools/fract.hxx
index 2b32e617036b..7769e88ab541 100644
--- a/tools/inc/tools/fract.hxx
+++ b/tools/inc/tools/fract.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: fract.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/tools/inc/tools/fsys.hxx b/tools/inc/tools/fsys.hxx
index f1da7579aee6..880768c89d8c 100644
--- a/tools/inc/tools/fsys.hxx
+++ b/tools/inc/tools/fsys.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: fsys.hxx,v $
- * $Revision: 1.4.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/inc/tools/gen.hxx b/tools/inc/tools/gen.hxx
index 0d82f4d73160..85da22126b77 100644
--- a/tools/inc/tools/gen.hxx
+++ b/tools/inc/tools/gen.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: gen.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/tools/inc/tools/geninfo.hxx b/tools/inc/tools/geninfo.hxx
index b5bae9f87b5d..720ccb9cd788 100644
--- a/tools/inc/tools/geninfo.hxx
+++ b/tools/inc/tools/geninfo.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: geninfo.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/tools/inc/tools/getprocessworkingdir.hxx b/tools/inc/tools/getprocessworkingdir.hxx
index c1abc019033a..1b0688379590 100644
--- a/tools/inc/tools/getprocessworkingdir.hxx
+++ b/tools/inc/tools/getprocessworkingdir.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: getprocessworkingdir.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/tools/inc/tools/globname.hxx b/tools/inc/tools/globname.hxx
index 2f6ed45d671c..7fac64e2f74b 100644
--- a/tools/inc/tools/globname.hxx
+++ b/tools/inc/tools/globname.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: globname.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/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx
index d9861f64961d..7341225912ab 100644
--- a/tools/inc/tools/inetdef.hxx
+++ b/tools/inc/tools/inetdef.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: inetdef.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/tools/inc/tools/inetmime.hxx b/tools/inc/tools/inetmime.hxx
index 16bbd348a28b..4e8065f6264c 100644
--- a/tools/inc/tools/inetmime.hxx
+++ b/tools/inc/tools/inetmime.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: inetmime.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/tools/inc/tools/inetmsg.hxx b/tools/inc/tools/inetmsg.hxx
index ada5f559c70f..d7619fc34a4d 100644
--- a/tools/inc/tools/inetmsg.hxx
+++ b/tools/inc/tools/inetmsg.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: inetmsg.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/tools/inc/tools/inetstrm.hxx b/tools/inc/tools/inetstrm.hxx
index 9e0ec0f0089e..1fd9a913b382 100644
--- a/tools/inc/tools/inetstrm.hxx
+++ b/tools/inc/tools/inetstrm.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: inetstrm.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/tools/inc/tools/iparser.hxx b/tools/inc/tools/iparser.hxx
index 2a5fa7853d54..78eed43e8391 100644
--- a/tools/inc/tools/iparser.hxx
+++ b/tools/inc/tools/iparser.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: iparser.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/tools/inc/tools/isofallback.hxx b/tools/inc/tools/isofallback.hxx
index 5cc224a272eb..dcf4bd938376 100644
--- a/tools/inc/tools/isofallback.hxx
+++ b/tools/inc/tools/isofallback.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: isofallback.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/tools/inc/tools/line.hxx b/tools/inc/tools/line.hxx
index ccee8f32c2b1..c6c70df842ca 100644
--- a/tools/inc/tools/line.hxx
+++ b/tools/inc/tools/line.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: line.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/tools/inc/tools/link.hxx b/tools/inc/tools/link.hxx
index 0c9294ed7f95..1742759055d6 100644
--- a/tools/inc/tools/link.hxx
+++ b/tools/inc/tools/link.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: link.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/tools/inc/tools/list.hxx b/tools/inc/tools/list.hxx
index 83dcb7c88ec4..dd8fbf454f80 100644
--- a/tools/inc/tools/list.hxx
+++ b/tools/inc/tools/list.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: list.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/tools/inc/tools/mapunit.hxx b/tools/inc/tools/mapunit.hxx
index 76267192347a..0b5f5d044d19 100644
--- a/tools/inc/tools/mapunit.hxx
+++ b/tools/inc/tools/mapunit.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: mapunit.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/tools/inc/tools/mempool.hxx b/tools/inc/tools/mempool.hxx
index 486533298ef0..a96a024d4b27 100644
--- a/tools/inc/tools/mempool.hxx
+++ b/tools/inc/tools/mempool.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: mempool.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/tools/inc/tools/multisel.hxx b/tools/inc/tools/multisel.hxx
index 46fd8947e21b..f75f4c5f03af 100644
--- a/tools/inc/tools/multisel.hxx
+++ b/tools/inc/tools/multisel.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: multisel.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,6 +32,9 @@
 #include <tools/list.hxx>
 #include <tools/string.hxx>
 
+#include <vector>
+#include <set>
+
 //------------------------------------------------------------------
 
 #ifdef _SV_MULTISEL_CXX
@@ -112,4 +112,105 @@ public:
     const Range&    GetRange( ULONG nRange ) const { return *(const Range*)aSels.GetObject(nRange); }
 };
 
+class TOOLS_DLLPUBLIC StringRangeEnumerator
+{
+    struct Range
+    {
+        sal_Int32   nFirst;
+        sal_Int32   nLast;
+
+        Range() : nFirst( -1 ), nLast( -1 ) {}
+        Range( sal_Int32 i_nFirst, sal_Int32 i_nLast ) : nFirst( i_nFirst ), nLast( i_nLast ) {}
+    };
+    std::vector< StringRangeEnumerator::Range >            maSequence;
+    sal_Int32                                              mnCount;
+    sal_Int32                                              mnMin;
+    sal_Int32                                              mnMax;
+    sal_Int32                                              mnOffset;
+
+    bool insertRange( sal_Int32 nFirst, sal_Int32 nLast, bool bSequence, bool bMayAdjust );
+    bool checkValue( sal_Int32, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
+public:
+    class TOOLS_DLLPUBLIC Iterator
+    {
+        const StringRangeEnumerator*      pEnumerator;
+        const std::set< sal_Int32 >*      pPossibleValues;
+        sal_Int32                         nRangeIndex;
+        sal_Int32                         nCurrent;
+
+        friend class StringRangeEnumerator;
+        Iterator( const StringRangeEnumerator* i_pEnum,
+                  const std::set< sal_Int32 >* i_pPossibleValues,
+                  sal_Int32 i_nRange,
+                  sal_Int32 i_nCurrent )
+        : pEnumerator( i_pEnum ), pPossibleValues( i_pPossibleValues )
+        , nRangeIndex( i_nRange ), nCurrent( i_nCurrent ) {}
+    public:
+        Iterator() : pEnumerator( NULL ), pPossibleValues( NULL ), nRangeIndex( -1 ), nCurrent( -1 ) {}
+        Iterator& operator++();
+        sal_Int32 operator*() const;
+        bool operator==(const Iterator&) const;
+        bool operator!=(const Iterator& i_rComp) const
+        { return ! (*this == i_rComp); }
+    };
+
+    friend class StringRangeEnumerator::Iterator;
+
+    StringRangeEnumerator() : mnCount( 0 ), mnMin( -1 ), mnMax( -1 ), mnOffset( -1 ) {}
+    StringRangeEnumerator( const rtl::OUString& i_rInput,
+                           sal_Int32 i_nMinNumber = -1,
+                           sal_Int32 i_nMaxNumber = -1,
+                           sal_Int32 i_nLogicalOffset = -1
+                           );
+
+    size_t size() const { return size_t(mnCount); }
+    Iterator begin( const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
+    Iterator end( const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
+
+    sal_Int32 getMin() const { return mnMin; }
+    void setMin( sal_Int32 i_nMinValue ) { mnMin = i_nMinValue; }
+    sal_Int32 getMax() const { return mnMax; }
+    void setMax( sal_Int32 i_nMaxValue ) { mnMax = i_nMaxValue; }
+    sal_Int32 getLogicalOffset() const { return mnOffset; }
+    void setLogicalOffset( sal_Int32 i_nOffset ) { mnOffset = i_nOffset; }
+
+    bool setRange( const rtl::OUString& i_rNewRange, bool i_bStrict = false );
+    bool hasValue( sal_Int32 nValue, const std::set< sal_Int32 >* i_pPossibleValues = NULL ) const;
+
+
+    /**
+    i_rPageRange:     the string to be changed into a sequence of numbers
+                      valid format example "5-3,9,9,7-8" ; instead of ',' ';' or ' ' are allowed as well
+    o_rPageVector:    the output sequence of numbers
+    i_nLogicalOffset: an offset to be applied to each number in the string before inserting it in the resulting sequence
+                      example: a user enters page numbers from 1 to n (since that is logical)
+                               of course usable page numbers in code would start from 0 and end at n-1
+                               so the logical offset would be -1
+    i_nMinNumber:     the minimum allowed number, a negative number means no minimum check
+    i_nMaxNumber:     the maximum allowed number, a negative number means no maximum check
+
+    @returns: true if the input string was valid, o_rPageVector will contain the resulting sequence
+              false if the input string was invalid, o_rPageVector will be unchanged
+
+    behavior:
+    - only non-negative sequence numbers are allowed
+    - only non-negative values in the input string are allowed
+    - the string "-3" will be either
+      * an error if no minimum is given
+      * or result in the sequence i_nMinNumber to 3
+    - the string "3-" will be either
+      * an error if no maximum is given
+      * or result in the seqeuence 3 to i_nMaxNumber
+    - an empty string as input is valid and will result in the range [min,max] if given
+      or an empty vector, if not
+    */
+    static bool getRangesFromString( const rtl::OUString& i_rPageRange,
+                                     std::vector< sal_Int32 >& o_rPageVector,
+                                     sal_Int32 i_nMinNumber = -1,
+                                     sal_Int32 i_nMaxNumber = -1,
+                                     sal_Int32 i_nLogicalOffset = -1,
+                                     std::set< sal_Int32 >* i_pPossibleValues = NULL
+                                    );
+};
+
 #endif  // _SV_MULTISEL_HXX
diff --git a/tools/inc/tools/ownlist.hxx b/tools/inc/tools/ownlist.hxx
index 59d80d7bb47c..ac99537a9f0d 100644
--- a/tools/inc/tools/ownlist.hxx
+++ b/tools/inc/tools/ownlist.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: ownlist.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/tools/inc/tools/pathutils.hxx b/tools/inc/tools/pathutils.hxx
index bf31ff2ea0b5..e5c54b09fb4b 100644
--- a/tools/inc/tools/pathutils.hxx
+++ b/tools/inc/tools/pathutils.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: pathutils.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/tools/inc/tools/poly.hxx b/tools/inc/tools/poly.hxx
index 05092957c48e..b83877b88959 100644
--- a/tools/inc/tools/poly.hxx
+++ b/tools/inc/tools/poly.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: poly.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/tools/inc/tools/postsys.h b/tools/inc/tools/postsys.h
index 13b3d765593a..3b7e37a4c23b 100644
--- a/tools/inc/tools/postsys.h
+++ b/tools/inc/tools/postsys.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: postsys.h,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/tools/inc/tools/postwin.h b/tools/inc/tools/postwin.h
index 85b3fd033f16..a6bd3431a9dc 100644
--- a/tools/inc/tools/postwin.h
+++ b/tools/inc/tools/postwin.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: postwin.h,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/tools/inc/tools/postx.h b/tools/inc/tools/postx.h
index 68a2c3a31cf8..3e77fde5d14b 100644
--- a/tools/inc/tools/postx.h
+++ b/tools/inc/tools/postx.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: postx.h,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/tools/inc/tools/presys.h b/tools/inc/tools/presys.h
index 4997d83fb0b9..457b57142dcd 100644
--- a/tools/inc/tools/presys.h
+++ b/tools/inc/tools/presys.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: presys.h,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/tools/inc/tools/prewin.h b/tools/inc/tools/prewin.h
index 99fd6da1ce59..43a4452594cc 100644
--- a/tools/inc/tools/prewin.h
+++ b/tools/inc/tools/prewin.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: prewin.h,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/tools/inc/tools/prex.h b/tools/inc/tools/prex.h
index 705e33ca5188..61088960bbfd 100644
--- a/tools/inc/tools/prex.h
+++ b/tools/inc/tools/prex.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: prex.h,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/tools/inc/tools/pstm.hxx b/tools/inc/tools/pstm.hxx
index c7e7f1e0969b..0d14385e5f08 100644
--- a/tools/inc/tools/pstm.hxx
+++ b/tools/inc/tools/pstm.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: pstm.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/tools/inc/tools/queue.hxx b/tools/inc/tools/queue.hxx
index 6796f5c4017d..cb89bce6cdda 100644
--- a/tools/inc/tools/queue.hxx
+++ b/tools/inc/tools/queue.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: queue.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/tools/inc/tools/rc.h b/tools/inc/tools/rc.h
index 8bad7dbf3f8a..bd499717a3a4 100644
--- a/tools/inc/tools/rc.h
+++ b/tools/inc/tools/rc.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: rc.h,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/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx
index 52d1a6878d4e..4bf1827a1ab6 100644
--- a/tools/inc/tools/rc.hxx
+++ b/tools/inc/tools/rc.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: rc.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/tools/inc/tools/rcid.h b/tools/inc/tools/rcid.h
index 1da5a5bd4433..3daf64c547a7 100644
--- a/tools/inc/tools/rcid.h
+++ b/tools/inc/tools/rcid.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: rcid.h,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/tools/inc/tools/ref.hxx b/tools/inc/tools/ref.hxx
index c2a551ef5491..ea1886b73e04 100644
--- a/tools/inc/tools/ref.hxx
+++ b/tools/inc/tools/ref.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: ref.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/tools/inc/tools/resary.hxx b/tools/inc/tools/resary.hxx
index 90768abff9a5..b6cd8f8943c6 100644
--- a/tools/inc/tools/resary.hxx
+++ b/tools/inc/tools/resary.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: resary.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/tools/inc/tools/resid.hxx b/tools/inc/tools/resid.hxx
index 13b979624403..cfefce8e6ab0 100644
--- a/tools/inc/tools/resid.hxx
+++ b/tools/inc/tools/resid.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: resid.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/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx
index 04ae0bacee28..b19524139078 100644
--- a/tools/inc/tools/resmgr.hxx
+++ b/tools/inc/tools/resmgr.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: resmgr.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/tools/inc/tools/rtti.hxx b/tools/inc/tools/rtti.hxx
index e1d69e020157..1f8673596b48 100644
--- a/tools/inc/tools/rtti.hxx
+++ b/tools/inc/tools/rtti.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: rtti.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/tools/inc/tools/shl.hxx b/tools/inc/tools/shl.hxx
index bd92816e858d..ab08e3cc7a58 100644
--- a/tools/inc/tools/shl.hxx
+++ b/tools/inc/tools/shl.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: shl.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/tools/inc/tools/simplerm.hxx b/tools/inc/tools/simplerm.hxx
index a1b550d8f59b..c16fe41abc0b 100644
--- a/tools/inc/tools/simplerm.hxx
+++ b/tools/inc/tools/simplerm.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: simplerm.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/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 195a6fd3ce87..1d248853f895 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.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: solar.h,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/tools/inc/tools/solarmutex.hxx b/tools/inc/tools/solarmutex.hxx
index 42aff1f23f43..f8b784c9f9ae 100755..100644
--- a/tools/inc/tools/solarmutex.hxx
+++ b/tools/inc/tools/solarmutex.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/tools/inc/tools/stack.hxx b/tools/inc/tools/stack.hxx
index 303ef8c1b285..4f3223295114 100644
--- a/tools/inc/tools/stack.hxx
+++ b/tools/inc/tools/stack.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: stack.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/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index bacaac89fe44..61af361aa5b7 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.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: stream.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -776,6 +773,9 @@ class TOOLS_DLLPUBLIC SvMemoryStream : public SvStream
     SvMemoryStream (const SvMemoryStream&);
     SvMemoryStream & operator= (const SvMemoryStream&);
 
+    friend class SvCacheStream;
+    sal_Size            GetSize() const { return nSize; }
+
 protected:
     sal_Size            nSize;
     sal_Size            nResize;
@@ -817,7 +817,7 @@ public:
 
     virtual void    ResetError();
 
-    sal_Size            GetSize() const { return nSize; }
+    sal_Size        GetEndOfData() const { return nEndOfData; }
     const void*     GetData() { Flush(); return pBuf; }
     operator const  void*() { Flush(); return pBuf; }
     virtual sal_uInt16  IsA() const;
diff --git a/tools/inc/tools/string.hxx b/tools/inc/tools/string.hxx
index 7b1b93e0868d..8b86a1835596 100644
--- a/tools/inc/tools/string.hxx
+++ b/tools/inc/tools/string.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: string.hxx,v $
- * $Revision: 1.3.38.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/inc/tools/svborder.hxx b/tools/inc/tools/svborder.hxx
index 59dc96c21480..9523a71a060f 100644
--- a/tools/inc/tools/svborder.hxx
+++ b/tools/inc/tools/svborder.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: svborder.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/tools/inc/tools/svwin.h b/tools/inc/tools/svwin.h
index 95f536cd7bb2..b4ea6fcc3374 100644
--- a/tools/inc/tools/svwin.h
+++ b/tools/inc/tools/svwin.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: svwin.h,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/tools/inc/tools/table.hxx b/tools/inc/tools/table.hxx
index e37490009d6d..1ac3fbe27b6f 100644
--- a/tools/inc/tools/table.hxx
+++ b/tools/inc/tools/table.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: table.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/tools/inc/tools/tempfile.hxx b/tools/inc/tools/tempfile.hxx
index ff8ac0b2b6e5..896fed5da0cd 100644
--- a/tools/inc/tools/tempfile.hxx
+++ b/tools/inc/tools/tempfile.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: tempfile.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/tools/inc/tools/tenccvt.hxx b/tools/inc/tools/tenccvt.hxx
index 953c1d8515fc..e24c2e259022 100644
--- a/tools/inc/tools/tenccvt.hxx
+++ b/tools/inc/tools/tenccvt.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: tenccvt.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/tools/inc/tools/testtoolloader.hxx b/tools/inc/tools/testtoolloader.hxx
index 1f2ea082687a..04431d622959 100644
--- a/tools/inc/tools/testtoolloader.hxx
+++ b/tools/inc/tools/testtoolloader.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: testtoolloader.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/tools/inc/tools/time.hxx b/tools/inc/tools/time.hxx
index 02a8065afed8..269b104e57e6 100644
--- a/tools/inc/tools/time.hxx
+++ b/tools/inc/tools/time.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: time.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/tools/inc/tools/tools.h b/tools/inc/tools/tools.h
index 0d9c6af35bd3..e1ad470cf620 100644
--- a/tools/inc/tools/tools.h
+++ b/tools/inc/tools/tools.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: tools.h,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/tools/inc/tools/toolsdllapi.h b/tools/inc/tools/toolsdllapi.h
index 8acdb2eb7199..fbd41130a145 100644
--- a/tools/inc/tools/toolsdllapi.h
+++ b/tools/inc/tools/toolsdllapi.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: toolsdllapi.h,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/tools/inc/tools/unqid.hxx b/tools/inc/tools/unqid.hxx
index fb528df1edd6..4e255e0efdd1 100644
--- a/tools/inc/tools/unqid.hxx
+++ b/tools/inc/tools/unqid.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: unqid.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/tools/inc/tools/unqidx.hxx b/tools/inc/tools/unqidx.hxx
index 443e787c91bd..95aac95d9cf4 100644
--- a/tools/inc/tools/unqidx.hxx
+++ b/tools/inc/tools/unqidx.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: unqidx.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/tools/inc/tools/urlkeys.hxx b/tools/inc/tools/urlkeys.hxx
index fb8aacf8282c..28122657b7d4 100644
--- a/tools/inc/tools/urlkeys.hxx
+++ b/tools/inc/tools/urlkeys.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: urlkeys.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/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx
index 3c83f2beb5b3..86a8114ab0b8 100644
--- a/tools/inc/tools/urlobj.hxx
+++ b/tools/inc/tools/urlobj.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: urlobj.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/tools/inc/tools/vcompat.hxx b/tools/inc/tools/vcompat.hxx
index 7ef68f16b0b0..f6ee6922faac 100644
--- a/tools/inc/tools/vcompat.hxx
+++ b/tools/inc/tools/vcompat.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: vcompat.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/tools/inc/tools/vector2d.hxx b/tools/inc/tools/vector2d.hxx
index 8f29fbd05778..d346e1af2bbf 100644
--- a/tools/inc/tools/vector2d.hxx
+++ b/tools/inc/tools/vector2d.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: vector2d.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/tools/inc/tools/weakbase.h b/tools/inc/tools/weakbase.h
index eae28cea54f6..a66da8c7c33f 100644
--- a/tools/inc/tools/weakbase.h
+++ b/tools/inc/tools/weakbase.h
@@ -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: weakbase.h,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/tools/inc/tools/weakbase.hxx b/tools/inc/tools/weakbase.hxx
index 7a12d381c692..81f53fb3516b 100644
--- a/tools/inc/tools/weakbase.hxx
+++ b/tools/inc/tools/weakbase.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: weakbase.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/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
index a9c23de87ddd..c909ca3e37b0 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/tools/inc/tools/wintypes.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: wintypes.hxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -333,5 +330,11 @@ typedef USHORT StandardButtonType;
 #define BUTTON_LESS         ((StandardButtonType)10)
 #define BUTTON_COUNT        11
 
+// --------------------------------------------
+// - prominent place for ListBox window types -
+// --------------------------------------------
+
+enum ProminentEntry { PROMINENT_TOP, PROMINENT_MIDDLE };
+
 #endif // _TOOLS_WINTYPES_HXX
 
diff --git a/tools/inc/tools/wldcrd.hxx b/tools/inc/tools/wldcrd.hxx
index d4c020eda5da..478566ce9b44 100644
--- a/tools/inc/tools/wldcrd.hxx
+++ b/tools/inc/tools/wldcrd.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: wldcrd.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/tools/inc/tools/zcodec.hxx b/tools/inc/tools/zcodec.hxx
index cccee9f04c92..430caa363663 100644
--- a/tools/inc/tools/zcodec.hxx
+++ b/tools/inc/tools/zcodec.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: zcodec.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/tools/inc/toolsin.hxx b/tools/inc/toolsin.hxx
index b2426d95320e..7259682c9895 100644
--- a/tools/inc/toolsin.hxx
+++ b/tools/inc/toolsin.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: toolsin.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/tools/os2/inc/dll.hxx b/tools/os2/inc/dll.hxx
index 1f8858e89d63..81a87a03ece7 100644
--- a/tools/os2/inc/dll.hxx
+++ b/tools/os2/inc/dll.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: dll.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/tools/os2/source/dll/makefile.mk b/tools/os2/source/dll/makefile.mk
index 78d4a729c234..97cff795defb 100644
--- a/tools/os2/source/dll/makefile.mk
+++ b/tools/os2/source/dll/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/os2/source/dll/toolsdll.cxx b/tools/os2/source/dll/toolsdll.cxx
index 4c8650a2737c..0e0bdec3a9b0 100644
--- a/tools/os2/source/dll/toolsdll.cxx
+++ b/tools/os2/source/dll/toolsdll.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: toolsdll.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/tools/prj/d.lst b/tools/prj/d.lst
index 3208ecbb3168..76cb0107453c 100644
--- a/tools/prj/d.lst
+++ b/tools/prj/d.lst
@@ -112,6 +112,7 @@ mkdir: %_DEST%\inc%_EXT%\bootstrp
 ..\inc\tools\testtoolloader.hxx %_DEST%\inc%_EXT%\tools\testtoolloader.hxx
 ..\inc\tools\svborder.hxx %_DEST%\inc%_EXT%\tools\svborder.hxx
 ..\inc\tools\getprocessworkingdir.hxx %_DEST%\inc%_EXT%\tools\getprocessworkingdir.hxx
+..\inc\tools\b3dtrans.hxx %_DEST%\inc%_EXT%\tools\b3dtrans.hxx
 
 ..\%__SRC%\bin\rscdep.exe %_DEST%\bin%_EXT%\rscdep.exe
 ..\%__SRC%\bin\rscdep %_DEST%\bin%_EXT%\rscdep
diff --git a/tools/qa/makefile.mk b/tools/qa/makefile.mk
index c63aa966b7fc..66ed19e20737 100644
--- a/tools/qa/makefile.mk
+++ b/tools/qa/makefile.mk
@@ -1,15 +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: makefile.mk,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/tools/qa/test_pathutils.cxx b/tools/qa/test_pathutils.cxx
index c028a2f654c4..5966406e150f 100644
--- a/tools/qa/test_pathutils.cxx
+++ b/tools/qa/test_pathutils.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: test_pathutils.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/tools/qa/version.map b/tools/qa/version.map
index 1863a449853a..7321bbca16ad 100644
--- a/tools/qa/version.map
+++ b/tools/qa/version.map
@@ -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: version.map,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/tools/source/communi/geninfo.cxx b/tools/source/communi/geninfo.cxx
index 43fb2a16b87e..97326836de2d 100644
--- a/tools/source/communi/geninfo.cxx
+++ b/tools/source/communi/geninfo.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: geninfo.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/tools/source/communi/makefile.mk b/tools/source/communi/makefile.mk
index 9bfc52e0b2d5..1795081a9ec5 100644
--- a/tools/source/communi/makefile.mk
+++ b/tools/source/communi/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/tools/source/communi/parser.cxx b/tools/source/communi/parser.cxx
index d2f87274f2f4..20c2bb3ba059 100644
--- a/tools/source/communi/parser.cxx
+++ b/tools/source/communi/parser.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: parser.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/tools/source/datetime/datetime.cxx b/tools/source/datetime/datetime.cxx
index 94e49f4cde80..8b679478c535 100644
--- a/tools/source/datetime/datetime.cxx
+++ b/tools/source/datetime/datetime.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: datetime.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/tools/source/datetime/makefile.mk b/tools/source/datetime/makefile.mk
index 28973e70d0f4..3d46cc6ce1b0 100644
--- a/tools/source/datetime/makefile.mk
+++ b/tools/source/datetime/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/datetime/tdate.cxx b/tools/source/datetime/tdate.cxx
index 5f0d7f3ebe1d..e6bb4345d9f9 100644
--- a/tools/source/datetime/tdate.cxx
+++ b/tools/source/datetime/tdate.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: tdate.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/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index 5417d0d3df31..9483cc10065e 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.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: ttime.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/tools/source/debug/debug.cxx b/tools/source/debug/debug.cxx
index 119defa91ad0..62f36e662ea9 100644
--- a/tools/source/debug/debug.cxx
+++ b/tools/source/debug/debug.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: debug.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/tools/source/debug/makefile.mk b/tools/source/debug/makefile.mk
index a818ba3d9168..925ae90f333d 100644
--- a/tools/source/debug/makefile.mk
+++ b/tools/source/debug/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/tools/source/debug/stcktree.cxx b/tools/source/debug/stcktree.cxx
index 7d18c2b5b9f7..dccc4c198852 100644
--- a/tools/source/debug/stcktree.cxx
+++ b/tools/source/debug/stcktree.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: stcktree.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/tools/source/fsys/comdep.cxx b/tools/source/fsys/comdep.cxx
index 3975b386cf52..fa1009ad5fd3 100644
--- a/tools/source/fsys/comdep.cxx
+++ b/tools/source/fsys/comdep.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: comdep.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/tools/source/fsys/comdep.hxx b/tools/source/fsys/comdep.hxx
index 2cfea44d7392..043c5815f764 100644
--- a/tools/source/fsys/comdep.hxx
+++ b/tools/source/fsys/comdep.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: comdep.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/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx
index 3a87ecc35250..1bd43bffc4e7 100644
--- a/tools/source/fsys/dirent.cxx
+++ b/tools/source/fsys/dirent.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: dirent.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/tools/source/fsys/filecopy.cxx b/tools/source/fsys/filecopy.cxx
index 5b98002fd999..62d361aa4af4 100644
--- a/tools/source/fsys/filecopy.cxx
+++ b/tools/source/fsys/filecopy.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: filecopy.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/tools/source/fsys/fstat.cxx b/tools/source/fsys/fstat.cxx
index 1ad1a47566cb..acdbe6bae510 100644
--- a/tools/source/fsys/fstat.cxx
+++ b/tools/source/fsys/fstat.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: fstat.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/tools/source/fsys/makefile.mk b/tools/source/fsys/makefile.mk
index bd9ebdb82f1b..b1d34d6347f3 100644
--- a/tools/source/fsys/makefile.mk
+++ b/tools/source/fsys/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/fsys/os2.cxx b/tools/source/fsys/os2.cxx
index fd5ffa9291a3..03f8f9eb46ce 100644
--- a/tools/source/fsys/os2.cxx
+++ b/tools/source/fsys/os2.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: os2.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/tools/source/fsys/os2.hxx b/tools/source/fsys/os2.hxx
index 073505b07d6d..c5e54ba0ad47 100644
--- a/tools/source/fsys/os2.hxx
+++ b/tools/source/fsys/os2.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: os2.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/tools/source/fsys/tdir.cxx b/tools/source/fsys/tdir.cxx
index 30b1db33904d..429835d35ab3 100644
--- a/tools/source/fsys/tdir.cxx
+++ b/tools/source/fsys/tdir.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: tdir.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/tools/source/fsys/tempfile.cxx b/tools/source/fsys/tempfile.cxx
index f7b0a691cd7c..b3f53d882467 100644
--- a/tools/source/fsys/tempfile.cxx
+++ b/tools/source/fsys/tempfile.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: tempfile.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/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx
index 4a2e3c6ad76a..13da80f6ccca 100644
--- a/tools/source/fsys/unx.cxx
+++ b/tools/source/fsys/unx.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: unx.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/tools/source/fsys/unx.hxx b/tools/source/fsys/unx.hxx
index 233b72a9b807..b6723e8709a3 100644
--- a/tools/source/fsys/unx.hxx
+++ b/tools/source/fsys/unx.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: unx.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/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx
index f7ffed5e4dd1..07c532e60dd7 100644
--- a/tools/source/fsys/urlobj.cxx
+++ b/tools/source/fsys/urlobj.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: urlobj.cxx,v $
- * $Revision: 1.63.36.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1022,16 +1019,14 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef,
                     if (pEnd - pPos >= 2 && pPos[0] == '/' && pPos[1] == '/')
                     {
                         sal_Unicode const * p1 = pPos + 2;
-                        if (
-                             p1 == pEnd || *p1 == nFragmentDelimiter || *p1 == '/' ||
-                             (
-                               (
-                                 scanDomain(p1, pEnd) > 0 ||
-                                 scanIPv6reference(p1, pEnd)
-                               ) &&
-                               (p1 == pEnd || *p1 == nFragmentDelimiter || *p1 == '/')
-                             )
-                           )
+                        while (p1 != pEnd && *p1 != '/' &&
+                               *p1 != nFragmentDelimiter)
+                        {
+                            ++p1;
+                        }
+                        if (parseHostOrNetBiosName(
+                                pPos + 2, p1, bOctets, ENCODE_ALL,
+                                RTL_TEXTENCODING_DONTKNOW, true, NULL))
                         {
                             aSynAbsURIRef.
                                 appendAscii(RTL_CONSTASCII_STRINGPARAM("//"));
diff --git a/tools/source/fsys/wldcrd.cxx b/tools/source/fsys/wldcrd.cxx
index 7b4802501edf..293d16877498 100644
--- a/tools/source/fsys/wldcrd.cxx
+++ b/tools/source/fsys/wldcrd.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: wldcrd.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/tools/source/fsys/wntmsc.cxx b/tools/source/fsys/wntmsc.cxx
index 153fbf37de2e..a8cf1c1eecec 100644
--- a/tools/source/fsys/wntmsc.cxx
+++ b/tools/source/fsys/wntmsc.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: wntmsc.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/tools/source/fsys/wntmsc.hxx b/tools/source/fsys/wntmsc.hxx
index 2215e3d13561..a6202cc71cc6 100644
--- a/tools/source/fsys/wntmsc.hxx
+++ b/tools/source/fsys/wntmsc.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: wntmsc.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/goodies/source/base3d/b3dtrans.cxx b/tools/source/generic/b3dtrans.cxx
index fd2908c3ea2e..9ed887457035 100644
--- a/goodies/source/base3d/b3dtrans.cxx
+++ b/tools/source/generic/b3dtrans.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: b3dtrans.cxx,v $
- * $Revision: 1.10.42.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,8 +26,8 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
-#include "b3dtrans.hxx"
+#include "precompiled_tools.hxx"
+#include <tools/b3dtrans.hxx>
 #include <tools/debug.hxx>
 
 /*************************************************************************
diff --git a/tools/source/generic/bigint.cxx b/tools/source/generic/bigint.cxx
index 85f46318efad..7b10f31d733f 100644
--- a/tools/source/generic/bigint.cxx
+++ b/tools/source/generic/bigint.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: bigint.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/tools/source/generic/color.cxx b/tools/source/generic/color.cxx
index 9a0b37959916..37e9dedf9259 100644
--- a/tools/source/generic/color.cxx
+++ b/tools/source/generic/color.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: color.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/tools/source/generic/config.cxx b/tools/source/generic/config.cxx
index c978f844746f..1a94c2b11198 100644
--- a/tools/source/generic/config.cxx
+++ b/tools/source/generic/config.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: config.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/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 353e6c6c5d78..0b8231d620ce 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.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: fract.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/tools/source/generic/gen.cxx b/tools/source/generic/gen.cxx
index 6e82ded34877..b0eb57f1ab73 100644
--- a/tools/source/generic/gen.cxx
+++ b/tools/source/generic/gen.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: gen.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/tools/source/generic/line.cxx b/tools/source/generic/line.cxx
index d86ff82cb739..0c2de98d843d 100644
--- a/tools/source/generic/line.cxx
+++ b/tools/source/generic/line.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: line.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/tools/source/generic/link.cxx b/tools/source/generic/link.cxx
index 9964f58e7cda..928251306901 100644
--- a/tools/source/generic/link.cxx
+++ b/tools/source/generic/link.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: link.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/tools/source/generic/makefile.mk b/tools/source/generic/makefile.mk
index 6340e4daae08..5cdaa02065ae 100644
--- a/tools/source/generic/makefile.mk
+++ b/tools/source/generic/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
@@ -44,6 +40,7 @@ TARGET=gen
 EXCEPTIONSFILES = $(SLO)$/poly.obj $(OBJ)$/poly.obj
 
 SLOFILES=       $(SLO)$/toolsin.obj     \
+            $(SLO)$/b3dtrans.obj                \
             $(SLO)$/link.obj                \
             $(SLO)$/bigint.obj              \
             $(SLO)$/fract.obj               \
@@ -56,6 +53,7 @@ SLOFILES=       $(SLO)$/toolsin.obj     \
             $(SLO)$/line.obj
 
 OBJFILES=       $(OBJ)$/toolsin.obj     \
+            $(OBJ)$/b3dtrans.obj                \
             $(OBJ)$/link.obj                \
             $(OBJ)$/bigint.obj              \
             $(OBJ)$/fract.obj               \
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 509d2ab4969d..2290cfdbe7c2 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.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: poly.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/tools/source/generic/poly2.cxx b/tools/source/generic/poly2.cxx
index 692e47a9d1d2..46459353fa35 100644
--- a/tools/source/generic/poly2.cxx
+++ b/tools/source/generic/poly2.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: poly2.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/tools/source/generic/svborder.cxx b/tools/source/generic/svborder.cxx
index 6057eb6a9d3e..eb254faf2310 100644
--- a/tools/source/generic/svborder.cxx
+++ b/tools/source/generic/svborder.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: svborder.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/tools/source/generic/toolsin.cxx b/tools/source/generic/toolsin.cxx
index a2cc6759e9c1..50c9c0187b16 100644
--- a/tools/source/generic/toolsin.cxx
+++ b/tools/source/generic/toolsin.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: toolsin.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/tools/source/inet/inetmime.cxx b/tools/source/inet/inetmime.cxx
index 9b94464d7949..5324e9be07b8 100644
--- a/tools/source/inet/inetmime.cxx
+++ b/tools/source/inet/inetmime.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: inetmime.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/tools/source/inet/inetmsg.cxx b/tools/source/inet/inetmsg.cxx
index 1acef4719c85..feec97168b59 100644
--- a/tools/source/inet/inetmsg.cxx
+++ b/tools/source/inet/inetmsg.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: inetmsg.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/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx
index ec0cea10d43e..ca76d8750bf8 100644
--- a/tools/source/inet/inetstrm.cxx
+++ b/tools/source/inet/inetstrm.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: inetstrm.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/tools/source/inet/makefile.mk b/tools/source/inet/makefile.mk
index 7760f1c21486..1e0bdfdd2391 100644
--- a/tools/source/inet/makefile.mk
+++ b/tools/source/inet/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/makefile.mk b/tools/source/makefile.mk
index 9d67ca6621a7..8c3f3167635e 100644
--- a/tools/source/makefile.mk
+++ b/tools/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/memtools/contnr.cxx b/tools/source/memtools/contnr.cxx
index c1bbbdb94037..4a4ee47886ee 100644
--- a/tools/source/memtools/contnr.cxx
+++ b/tools/source/memtools/contnr.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: contnr.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/tools/source/memtools/makefile.mk b/tools/source/memtools/makefile.mk
index 037dadbf4a46..de03a0d50cc3 100644
--- a/tools/source/memtools/makefile.mk
+++ b/tools/source/memtools/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,6 +43,8 @@ SLOFILES=	$(SLO)$/contnr.obj	\
             $(SLO)$/mempool.obj \
             $(SLO)$/multisel.obj
 
+EXCEPTIONSFILES= $(SLO)$/multisel.obj $(OBJ)$/multisel.obj
+
 OBJFILES=	$(OBJ)$/contnr.obj	 \
             $(OBJ)$/table.obj	 \
             $(OBJ)$/unqidx.obj	 \
diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx
index d2c37e82268d..45d6d2ea9367 100644
--- a/tools/source/memtools/mempool.cxx
+++ b/tools/source/memtools/mempool.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: mempool.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/tools/source/memtools/multisel.cxx b/tools/source/memtools/multisel.cxx
index 6b32badc283e..1e4da74348f4 100644
--- a/tools/source/memtools/multisel.cxx
+++ b/tools/source/memtools/multisel.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: multisel.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,12 +38,16 @@
 #include <tools/debug.hxx>
 #include <tools/multisel.hxx>
 
+#include "rtl/ustrbuf.hxx"
+
 #ifdef MI_DEBUG
 #define DBG(x) x
 #else
 #define DBG(x)
 #endif
 
+using namespace rtl;
+
 //==================================================================
 
 #ifdef MI_DEBUG
@@ -865,3 +866,297 @@ void MultiSelection::SetTotalRange( const Range& rTotRange )
     bCurValid = FALSE;
     nCurIndex = 0;
 }
+
+// -----------------------------------------------------------------------
+//
+// StringRangeEnumerator
+//
+// -----------------------------------------------------------------------
+StringRangeEnumerator::StringRangeEnumerator( const rtl::OUString& i_rInput,
+                                              sal_Int32 i_nMinNumber,
+                                              sal_Int32 i_nMaxNumber,
+                                              sal_Int32 i_nLogicalOffset
+                                              )
+    : mnCount( 0 )
+    , mnMin( i_nMinNumber )
+    , mnMax( i_nMaxNumber )
+    , mnOffset( i_nLogicalOffset )
+{
+    setRange( i_rInput );
+}
+
+bool StringRangeEnumerator::checkValue( sal_Int32 i_nValue, const std::set< sal_Int32 >* i_pPossibleValues ) const
+{
+    if( mnMin >= 0 && i_nValue < mnMin )
+        return false;
+    if( mnMax >= 0 && i_nValue > mnMax )
+        return false;
+    if( i_nValue < 0 )
+        return false;
+    if( i_pPossibleValues && i_pPossibleValues->find( i_nValue ) == i_pPossibleValues->end() )
+        return false;
+    return true;
+}
+
+bool StringRangeEnumerator::insertRange( sal_Int32 i_nFirst, sal_Int32 i_nLast, bool bSequence, bool bMayAdjust )
+{
+    bool bSuccess = true;
+    if( bSequence )
+    {
+        if( i_nFirst == -1 )
+            i_nFirst = mnMin;
+        if( i_nLast == -1 )
+            i_nLast = mnMax;
+        if( bMayAdjust )
+        {
+            if( i_nFirst < mnMin )
+                i_nFirst = mnMin;
+            if( i_nFirst > mnMax )
+                i_nFirst = mnMax;
+            if( i_nLast < mnMin )
+                i_nLast = mnMin;
+            if( i_nLast > mnMax )
+                i_nLast = mnMax;
+        }
+        if( checkValue( i_nFirst ) && checkValue( i_nLast ) )
+        {
+            maSequence.push_back( Range( i_nFirst, i_nLast ) );
+            sal_Int32 nNumber = i_nLast - i_nFirst;
+            nNumber = nNumber < 0 ? -nNumber : nNumber;
+            mnCount += nNumber + 1;
+        }
+        else
+            bSuccess = false;
+    }
+    else
+    {
+        if( i_nFirst >= 0 )
+        {
+            if( checkValue( i_nFirst ) )
+            {
+                maSequence.push_back( Range( i_nFirst, i_nFirst ) );
+                mnCount++;
+            }
+            else
+                bSuccess = false;
+        }
+        if( i_nLast >= 0 )
+        {
+            if( checkValue( i_nLast ) )
+            {
+                maSequence.push_back( Range( i_nLast, i_nLast ) );
+                mnCount++;
+            }
+            else
+                bSuccess = false;
+        }
+    }
+
+    return bSuccess;
+}
+
+bool StringRangeEnumerator::setRange( const rtl::OUString& i_rNewRange, bool i_bStrict )
+{
+    mnCount = 0;
+    maSequence.clear();
+
+    // we love special cases
+    if( i_rNewRange.getLength() == 0 )
+    {
+        if( mnMin >= 0 && mnMax >= 0 )
+        {
+            insertRange( mnMin, mnMax, mnMin != mnMax, ! i_bStrict );
+        }
+        return true;
+    }
+
+    const sal_Unicode* pInput = i_rNewRange.getStr();
+    rtl::OUStringBuffer aNumberBuf( 16 );
+    sal_Int32 nLastNumber = -1, nNumber = -1;
+    bool bSequence = false;
+    bool bSuccess = true;
+    while( *pInput )
+    {
+        while( *pInput >= sal_Unicode('0') && *pInput <= sal_Unicode('9') )
+            aNumberBuf.append( *pInput++ );
+        if( aNumberBuf.getLength() )
+        {
+            if( nNumber != -1 )
+            {
+                if( bSequence )
+                {
+                    if( ! insertRange( nLastNumber, nNumber, true, ! i_bStrict ) && i_bStrict )
+                    {
+                        bSuccess = false;
+                        break;
+                    }
+                    nLastNumber = -1;
+                }
+                else
+                {
+                    if( ! insertRange( nNumber, nNumber, false, ! i_bStrict ) && i_bStrict )
+                    {
+                        bSuccess = false;
+                        break;
+                    }
+                }
+            }
+            nNumber = aNumberBuf.makeStringAndClear().toInt32();
+            nNumber += mnOffset;
+        }
+        bool bInsertRange = false;
+        if( *pInput == sal_Unicode('-') )
+        {
+            nLastNumber = nNumber;
+            nNumber = -1;
+            bSequence = true;
+        }
+        else if( *pInput == ' ' )
+        {
+        }
+        else if( *pInput == sal_Unicode(',') || *pInput == sal_Unicode(';') )
+            bInsertRange = true;
+        else if( *pInput )
+        {
+
+            bSuccess = false;
+            break; // parse error
+        }
+
+        if( bInsertRange )
+        {
+            if( ! insertRange( nLastNumber, nNumber, bSequence, ! i_bStrict ) && i_bStrict )
+            {
+                bSuccess = false;
+                break;
+            }
+            nNumber = nLastNumber = -1;
+            bSequence = false;
+        }
+        if( *pInput )
+            pInput++;
+    }
+    // insert last entries
+    insertRange( nLastNumber, nNumber, bSequence, ! i_bStrict );
+
+    return bSuccess;
+}
+
+bool StringRangeEnumerator::hasValue( sal_Int32 i_nValue, const std::set< sal_Int32 >* i_pPossibleValues ) const
+{
+    if( i_pPossibleValues && i_pPossibleValues->find( i_nValue ) == i_pPossibleValues->end() )
+        return false;
+    size_t n = maSequence.size();
+    for( size_t i= 0; i < n; ++i )
+    {
+        const StringRangeEnumerator::Range rRange( maSequence[i] );
+        if( rRange.nFirst < rRange.nLast )
+        {
+            if( i_nValue >= rRange.nFirst && i_nValue <= rRange.nLast )
+                return true;
+        }
+        else
+        {
+            if( i_nValue >= rRange.nLast && i_nValue <= rRange.nFirst )
+                return true;
+        }
+    }
+    return false;
+}
+
+StringRangeEnumerator::Iterator& StringRangeEnumerator::Iterator::operator++()
+{
+    if( nRangeIndex >= 0 && nCurrent >= 0 && pEnumerator )
+    {
+        const StringRangeEnumerator::Range& rRange( pEnumerator->maSequence[nRangeIndex] );
+        bool bRangeChange = false;
+        if( rRange.nLast < rRange.nFirst )
+        {
+            // backward range
+            if( nCurrent > rRange.nLast )
+                nCurrent--;
+            else
+                bRangeChange = true;
+        }
+        else
+        {
+            // forward range
+            if( nCurrent < rRange.nLast )
+                nCurrent++;
+            else
+                bRangeChange = true;
+        }
+        if( bRangeChange )
+        {
+            nRangeIndex++;
+            if( size_t(nRangeIndex) == pEnumerator->maSequence.size() )
+            {
+                // reached the end
+                nRangeIndex = nCurrent = -1;
+            }
+            else
+                nCurrent = pEnumerator->maSequence[nRangeIndex].nFirst;
+        }
+        if( nRangeIndex != -1 && nCurrent != -1 )
+        {
+            if( ! pEnumerator->checkValue( nCurrent, pPossibleValues ) )
+                return ++(*this);
+        }
+    }
+    return *this;
+}
+
+sal_Int32 StringRangeEnumerator::Iterator::operator*() const
+{
+    return nCurrent;
+}
+
+bool StringRangeEnumerator::Iterator::operator==( const Iterator& i_rCompare ) const
+{
+    return i_rCompare.pEnumerator == pEnumerator && i_rCompare.nRangeIndex == nRangeIndex && i_rCompare.nCurrent == nCurrent;
+}
+
+StringRangeEnumerator::Iterator StringRangeEnumerator::begin( const std::set< sal_Int32 >* i_pPossibleValues ) const
+{
+    StringRangeEnumerator::Iterator it( this,
+                                        i_pPossibleValues,
+                                        maSequence.empty() ? -1 : 0,
+                                        maSequence.empty() ? -1 : maSequence[0].nFirst );
+    if( ! checkValue(*it, i_pPossibleValues ) )
+        ++it;
+    return it;
+}
+
+StringRangeEnumerator::Iterator StringRangeEnumerator::end( const std::set< sal_Int32 >* i_pPossibleValues ) const
+{
+    return StringRangeEnumerator::Iterator( this, i_pPossibleValues, -1, -1 );
+}
+
+bool StringRangeEnumerator::getRangesFromString( const OUString& i_rPageRange,
+                                                 std::vector< sal_Int32 >& o_rPageVector,
+                                                 sal_Int32 i_nMinNumber,
+                                                 sal_Int32 i_nMaxNumber,
+                                                 sal_Int32 i_nLogicalOffset,
+                                                 std::set< sal_Int32 >* i_pPossibleValues
+                                               )
+{
+    StringRangeEnumerator aEnum;
+    aEnum.setMin( i_nMinNumber );
+    aEnum.setMax( i_nMaxNumber );
+    aEnum.setLogicalOffset( i_nLogicalOffset );
+
+    bool bRes = aEnum.setRange( i_rPageRange );
+    if( bRes )
+    {
+        o_rPageVector.clear();
+        o_rPageVector.reserve( aEnum.size() );
+        for( StringRangeEnumerator::Iterator it = aEnum.begin( i_pPossibleValues );
+             it != aEnum.end( i_pPossibleValues ); ++it )
+        {
+            o_rPageVector.push_back( *it );
+        }
+    }
+
+    return bRes;
+}
+
diff --git a/tools/source/memtools/table.cxx b/tools/source/memtools/table.cxx
index 75aafddb6c58..50ac46e99758 100644
--- a/tools/source/memtools/table.cxx
+++ b/tools/source/memtools/table.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: table.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/tools/source/memtools/unqidx.cxx b/tools/source/memtools/unqidx.cxx
index 4f49e29b66ee..94624c3ac905 100644
--- a/tools/source/memtools/unqidx.cxx
+++ b/tools/source/memtools/unqidx.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: unqidx.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/tools/source/misc/appendunixshellword.cxx b/tools/source/misc/appendunixshellword.cxx
index eee34d3f16ad..af2a05b00716 100644
--- a/tools/source/misc/appendunixshellword.cxx
+++ b/tools/source/misc/appendunixshellword.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: appendunixshellword.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/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx
index c01d7bbd31e5..fe76e5329cbb 100644
--- a/tools/source/misc/extendapplicationenvironment.cxx
+++ b/tools/source/misc/extendapplicationenvironment.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: extendapplicationenvironment.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/tools/source/misc/getprocessworkingdir.cxx b/tools/source/misc/getprocessworkingdir.cxx
index c86f3d0375ca..8cad594befca 100644
--- a/tools/source/misc/getprocessworkingdir.cxx
+++ b/tools/source/misc/getprocessworkingdir.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: getprocessworkingdir.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/tools/source/misc/makefile.mk b/tools/source/misc/makefile.mk
index adc098b023b8..a426bb4053c3 100644
--- a/tools/source/misc/makefile.mk
+++ b/tools/source/misc/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/misc/pathutils.cxx b/tools/source/misc/pathutils.cxx
index cb014dbb537a..397bade136e7 100644
--- a/tools/source/misc/pathutils.cxx
+++ b/tools/source/misc/pathutils.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: pathutils.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/tools/source/misc/solarmutex.cxx b/tools/source/misc/solarmutex.cxx
index 9049c13997a9..5abdfef5e37f 100644
--- a/tools/source/misc/solarmutex.cxx
+++ b/tools/source/misc/solarmutex.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/tools/source/rc/isofallback.cxx b/tools/source/rc/isofallback.cxx
index e030d1f8d312..002a90f580aa 100644
--- a/tools/source/rc/isofallback.cxx
+++ b/tools/source/rc/isofallback.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: isofallback.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/tools/source/rc/makefile.mk b/tools/source/rc/makefile.mk
index 234cc344b65d..f8b46f38a0f7 100644
--- a/tools/source/rc/makefile.mk
+++ b/tools/source/rc/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/rc/rc.cxx b/tools/source/rc/rc.cxx
index 23bd82d58afb..e24b8f8824d4 100644
--- a/tools/source/rc/rc.cxx
+++ b/tools/source/rc/rc.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: rc.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/tools/source/rc/resary.cxx b/tools/source/rc/resary.cxx
index ac5b5e11db63..a55a4f644a9f 100644
--- a/tools/source/rc/resary.cxx
+++ b/tools/source/rc/resary.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: resary.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/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index 8c9293e334c1..daeaf8e4c3a5 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.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: resmgr.cxx,v $
- * $Revision: 1.52.30.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/ref/errinf.cxx b/tools/source/ref/errinf.cxx
index 25d894f4b925..2f9c75a4b71c 100644
--- a/tools/source/ref/errinf.cxx
+++ b/tools/source/ref/errinf.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: errinf.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/tools/source/ref/globname.cxx b/tools/source/ref/globname.cxx
index 50d028acacc4..2d45e470e688 100644
--- a/tools/source/ref/globname.cxx
+++ b/tools/source/ref/globname.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: globname.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/tools/source/ref/makefile.mk b/tools/source/ref/makefile.mk
index 2c22027532b0..c87f8a740a4f 100644
--- a/tools/source/ref/makefile.mk
+++ b/tools/source/ref/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/tools/source/ref/pstm.cxx b/tools/source/ref/pstm.cxx
index a336bbaab360..e0412fd5d675 100644
--- a/tools/source/ref/pstm.cxx
+++ b/tools/source/ref/pstm.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: pstm.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/tools/source/ref/ref.cxx b/tools/source/ref/ref.cxx
index c99a043fe92d..eeee931f9182 100644
--- a/tools/source/ref/ref.cxx
+++ b/tools/source/ref/ref.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: ref.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/tools/source/solar/makefile.mk b/tools/source/solar/makefile.mk
index fa7a015879d6..6f5dd85c608b 100644
--- a/tools/source/solar/makefile.mk
+++ b/tools/source/solar/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/solar/solar.c b/tools/source/solar/solar.c
index 3ca82270712a..608f0baf5129 100644
--- a/tools/source/solar/solar.c
+++ b/tools/source/solar/solar.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solar.c,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/tools/source/stream/cachestr.cxx b/tools/source/stream/cachestr.cxx
index fae1e823b1aa..0233dc25fb52 100644
--- a/tools/source/stream/cachestr.cxx
+++ b/tools/source/stream/cachestr.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: cachestr.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/tools/source/stream/makefile.mk b/tools/source/stream/makefile.mk
index c8374f5e7e25..ee548934c6c6 100644
--- a/tools/source/stream/makefile.mk
+++ b/tools/source/stream/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/tools/source/stream/stream.cxx b/tools/source/stream/stream.cxx
index de802ece9f05..9fdef8436f1a 100644
--- a/tools/source/stream/stream.cxx
+++ b/tools/source/stream/stream.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: stream.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/tools/source/stream/strmos2.cxx b/tools/source/stream/strmos2.cxx
index 2b3b33f60224..d211d7790b08 100644
--- a/tools/source/stream/strmos2.cxx
+++ b/tools/source/stream/strmos2.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: strmos2.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/tools/source/stream/strmsys.cxx b/tools/source/stream/strmsys.cxx
index 2b6ea54ffb3b..a373ad985214 100644
--- a/tools/source/stream/strmsys.cxx
+++ b/tools/source/stream/strmsys.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: strmsys.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/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index d27fe1f7f2c0..8a3504a417c0 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.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: strmunx.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/tools/source/stream/strmwnt.cxx b/tools/source/stream/strmwnt.cxx
index 865bf665c05f..d9e7da92296b 100644
--- a/tools/source/stream/strmwnt.cxx
+++ b/tools/source/stream/strmwnt.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: strmwnt.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/tools/source/stream/vcompat.cxx b/tools/source/stream/vcompat.cxx
index f275db60281a..8430eb17659b 100644
--- a/tools/source/stream/vcompat.cxx
+++ b/tools/source/stream/vcompat.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: vcompat.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/tools/source/string/debugprint.cxx b/tools/source/string/debugprint.cxx
index 19e663208498..7acff963b1b9 100644
--- a/tools/source/string/debugprint.cxx
+++ b/tools/source/string/debugprint.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: debugprint.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/tools/source/string/makefile.mk b/tools/source/string/makefile.mk
index 1bb9b0fdf6bc..4caa31672472 100644
--- a/tools/source/string/makefile.mk
+++ b/tools/source/string/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/string/strascii.cxx b/tools/source/string/strascii.cxx
index 6ce35241c552..775e1ca7f142 100644
--- a/tools/source/string/strascii.cxx
+++ b/tools/source/string/strascii.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: strascii.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/tools/source/string/strcvt.cxx b/tools/source/string/strcvt.cxx
index 958c5bff76d6..ef55dee5bfe2 100644
--- a/tools/source/string/strcvt.cxx
+++ b/tools/source/string/strcvt.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: strcvt.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/tools/source/string/strimp.cxx b/tools/source/string/strimp.cxx
index f6273aa2632f..34038c576aa0 100644
--- a/tools/source/string/strimp.cxx
+++ b/tools/source/string/strimp.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: strimp.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/tools/source/string/strucvt.cxx b/tools/source/string/strucvt.cxx
index d2b79e7c4e3f..7198d0e8f98c 100644
--- a/tools/source/string/strucvt.cxx
+++ b/tools/source/string/strucvt.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: strucvt.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/tools/source/string/tenccvt.cxx b/tools/source/string/tenccvt.cxx
index 91b0c3810c58..5237b24948a7 100644
--- a/tools/source/string/tenccvt.cxx
+++ b/tools/source/string/tenccvt.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: tenccvt.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/tools/source/string/tstring.cxx b/tools/source/string/tstring.cxx
index 9c6b3daac02c..f2525e3bca84 100644
--- a/tools/source/string/tstring.cxx
+++ b/tools/source/string/tstring.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: tstring.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/tools/source/string/tustring.cxx b/tools/source/string/tustring.cxx
index eaa5fab02ec7..27dab841124d 100644
--- a/tools/source/string/tustring.cxx
+++ b/tools/source/string/tustring.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: tustring.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/tools/source/testtoolloader/makefile.mk b/tools/source/testtoolloader/makefile.mk
index 0ed54c43f843..3d5cb8223e3f 100644
--- a/tools/source/testtoolloader/makefile.mk
+++ b/tools/source/testtoolloader/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/testtoolloader/testtoolloader.cxx b/tools/source/testtoolloader/testtoolloader.cxx
index f0263c001e29..ca269ef6eea2 100644
--- a/tools/source/testtoolloader/testtoolloader.cxx
+++ b/tools/source/testtoolloader/testtoolloader.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: testtoolloader.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/tools/source/zcodec/makefile.mk b/tools/source/zcodec/makefile.mk
index 6f9e530a5fec..9067b45c3b5d 100644
--- a/tools/source/zcodec/makefile.mk
+++ b/tools/source/zcodec/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/source/zcodec/zcodec.cxx b/tools/source/zcodec/zcodec.cxx
index ab3e5508ef82..f4f62162854a 100644
--- a/tools/source/zcodec/zcodec.cxx
+++ b/tools/source/zcodec/zcodec.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: zcodec.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/tools/test/export.map b/tools/test/export.map
index 1953f105dc08..709047ae63e5 100644
--- a/tools/test/export.map
+++ b/tools/test/export.map
@@ -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: export.map,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/tools/test/makefile.mk b/tools/test/makefile.mk
index 22796f47d72f..5dea8ce6f960 100644
--- a/tools/test/makefile.mk
+++ b/tools/test/makefile.mk
@@ -1,15 +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: makefile.mk,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/tools/test/tests.cxx b/tools/test/tests.cxx
index a2bfb63d4c5f..5a1e21f172a4 100644
--- a/tools/test/tests.cxx
+++ b/tools/test/tests.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: tests.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/tools/unx/source/dll/makefile.mk b/tools/unx/source/dll/makefile.mk
index 7685c55232a8..da1d73f04682 100644
--- a/tools/unx/source/dll/makefile.mk
+++ b/tools/unx/source/dll/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/unx/source/dll/toolsdll.cxx b/tools/unx/source/dll/toolsdll.cxx
index 0c724a9fd390..71b01e20bd4f 100644
--- a/tools/unx/source/dll/toolsdll.cxx
+++ b/tools/unx/source/dll/toolsdll.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: toolsdll.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/tools/util/makefile.mk b/tools/util/makefile.mk
index d9ba720543e3..1574addcf59c 100644
--- a/tools/util/makefile.mk
+++ b/tools/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.27 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/util/makefile.pmk b/tools/util/makefile.pmk
index 09d9908a5049..9d8fc0d3ad24 100644
--- a/tools/util/makefile.pmk
+++ b/tools/util/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: makefile.pmk,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/tools/win/inc/dll.hxx b/tools/win/inc/dll.hxx
index e70cdf8601a5..2a91aefc0fa9 100644
--- a/tools/win/inc/dll.hxx
+++ b/tools/win/inc/dll.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: dll.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/tools/win/inc/parser.hxx b/tools/win/inc/parser.hxx
index ff80593312bd..08b0d7968d54 100644
--- a/tools/win/inc/parser.hxx
+++ b/tools/win/inc/parser.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: parser.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/tools/win/inc/shellex.h b/tools/win/inc/shellex.h
index be4a86452abb..f81502a3382b 100644
--- a/tools/win/inc/shellex.h
+++ b/tools/win/inc/shellex.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: shellex.h,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/tools/win/inc/shutil.h b/tools/win/inc/shutil.h
index aa96b5096786..1daae442292d 100644
--- a/tools/win/inc/shutil.h
+++ b/tools/win/inc/shutil.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: shutil.h,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/tools/win/inc/toolsdll.hxx b/tools/win/inc/toolsdll.hxx
index b405e7416d3a..a6b1546763bc 100644
--- a/tools/win/inc/toolsdll.hxx
+++ b/tools/win/inc/toolsdll.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: toolsdll.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/tools/win/inc/winshell.hxx b/tools/win/inc/winshell.hxx
index 3f9ba623d8ff..a8be1e7d1344 100644
--- a/tools/win/inc/winshell.hxx
+++ b/tools/win/inc/winshell.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: winshell.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/tools/win/source/dll/makefile.mk b/tools/win/source/dll/makefile.mk
index c37bbdbe27e4..403da065d653 100644
--- a/tools/win/source/dll/makefile.mk
+++ b/tools/win/source/dll/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/tools/win/source/dll/toolsdll.cxx b/tools/win/source/dll/toolsdll.cxx
index e7d9ac1f8501..8fc9888021bb 100644
--- a/tools/win/source/dll/toolsdll.cxx
+++ b/tools/win/source/dll/toolsdll.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: toolsdll.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/tools/win/source/fastfsys/makefile.mk b/tools/win/source/fastfsys/makefile.mk
index c1f76980fd90..12df85d6a2f3 100644
--- a/tools/win/source/fastfsys/makefile.mk
+++ b/tools/win/source/fastfsys/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/workben/fstest.cxx b/tools/workben/fstest.cxx
index 54d183acfe27..8048f2c166b0 100644
--- a/tools/workben/fstest.cxx
+++ b/tools/workben/fstest.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: fstest.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/tools/workben/hashtbl.cxx b/tools/workben/hashtbl.cxx
index 888821719e19..bcd9f903ab64 100644
--- a/tools/workben/hashtbl.cxx
+++ b/tools/workben/hashtbl.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: hashtbl.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/tools/workben/hashtbl.hxx b/tools/workben/hashtbl.hxx
index 3a666440fa5a..f4593b8148cf 100644
--- a/tools/workben/hashtbl.hxx
+++ b/tools/workben/hashtbl.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: hashtbl.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/tools/workben/helloworld.c b/tools/workben/helloworld.c
index 458281a7b613..5d86cf2db21b 100644
--- a/tools/workben/helloworld.c
+++ b/tools/workben/helloworld.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: helloworld.c,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/tools/workben/inetmimetest.cxx b/tools/workben/inetmimetest.cxx
index 0ab0a290f986..e380fb7f6fbe 100644
--- a/tools/workben/inetmimetest.cxx
+++ b/tools/workben/inetmimetest.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: inetmimetest.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/tools/workben/makefile.mk b/tools/workben/makefile.mk
index 35a1f6d12f77..73d5753fe233 100644
--- a/tools/workben/makefile.mk
+++ b/tools/workben/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/tools/workben/solar.c b/tools/workben/solar.c
index 05e9c103b8b4..06c4a787ec72 100644
--- a/tools/workben/solar.c
+++ b/tools/workben/solar.c
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: solar.c,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/tools/workben/tldem.cxx b/tools/workben/tldem.cxx
index 0f2e695a72ba..9571d3ff9b94 100644
--- a/tools/workben/tldem.cxx
+++ b/tools/workben/tldem.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: tldem.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/tools/workben/urltest.cxx b/tools/workben/urltest.cxx
index a232f8ebdd93..694698297680 100644
--- a/tools/workben/urltest.cxx
+++ b/tools/workben/urltest.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: urltest.cxx,v $
- * $Revision: 1.39 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1629,6 +1626,20 @@ main()
             rtl::OUString(urlobj.GetMainURL(INetURLObject::NO_DECODE)));
     }
 
+    if (true) { // #i53184#
+        rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("file://comp_name/path"));
+        bSuccess &= assertEqual(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("#i53184# smart INET_PROT_FILE")),
+            INetURLObject(url, INET_PROT_FILE).GetMainURL(
+                INetURLObject::NO_DECODE),
+            url);
+        bSuccess &= assertEqual(
+            rtl::OUString(
+                RTL_CONSTASCII_USTRINGPARAM("#i53184# strict")),
+            INetURLObject(url).GetMainURL(INetURLObject::NO_DECODE), url);
+    }
+
     if (true) {
         rtl::OUString path;
         path = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/a/b/c"));
diff --git a/transex3/inc/makefile.mk b/transex3/inc/makefile.mk
deleted file mode 100644
index 00caed43733a..000000000000
--- a/transex3/inc/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: makefile.mk,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.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=transex3
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-.IF "$(ENABLE_PCH)"!=""
-ALLTAR : \
-    $(SLO)$/precompiled.pch \
-    $(SLO)$/precompiled_ex.pch
-    
-.ENDIF			# "$(ENABLE_PCH)"!=""
-
diff --git a/transex3/inc/pch/precompiled_transex3.cxx b/transex3/inc/pch/precompiled_transex3.cxx
deleted file mode 100644
index 5b69c9f2f204..000000000000
--- a/transex3/inc/pch/precompiled_transex3.cxx
+++ /dev/null
@@ -1,32 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: precompiled_transex3.cxx,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.
- *
- ************************************************************************/
-
-#include "precompiled_transex3.hxx"
-
diff --git a/transex3/prj/build.lst b/transex3/prj/build.lst
deleted file mode 100644
index 0017471af134..000000000000
--- a/transex3/prj/build.lst
+++ /dev/null
@@ -1,10 +0,0 @@
-tr	transex3	:	tools libxslt berkeleydb LUCENE:lucene NULL
-tr	transex3						usr1	-	all	tr_mkout NULL
-tr	transex3\inc					nmake	-	all	tr_inc NULL
-tr	transex3\source					nmake	-	all	tr_src tr_inc NULL
-tr	transex3\layout					nmake	-	all	rt_layout tr_src tr_inc NULL
-tr	transex3\java\l10nconv			nmake	-	all	tr_conv NULL
-tr	transex3\java\receditor			nmake	-	all	tr_rece NULL
-tr  transex3\source\help    nmake   -   all tr_bla_help  NULL
-tr  transex3\source\filter\utils    nmake   -   all tr_bla_utils NULL
-tr  transex3\source\filter\merge    nmake   -   all tr_bla_merge tr_bla_utils NULL
diff --git a/ucbhelper/inc/makefile.mk b/ucbhelper/inc/makefile.mk
index 8cbc2fe60678..c49fd40ec0e4 100644
--- a/ucbhelper/inc/makefile.mk
+++ b/ucbhelper/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucbhelper/inc/pch/precompiled_ucbhelper.cxx b/ucbhelper/inc/pch/precompiled_ucbhelper.cxx
index 77ad420e3821..2c78a928b111 100644
--- a/ucbhelper/inc/pch/precompiled_ucbhelper.cxx
+++ b/ucbhelper/inc/pch/precompiled_ucbhelper.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: precompiled_ucbhelper.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/ucbhelper/inc/pch/precompiled_ucbhelper.hxx b/ucbhelper/inc/pch/precompiled_ucbhelper.hxx
index 0b9b1340ae12..6ce32849d6ff 100644
--- a/ucbhelper/inc/pch/precompiled_ucbhelper.hxx
+++ b/ucbhelper/inc/pch/precompiled_ucbhelper.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_ucbhelper.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/ucbhelper/inc/ucbhelper/activedatasink.hxx b/ucbhelper/inc/ucbhelper/activedatasink.hxx
index 3ca863ae79e4..f7cb0582fa56 100644
--- a/ucbhelper/inc/ucbhelper/activedatasink.hxx
+++ b/ucbhelper/inc/ucbhelper/activedatasink.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: activedatasink.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/ucbhelper/inc/ucbhelper/activedatastreamer.hxx b/ucbhelper/inc/ucbhelper/activedatastreamer.hxx
index f1d823199de4..996f52c3884e 100644
--- a/ucbhelper/inc/ucbhelper/activedatastreamer.hxx
+++ b/ucbhelper/inc/ucbhelper/activedatastreamer.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: activedatastreamer.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/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx b/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
index 89dca8edd4d7..a23c6fc6b0fe 100644
--- a/ucbhelper/inc/ucbhelper/cancelcommandexecution.hxx
+++ b/ucbhelper/inc/ucbhelper/cancelcommandexecution.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: cancelcommandexecution.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/ucbhelper/inc/ucbhelper/commandenvironment.hxx b/ucbhelper/inc/ucbhelper/commandenvironment.hxx
index e5ebc300bca1..ddcdd5712901 100644
--- a/ucbhelper/inc/ucbhelper/commandenvironment.hxx
+++ b/ucbhelper/inc/ucbhelper/commandenvironment.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: commandenvironment.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/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
index d0839805817c..00724ceb4b46 100644
--- a/ucbhelper/inc/ucbhelper/commandenvironmentproxy.hxx
+++ b/ucbhelper/inc/ucbhelper/commandenvironmentproxy.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: commandenvironmentproxy.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/ucbhelper/inc/ucbhelper/configurationkeys.hxx b/ucbhelper/inc/ucbhelper/configurationkeys.hxx
index 3415146003b9..ca928b8b52bf 100644
--- a/ucbhelper/inc/ucbhelper/configurationkeys.hxx
+++ b/ucbhelper/inc/ucbhelper/configurationkeys.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: configurationkeys.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/ucbhelper/inc/ucbhelper/configureucb.hxx b/ucbhelper/inc/ucbhelper/configureucb.hxx
index 479130c0624f..2e70467a4e9f 100644
--- a/ucbhelper/inc/ucbhelper/configureucb.hxx
+++ b/ucbhelper/inc/ucbhelper/configureucb.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: configureucb.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/ucbhelper/inc/ucbhelper/content.hxx b/ucbhelper/inc/ucbhelper/content.hxx
index 03cfa0bc8290..0a20592fe82a 100644
--- a/ucbhelper/inc/ucbhelper/content.hxx
+++ b/ucbhelper/inc/ucbhelper/content.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: content.hxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,6 +57,7 @@ namespace com { namespace sun { namespace star { namespace ucb {
     class XContentIdentifier;
     class XDynamicResultSet;
     class XAnyCompareFactory;
+    struct ContentInfo;
     struct NumberedSortingInfo;
 } } } }
 
@@ -70,7 +68,7 @@ namespace ucbhelper
 
 /**
   * These are the possible values for the parameter eMode of method
-  * ucb::Content::createCursor.
+  * ucbhelper::Content::createCursor.
   */
 enum ResultSetInclude
 {
@@ -81,7 +79,7 @@ enum ResultSetInclude
 
 /**
   * These are the possible values for the parameter eOperation of method
-  * ucb::Content::insertNewContent.
+  * ucbhelper::Content::insertNewContent.
   */
 enum InsertOperation
 {
@@ -106,14 +104,14 @@ class UCBHELPER_DLLPUBLIC Content
 protected:
     ::com::sun::star::uno::Any createCursorAny( const ::com::sun::star::uno::Sequence<
                                                 rtl::OUString >& rPropertyNames,
-                                                  ResultSetInclude eMode )
+                                                ResultSetInclude eMode )
             throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
 
     ::com::sun::star::uno::Any createCursorAny( const ::com::sun::star::uno::Sequence<
                                                 sal_Int32 >& rPropertyHandles,
-                                                  ResultSetInclude eMode )
+                                                ResultSetInclude eMode )
             throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -148,7 +146,7 @@ public:
       *        errors.
       */
     Content( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::ucb::XContentIdentifier >& rId,
+                    ::com::sun::star::ucb::XContentIdentifier >& rId,
              const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv )
         throw ( ::com::sun::star::ucb::ContentCreationException,
@@ -163,7 +161,7 @@ public:
       *        errors.
       */
     Content( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::ucb::XContent >& rContent,
+                    ::com::sun::star::ucb::XContent >& rContent,
              const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv )
         throw ( ::com::sun::star::ucb::ContentCreationException,
@@ -221,7 +219,7 @@ public:
       */
     static sal_Bool
     create( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::ucb::XContentIdentifier >& rId,
+                    ::com::sun::star::ucb::XContentIdentifier >& rId,
             const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
             Content& rContent );
@@ -241,7 +239,7 @@ public:
       */
     static sal_Bool
     create( const ::com::sun::star::uno::Reference<
-                     ::com::sun::star::ucb::XContent >& xContent,
+                    ::com::sun::star::ucb::XContent >& xContent,
             const ::com::sun::star::uno::Reference<
                     ::com::sun::star::ucb::XCommandEnvironment >& rEnv,
             Content& rContent );
@@ -501,7 +499,7 @@ public:
     setPropertyValues( const ::com::sun::star::uno::Sequence<
                                 rtl::OUString >& rPropertyNames,
                        const ::com::sun::star::uno::Sequence<
-                                   ::com::sun::star::uno::Any >& rValues )
+                                    ::com::sun::star::uno::Any >& rValues )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -539,7 +537,7 @@ public:
     setPropertyValues( const ::com::sun::star::uno::Sequence<
                                 sal_Int32 >& nPropertyHandles,
                        const ::com::sun::star::uno::Sequence<
-                                   ::com::sun::star::uno::Any >& rValues )
+                                    ::com::sun::star::uno::Any >& rValues )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -655,8 +653,8 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet >
     createDynamicCursor( const ::com::sun::star::uno::Sequence<
                          rtl::OUString >& rPropertyNames,
-                           ResultSetInclude eMode
-                             = INCLUDE_FOLDERS_AND_DOCUMENTS )
+                         ResultSetInclude eMode
+                            = INCLUDE_FOLDERS_AND_DOCUMENTS )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -678,8 +676,8 @@ public:
     ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XDynamicResultSet >
     createDynamicCursor( const ::com::sun::star::uno::Sequence<
                          sal_Int32 >& rPropertyHandles,
-                           ResultSetInclude eMode
-                             = INCLUDE_FOLDERS_AND_DOCUMENTS )
+                         ResultSetInclude eMode
+                            = INCLUDE_FOLDERS_AND_DOCUMENTS )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
@@ -821,16 +819,31 @@ public:
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
                ::com::sun::star::uno::Exception );
+
+    /**
+      * This method returns the different types of contents this content
+      * can create.
+      *
+      * @return the content types or an empty sequence if no contents can be
+      *         created by this content.
+      */
+    ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::ContentInfo >
+    queryCreatableContentsInfo()
+        throw( ::com::sun::star::ucb::CommandAbortedException,
+               ::com::sun::star::uno::RuntimeException,
+               ::com::sun::star::uno::Exception );
+
     /**
       * This method creates, initializes and inserts ( commits ) a new content
       * (i.e. it could be used to create a new file system folder).
-      * Internally this method does a XContentCreator::createNewContent(...)-
-      * XCommandProcessor::execute( "setPropertyValues", ... )-
-      * XCommandProcessor::execute( "insert", ... ) calling sequence.
+      * Internally this method does a
+      * XCommandProcessor::execute( "createNewContent", ... );
+      * XCommandProcessor::execute( "setPropertyValues", ... );
+      * XCommandProcessor::execute( "insert", ... ); calling sequence.
       *
       * @param rContentType is the type for the new UCB content. Each content
-      *        provider implementation may introduce own types for its contnt
-      *        objects.
+      *        provider implementation may introduce own types for its content
+      *        objects (See queryCreatableContentsInfo()).
       * @param rPropertyNames is a sequence of names of properties for that
       *        values are to set at the new content before it will be inserted
       *        ( commited ).
@@ -846,9 +859,9 @@ public:
     sal_Bool
     insertNewContent( const ::rtl::OUString& rContentType,
                       const ::com::sun::star::uno::Sequence<
-                          rtl::OUString >& rPropertyNames,
+                        rtl::OUString >& rPropertyNames,
                       const ::com::sun::star::uno::Sequence<
-                          ::com::sun::star::uno::Any >& rPropertyValues,
+                        ::com::sun::star::uno::Any >& rPropertyValues,
                       Content& rNewContent )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
@@ -856,13 +869,14 @@ public:
     /**
       * This method creates, initializes and inserts ( commits ) a new content
       * (i.e. it could be used to create a new file system folder).
-      * Internally this method does a XContentCreator::createNewContent(...)-
-      * XCommandProcessor::execute( "setPropertyValues", ... )-
-      * XCommandProcessor::execute( "insert", ... ) calling sequence.
+      * Internally this method does a
+      * XCommandProcessor::execute( "createNewContent", ... );
+      * XCommandProcessor::execute( "setPropertyValues", ... );
+      * XCommandProcessor::execute( "insert", ... ); calling sequence.
       *
       * @param rContentType is the type for the new UCB content. Each content
-      *        provider implementation may introduce own types for its contnt
-      *        objects.
+      *        provider implementation may introduce own types for its content
+      *        objects (See queryCreatableContentsInfo()).
       * @param nPropertyHandes is a sequence of handles of properties for that
       *        values are to set at the new content before it will be inserted
       *        ( commited ).
@@ -880,7 +894,7 @@ public:
                       const ::com::sun::star::uno::Sequence<
                         sal_Int32 >& nPropertyHandles,
                       const ::com::sun::star::uno::Sequence<
-                          ::com::sun::star::uno::Any >& rPropertyValues,
+                        ::com::sun::star::uno::Any >& rPropertyValues,
                       Content& rNewContent )
         throw( ::com::sun::star::ucb::CommandAbortedException,
                ::com::sun::star::uno::RuntimeException,
@@ -888,14 +902,15 @@ public:
     /**
       * This method creates, initializes and inserts (commits) a new content
       * inside this (the target folder) content. For example, it can be used to
-      * create a new file system folder.
-      * Internally this method does a XContentCreator::createNewContent(...)-
-      * XCommandProcessor::execute( "setPropertyValues", ... )-
-      * XCommandProcessor::execute( "insert", ... ) calling sequence.
+      * create a new file system file.
+      * Internally this method does a
+      * XCommandProcessor::execute( "createNewContent", ... );
+      * XCommandProcessor::execute( "setPropertyValues", ... );
+      * XCommandProcessor::execute( "insert", ... ); calling sequence.
       *
       * @param rContentType is the type for the new UCB content. Each content
-      *        provider implementation may introduce own types for its contnt
-      *        objects.
+      *        provider implementation may introduce own types for its content
+      *        objects (See queryCreatableContentsInfo()).
       * @param rPropertyNames is a sequence of names of properties for that
       *        values are to set at the new content before it will be inserted
       *        ( commited ).
@@ -913,9 +928,9 @@ public:
     sal_Bool
     insertNewContent( const ::rtl::OUString& rContentType,
                       const ::com::sun::star::uno::Sequence<
-                          rtl::OUString >& rPropertyNames,
+                        rtl::OUString >& rPropertyNames,
                       const ::com::sun::star::uno::Sequence<
-                          ::com::sun::star::uno::Any >& rPropertyValues,
+                        ::com::sun::star::uno::Any >& rPropertyValues,
                       const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::io::XInputStream >& rStream,
                       Content& rNewContent )
@@ -925,14 +940,15 @@ public:
     /**
       * This method creates, initializes and inserts (commits) a new content
       * inside this (the target folder) content. For example, it can be used to
-      * create a new file system folder.
-      * Internally this method does a XContentCreator::createNewContent(...)-
-      * XCommandProcessor::execute( "setPropertyValues", ... )-
-      * XCommandProcessor::execute( "insert", ... ) calling sequence.
+      * create a new file system file.
+      * Internally this method does a
+      * XCommandProcessor::execute( "createNewContent", ... );
+      * XCommandProcessor::execute( "setPropertyValues", ... );
+      * XCommandProcessor::execute( "insert", ... ); calling sequence.
       *
       * @param rContentType is the type for the new UCB content. Each content
-      *        provider implementation may introduce own types for its contnt
-      *        objects.
+      *        provider implementation may introduce own types for its content
+      *        objects (See queryCreatableContentsInfo()).
       * @param nPropertyHandes is a sequence of handles of properties for that
       *        values are to set at the new content before it will be inserted
       *        ( commited ).
@@ -952,7 +968,7 @@ public:
                       const ::com::sun::star::uno::Sequence<
                         sal_Int32 >& nPropertyHandles,
                       const ::com::sun::star::uno::Sequence<
-                          ::com::sun::star::uno::Any >& rPropertyValues,
+                        ::com::sun::star::uno::Any >& rPropertyValues,
                       const ::com::sun::star::uno::Reference<
                                 ::com::sun::star::io::XInputStream >& rStream,
                       Content& rNewContent )
diff --git a/ucbhelper/inc/ucbhelper/contentbroker.hxx b/ucbhelper/inc/ucbhelper/contentbroker.hxx
index f119e9c61284..eea72cc689e0 100644
--- a/ucbhelper/inc/ucbhelper/contentbroker.hxx
+++ b/ucbhelper/inc/ucbhelper/contentbroker.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: contentbroker.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/ucbhelper/inc/ucbhelper/contenthelper.hxx b/ucbhelper/inc/ucbhelper/contenthelper.hxx
index cc29676efde0..7950f9b84053 100644
--- a/ucbhelper/inc/ucbhelper/contenthelper.hxx
+++ b/ucbhelper/inc/ucbhelper/contenthelper.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: contenthelper.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/ucbhelper/inc/ucbhelper/contentidentifier.hxx b/ucbhelper/inc/ucbhelper/contentidentifier.hxx
index 8c7a3efe3e67..2bd1cca50e36 100644
--- a/ucbhelper/inc/ucbhelper/contentidentifier.hxx
+++ b/ucbhelper/inc/ucbhelper/contentidentifier.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: contentidentifier.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/ucbhelper/inc/ucbhelper/contentinfo.hxx b/ucbhelper/inc/ucbhelper/contentinfo.hxx
index 46e575dd8f31..1584645771c7 100644
--- a/ucbhelper/inc/ucbhelper/contentinfo.hxx
+++ b/ucbhelper/inc/ucbhelper/contentinfo.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: contentinfo.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/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx b/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
index 9b1bf4b7706f..15db85760619 100644
--- a/ucbhelper/inc/ucbhelper/fileidentifierconverter.hxx
+++ b/ucbhelper/inc/ucbhelper/fileidentifierconverter.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: fileidentifierconverter.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/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx
index 4e50eb0051c7..9ce8122efc3f 100644
--- a/ucbhelper/inc/ucbhelper/handleinteractionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/handleinteractionrequest.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: handleinteractionrequest.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/ucbhelper/inc/ucbhelper/interactionrequest.hxx b/ucbhelper/inc/ucbhelper/interactionrequest.hxx
index f23041d0caa2..197abb36ea34 100644
--- a/ucbhelper/inc/ucbhelper/interactionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/interactionrequest.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: interactionrequest.hxx,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/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx b/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
index 1a81525f66f2..23ed0fb4d60b 100644
--- a/ucbhelper/inc/ucbhelper/interceptedinteraction.hxx
+++ b/ucbhelper/inc/ucbhelper/interceptedinteraction.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: interceptedinteraction.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/ucbhelper/inc/ucbhelper/macros.hxx b/ucbhelper/inc/ucbhelper/macros.hxx
index daadcef6e8da..f32f1130c216 100644
--- a/ucbhelper/inc/ucbhelper/macros.hxx
+++ b/ucbhelper/inc/ucbhelper/macros.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: macros.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/ucbhelper/inc/ucbhelper/propertyvalueset.hxx b/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
index 910e35aa4810..ed02a80f571f 100644
--- a/ucbhelper/inc/ucbhelper/propertyvalueset.hxx
+++ b/ucbhelper/inc/ucbhelper/propertyvalueset.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: propertyvalueset.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/ucbhelper/inc/ucbhelper/providerhelper.hxx b/ucbhelper/inc/ucbhelper/providerhelper.hxx
index fcc43a3762f1..2c9c89294fc8 100644
--- a/ucbhelper/inc/ucbhelper/providerhelper.hxx
+++ b/ucbhelper/inc/ucbhelper/providerhelper.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: providerhelper.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/ucbhelper/inc/ucbhelper/proxydecider.hxx b/ucbhelper/inc/ucbhelper/proxydecider.hxx
index 219b3aa5870f..861a33bbf5e4 100644
--- a/ucbhelper/inc/ucbhelper/proxydecider.hxx
+++ b/ucbhelper/inc/ucbhelper/proxydecider.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: proxydecider.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/ucbhelper/inc/ucbhelper/resultset.hxx b/ucbhelper/inc/ucbhelper/resultset.hxx
index 8ab560245b58..4835ea9f1eb0 100644
--- a/ucbhelper/inc/ucbhelper/resultset.hxx
+++ b/ucbhelper/inc/ucbhelper/resultset.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: resultset.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/ucbhelper/inc/ucbhelper/resultsethelper.hxx b/ucbhelper/inc/ucbhelper/resultsethelper.hxx
index b8ac262c5b8f..b0c54a2779c2 100644
--- a/ucbhelper/inc/ucbhelper/resultsethelper.hxx
+++ b/ucbhelper/inc/ucbhelper/resultsethelper.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: resultsethelper.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/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx b/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
index ba7f0e992bf8..cc1e4b550e19 100644
--- a/ucbhelper/inc/ucbhelper/resultsetmetadata.hxx
+++ b/ucbhelper/inc/ucbhelper/resultsetmetadata.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: resultsetmetadata.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/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
index 13061ca0238f..87fcb1b55dd7 100644
--- a/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleauthenticationrequest.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: simpleauthenticationrequest.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/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
index be53bb9fd7ba..213f504c7f61 100755
--- a/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplecertificatevalidationrequest.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: simplecertificatevalidationrequest.hxx,v $
- * $Revision: 1.3.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
index a7dfb86f33da..9bb1d0bff119 100644
--- a/ucbhelper/inc/ucbhelper/simpleinteractionrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleinteractionrequest.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: simpleinteractionrequest.hxx,v $
- * $Revision: 1.4.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
index cce5a5e113bd..44987fadd0aa 100644
--- a/ucbhelper/inc/ucbhelper/simpleioerrorrequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simpleioerrorrequest.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: simpleioerrorrequest.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/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
index 96e0fa2ff004..7f3da27ece7c 100644
--- a/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.hxx
+++ b/ucbhelper/inc/ucbhelper/simplenameclashresolverequest.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: simplenameclashresolverequest.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/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h b/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h
index 6abc4c118d7e..edb8c0ee350e 100644
--- a/ucbhelper/inc/ucbhelper/ucbhelperdllapi.h
+++ b/ucbhelper/inc/ucbhelper/ucbhelperdllapi.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: ucbhelperdllapi.h,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/ucbhelper/source/client/activedatasink.cxx b/ucbhelper/source/client/activedatasink.cxx
index 301e28f3657f..029fb60e616f 100644
--- a/ucbhelper/source/client/activedatasink.cxx
+++ b/ucbhelper/source/client/activedatasink.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: activedatasink.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/ucbhelper/source/client/activedatastreamer.cxx b/ucbhelper/source/client/activedatastreamer.cxx
index 9ede3931d0d4..5f26334ab376 100644
--- a/ucbhelper/source/client/activedatastreamer.cxx
+++ b/ucbhelper/source/client/activedatastreamer.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: activedatastreamer.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/ucbhelper/source/client/commandenvironment.cxx b/ucbhelper/source/client/commandenvironment.cxx
index 01745869a9f2..75a137faeb5b 100644
--- a/ucbhelper/source/client/commandenvironment.cxx
+++ b/ucbhelper/source/client/commandenvironment.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: commandenvironment.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/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx
index c82a0bc19b77..451c629694c6 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.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: content.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,9 +70,7 @@
 #include <ucbhelper/contentbroker.hxx>
 #include <ucbhelper/activedatasink.hxx>
 #include <ucbhelper/activedatastreamer.hxx>
-#ifndef _UCBHELPER_INTERACTIONREQUEST_HXX
 #include <ucbhelper/interactionrequest.hxx>
-#endif
 #include <ucbhelper/cancelcommandexecution.hxx>
 
 using namespace com::sun::star::container;
@@ -149,7 +144,7 @@ void EmptyInputStream::closeInput()
 //=========================================================================
 
 class ContentEventListener_Impl : public cppu::OWeakObject,
-                                     public XContentEventListener
+                                      public XContentEventListener
 {
     Content_Impl& m_rContent;
 
@@ -157,7 +152,7 @@ public:
     ContentEventListener_Impl( Content_Impl& rContent )
     : m_rContent( rContent ) {}
 
-     // XInterface
+    // XInterface
     XINTERFACE_DECL()
 
     // XContentEventListener
@@ -184,8 +179,8 @@ friend class ContentEventListener_Impl;
     mutable rtl::OUString               m_aURL;
     Reference< XMultiServiceFactory >   m_xSMgr;
     Reference< XContent >               m_xContent;
-    Reference< XCommandProcessor >      m_xCommandProcessor;
-      Reference< XCommandEnvironment >      m_xEnv;
+    Reference< XCommandProcessor >          m_xCommandProcessor;
+    Reference< XCommandEnvironment >    m_xEnv;
     Reference< XContentEventListener >  m_xContentEventListener;
     mutable osl::Mutex                  m_aMutex;
     sal_Int32                           m_nCommandId;
@@ -210,6 +205,7 @@ public:
 
     Any  executeCommand( const Command& rCommand );
     void abortCommand();
+
     inline const Reference< XCommandEnvironment >& getEnvironment() const;
     inline void setEnvironment(
                         const Reference< XCommandEnvironment >& xNewEnv );
@@ -587,7 +583,7 @@ Any Content::getPropertyValue( sal_Int32 nPropertyHandle )
 
 //=========================================================================
 Any Content::setPropertyValue( const rtl::OUString& rName,
-                                  const Any& rValue )
+                                const Any& rValue )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Sequence< rtl::OUString > aNames( 1 );
@@ -602,7 +598,7 @@ Any Content::setPropertyValue( const rtl::OUString& rName,
 
 //=========================================================================
 Any Content::setPropertyValue( const sal_Int32 nPropertyHandle,
-                                  const Any& rValue )
+                                const Any& rValue )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     Sequence< sal_Int32 > aHandles( 1 );
@@ -674,8 +670,8 @@ Reference< XRow > Content::getPropertyValuesInterface(
 
         rProp.Name       = pNames[ n ];
         rProp.Handle     = -1; // n/a
-//      rProp.Type       =
-//      rProp.Attributes = ;
+//        rProp.Type       =
+//        rProp.Attributes = ;
     }
 
     Command aCommand;
@@ -707,8 +703,8 @@ Reference< XRow > Content::getPropertyValuesInterface(
 
         rProp.Name       = rtl::OUString(); // n/a
         rProp.Handle     = pHandles[ n ];
-//      rProp.Type       =
-//      rProp.Attributes = ;
+//        rProp.Type       =
+//        rProp.Attributes = ;
     }
 
     Command aCommand;
@@ -726,7 +722,7 @@ Reference< XRow > Content::getPropertyValuesInterface(
 //=========================================================================
 Sequence< Any > Content::setPropertyValues(
                             const Sequence< rtl::OUString >& rPropertyNames,
-                               const Sequence< Any >& rValues )
+                                const Sequence< Any >& rValues )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( rPropertyNames.getLength() != rValues.getLength() )
@@ -756,7 +752,7 @@ Sequence< Any > Content::setPropertyValues(
         rProp.Name   = pNames[ n ];
         rProp.Handle = -1; // n/a
         rProp.Value  = pValues[ n ];
-//      rProp.State  = ;
+//        rProp.State  = ;
     }
 
     Command aCommand;
@@ -774,7 +770,7 @@ Sequence< Any > Content::setPropertyValues(
 //=========================================================================
 Sequence< Any > Content::setPropertyValues(
                             const Sequence< sal_Int32 >& nPropertyHandles,
-                               const Sequence< Any >& rValues )
+                                const Sequence< Any >& rValues )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( nPropertyHandles.getLength() != rValues.getLength() )
@@ -804,7 +800,7 @@ Sequence< Any > Content::setPropertyValues(
         rProp.Name   = rtl::OUString(); // n/a
         rProp.Handle = pHandles[ n ];
         rProp.Value  = pValues[ n ];
-//      rProp.State  = ;
+//        rProp.State  = ;
     }
 
     Command aCommand;
@@ -934,7 +930,7 @@ Reference< XResultSet > Content::createCursor(
 
     OSL_ENSURE( aResult.is(), "Content::createCursor - no cursor!" );
 
-     if ( !aResult.is() )
+    if ( !aResult.is() )
     {
         // Former, the open command directly returned a XResultSet.
         aCursorAny >>= aResult;
@@ -964,7 +960,7 @@ Reference< XResultSet > Content::createCursor(
 
     OSL_ENSURE( aResult.is(), "Content::createCursor - no cursor!" );
 
-     if ( !aResult.is() )
+    if ( !aResult.is() )
     {
         // Former, the open command directly returned a XResultSet.
         aCursorAny >>= aResult;
@@ -1008,7 +1004,7 @@ Reference< XDynamicResultSet > Content::createDynamicCursor(
 //=========================================================================
 Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
                             const Sequence< rtl::OUString >& rPropertyNames,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
+                            const Sequence< NumberedSortingInfo >& rSortInfo,
                             Reference< XAnyCompareFactory > rAnyCompareFactory,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -1043,7 +1039,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
 //=========================================================================
 Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
                             const Sequence< sal_Int32 >& rPropertyHandles,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
+                            const Sequence< NumberedSortingInfo >& rSortInfo,
                             Reference< XAnyCompareFactory > rAnyCompareFactory,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -1078,7 +1074,7 @@ Reference< XDynamicResultSet > Content::createSortedDynamicCursor(
 //=========================================================================
 Reference< XResultSet > Content::createSortedCursor(
                             const Sequence< rtl::OUString >& rPropertyNames,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
+                            const Sequence< NumberedSortingInfo >& rSortInfo,
                             Reference< XAnyCompareFactory > rAnyCompareFactory,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -1132,7 +1128,7 @@ Reference< XResultSet > Content::createSortedCursor(
 //=========================================================================
 Reference< XResultSet > Content::createSortedCursor(
                             const Sequence< sal_Int32 >& rPropertyHandles,
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::ucb::NumberedSortingInfo >& rSortInfo,
+                            const Sequence< NumberedSortingInfo >& rSortInfo,
                             Reference< XAnyCompareFactory > rAnyCompareFactory,
                             ResultSetInclude eMode )
     throw( CommandAbortedException, RuntimeException, Exception )
@@ -1331,7 +1327,7 @@ sal_Bool Content::openStream( const Reference< XOutputStream >& rStream )
 
 //=========================================================================
 void Content::writeStream( const Reference< XInputStream >& rStream,
-                            sal_Bool bReplaceExisting )
+                           sal_Bool bReplaceExisting )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     InsertCommandArgument aArg;
@@ -1349,11 +1345,31 @@ void Content::writeStream( const Reference< XInputStream >& rStream,
 }
 
 //=========================================================================
+Sequence< ContentInfo > Content::queryCreatableContentsInfo()
+    throw( CommandAbortedException, RuntimeException, Exception )
+{
+    // First, try it using "CreatableContentsInfo" property -> the "new" way.
+    Sequence< ContentInfo > aInfo;
+    if ( getPropertyValue(
+             rtl::OUString::createFromAscii( "CreatableContentsInfo" ) )
+         >>= aInfo )
+        return aInfo;
+
+    // Second, try it using XContentCreator interface -> the "old" way (not
+    // providing the chance to supply an XCommandEnvironment.
+    Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
+    if ( xCreator.is() )
+        aInfo = xCreator->queryCreatableContentsInfo();
+
+    return aInfo;
+}
+
+//=========================================================================
 sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     const Sequence< rtl::OUString >&
                                         rPropertyNames,
-                                      const Sequence< Any >& rPropertyValues,
-                                      Content& rNewContent )
+                                    const Sequence< Any >& rPropertyValues,
+                                    Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     return insertNewContent( rContentType,
@@ -1367,8 +1383,8 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     const Sequence< sal_Int32 >&
                                         nPropertyHandles,
-                                      const Sequence< Any >& rPropertyValues,
-                                      Content& rNewContent )
+                                    const Sequence< Any >& rPropertyValues,
+                                    Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     return insertNewContent( rContentType,
@@ -1382,29 +1398,51 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     const Sequence< rtl::OUString >&
                                         rPropertyNames,
-                                      const Sequence< Any >& rPropertyValues,
+                                    const Sequence< Any >& rPropertyValues,
                                     const Reference< XInputStream >& rData,
-                                      Content& rNewContent )
+                                    Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( rContentType.getLength() == 0 )
         return sal_False;
 
-    Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
-
-    OSL_ENSURE( xCreator.is(),
-                "Content::insertNewContent - Not a XContentCreator!" );
-
-    if ( !xCreator.is() )
-        return sal_False;
-
+    // First, try it using "createNewContent" command -> the "new" way.
     ContentInfo aInfo;
     aInfo.Type = rContentType;
     aInfo.Attributes = 0;
 
-    Reference< XContent > xNew = xCreator->createNewContent( aInfo );
+    Command aCommand;
+    aCommand.Name     = rtl::OUString::createFromAscii( "createNewContent" );
+    aCommand.Handle   = -1; // n/a
+    aCommand.Argument <<= aInfo;
+
+    Reference< XContent > xNew;
+    try
+    {
+        m_xImpl->executeCommand( aCommand ) >>= xNew;
+    }
+    catch ( RuntimeException const & )
+    {
+        throw;
+    }
+    catch ( Exception const & )
+    {
+    }
+
     if ( !xNew.is() )
-        return sal_False;
+    {
+        // Second, try it using XContentCreator interface -> the "old"
+        // way (not providing the chance to supply an XCommandEnvironment.
+        Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
+
+        if ( !xCreator.is() )
+            return sal_False;
+
+        xNew = xCreator->createNewContent( aInfo );
+
+        if ( !xNew.is() )
+            return sal_False;
+    }
 
     Content aNewContent( xNew, m_xImpl->getEnvironment() );
     aNewContent.setPropertyValues( rPropertyNames, rPropertyValues );
@@ -1423,29 +1461,51 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
                                     const Sequence< sal_Int32 >&
                                         nPropertyHandles,
-                                      const Sequence< Any >& rPropertyValues,
+                                    const Sequence< Any >& rPropertyValues,
                                     const Reference< XInputStream >& rData,
-                                      Content& rNewContent )
+                                    Content& rNewContent )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     if ( rContentType.getLength() == 0 )
         return sal_False;
 
-    Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
-
-    OSL_ENSURE( xCreator.is(),
-                "Content::insertNewContent - Not a XContentCreator!" );
-
-    if ( !xCreator.is() )
-        return sal_False;
-
+    // First, try it using "createNewContent" command -> the "new" way.
     ContentInfo aInfo;
     aInfo.Type = rContentType;
     aInfo.Attributes = 0;
 
-    Reference< XContent > xNew = xCreator->createNewContent( aInfo );
+    Command aCommand;
+    aCommand.Name     = rtl::OUString::createFromAscii( "createNewContent" );
+    aCommand.Handle   = -1; // n/a
+    aCommand.Argument <<= aInfo;
+
+    Reference< XContent > xNew;
+    try
+    {
+        m_xImpl->executeCommand( aCommand ) >>= xNew;
+    }
+    catch ( RuntimeException const & )
+    {
+        throw;
+    }
+    catch ( Exception const & )
+    {
+    }
+
     if ( !xNew.is() )
-        return sal_False;
+    {
+        // Second, try it using XContentCreator interface -> the "old"
+        // way (not providing the chance to supply an XCommandEnvironment.
+        Reference< XContentCreator > xCreator( m_xImpl->getContent(), UNO_QUERY );
+
+        if ( !xCreator.is() )
+            return sal_False;
+
+        xNew = xCreator->createNewContent( aInfo );
+
+        if ( !xNew.is() )
+            return sal_False;
+    }
 
     Content aNewContent( xNew, m_xImpl->getEnvironment() );
     aNewContent.setPropertyValues( nPropertyHandles, rPropertyValues );
@@ -1464,7 +1524,7 @@ sal_Bool Content::insertNewContent( const rtl::OUString& rContentType,
 sal_Bool Content::transferContent( const Content& rSourceContent,
                                    InsertOperation eOperation,
                                    const rtl::OUString & rTitle,
-                                     const sal_Int32 nNameClashAction )
+                                   const sal_Int32 nNameClashAction )
     throw( CommandAbortedException, RuntimeException, Exception )
 {
     ContentBroker* pBroker = ContentBroker::get();
@@ -1578,8 +1638,8 @@ sal_Bool Content::isDocument()
 //=========================================================================
 
 Content_Impl::Content_Impl( const Reference< XMultiServiceFactory >& rSMgr,
-                              const Reference< XContent >& rContent,
-                              const Reference< XCommandEnvironment >& rEnv )
+                            const Reference< XContent >& rContent,
+                            const Reference< XCommandEnvironment >& rEnv )
 : m_xSMgr( rSMgr ),
   m_xContent( rContent ),
   m_xEnv( rEnv ),
diff --git a/ucbhelper/source/client/contentbroker.cxx b/ucbhelper/source/client/contentbroker.cxx
index 43d1491d8507..7e0e7f3657ca 100644
--- a/ucbhelper/source/client/contentbroker.cxx
+++ b/ucbhelper/source/client/contentbroker.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: contentbroker.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/ucbhelper/source/client/fileidentifierconverter.cxx b/ucbhelper/source/client/fileidentifierconverter.cxx
index 6fc57607ac69..64bc428a9934 100644
--- a/ucbhelper/source/client/fileidentifierconverter.cxx
+++ b/ucbhelper/source/client/fileidentifierconverter.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: fileidentifierconverter.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/ucbhelper/source/client/interceptedinteraction.cxx b/ucbhelper/source/client/interceptedinteraction.cxx
index a328684e4692..a23206f615f3 100644
--- a/ucbhelper/source/client/interceptedinteraction.cxx
+++ b/ucbhelper/source/client/interceptedinteraction.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: interceptedinteraction.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/ucbhelper/source/client/makefile.mk b/ucbhelper/source/client/makefile.mk
index aa7858443778..b8a535ba429c 100644
--- a/ucbhelper/source/client/makefile.mk
+++ b/ucbhelper/source/client/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/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx
index 299eeb2ef9b6..8505472e1b1f 100644
--- a/ucbhelper/source/client/proxydecider.cxx
+++ b/ucbhelper/source/client/proxydecider.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: proxydecider.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/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx
index 35e9a5c2d5c0..8be75ee8aabd 100644
--- a/ucbhelper/source/provider/cancelcommandexecution.cxx
+++ b/ucbhelper/source/provider/cancelcommandexecution.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: cancelcommandexecution.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/ucbhelper/source/provider/commandenvironmentproxy.cxx b/ucbhelper/source/provider/commandenvironmentproxy.cxx
index bfa89c6c673c..33b8dd3fdfca 100644
--- a/ucbhelper/source/provider/commandenvironmentproxy.cxx
+++ b/ucbhelper/source/provider/commandenvironmentproxy.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: commandenvironmentproxy.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/ucbhelper/source/provider/configureucb.cxx b/ucbhelper/source/provider/configureucb.cxx
index 71a695953284..ee881c97ecbf 100644
--- a/ucbhelper/source/provider/configureucb.cxx
+++ b/ucbhelper/source/provider/configureucb.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: configureucb.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/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx
index 70e91a5be642..17b494e00437 100644
--- a/ucbhelper/source/provider/contenthelper.cxx
+++ b/ucbhelper/source/provider/contenthelper.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: contenthelper.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/ucbhelper/source/provider/contentidentifier.cxx b/ucbhelper/source/provider/contentidentifier.cxx
index b3aa2a2f81ae..7324c2cd5835 100644
--- a/ucbhelper/source/provider/contentidentifier.cxx
+++ b/ucbhelper/source/provider/contentidentifier.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: contentidentifier.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/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx
index 9aef5081550b..72dc633bd274 100644
--- a/ucbhelper/source/provider/contentinfo.cxx
+++ b/ucbhelper/source/provider/contentinfo.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: contentinfo.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/ucbhelper/source/provider/handleinteractionrequest.cxx b/ucbhelper/source/provider/handleinteractionrequest.cxx
index 2165e108d664..395a81c36fed 100644
--- a/ucbhelper/source/provider/handleinteractionrequest.cxx
+++ b/ucbhelper/source/provider/handleinteractionrequest.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: handleinteractionrequest.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/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx
index df91c47dc8fe..3704a0f1546c 100644
--- a/ucbhelper/source/provider/interactionrequest.cxx
+++ b/ucbhelper/source/provider/interactionrequest.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: interactionrequest.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/ucbhelper/source/provider/makefile.mk b/ucbhelper/source/provider/makefile.mk
index acb213ec201d..db06a5df131c 100644
--- a/ucbhelper/source/provider/makefile.mk
+++ b/ucbhelper/source/provider/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.21 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx
index 7ea542c5f4cd..5d9cfe31cf87 100644
--- a/ucbhelper/source/provider/propertyvalueset.cxx
+++ b/ucbhelper/source/provider/propertyvalueset.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: propertyvalueset.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/ucbhelper/source/provider/provconf.cxx b/ucbhelper/source/provider/provconf.cxx
index e2472a5d992b..df1917b45413 100644
--- a/ucbhelper/source/provider/provconf.cxx
+++ b/ucbhelper/source/provider/provconf.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: provconf.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/ucbhelper/source/provider/provconf.hxx b/ucbhelper/source/provider/provconf.hxx
index a881a88883f4..66d6a63d47b8 100644
--- a/ucbhelper/source/provider/provconf.hxx
+++ b/ucbhelper/source/provider/provconf.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: provconf.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/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx
index ebbf47e5a422..ac35df0e3420 100644
--- a/ucbhelper/source/provider/providerhelper.cxx
+++ b/ucbhelper/source/provider/providerhelper.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: providerhelper.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/ucbhelper/source/provider/registerucb.cxx b/ucbhelper/source/provider/registerucb.cxx
index 584aa21561e0..0a749c9ccb5c 100644
--- a/ucbhelper/source/provider/registerucb.cxx
+++ b/ucbhelper/source/provider/registerucb.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: registerucb.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/ucbhelper/source/provider/registerucb.hxx b/ucbhelper/source/provider/registerucb.hxx
index f345d774dcfd..f17321c76cd5 100644
--- a/ucbhelper/source/provider/registerucb.hxx
+++ b/ucbhelper/source/provider/registerucb.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: registerucb.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/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx
index 8b1a1d8b6d92..47825f15c6b1 100644
--- a/ucbhelper/source/provider/resultset.cxx
+++ b/ucbhelper/source/provider/resultset.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: resultset.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/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx
index 50ccc9ae86bd..a10f527b2ba9 100644
--- a/ucbhelper/source/provider/resultsethelper.cxx
+++ b/ucbhelper/source/provider/resultsethelper.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: resultsethelper.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/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx
index c9a6cf8b25e2..30ba735943bc 100644
--- a/ucbhelper/source/provider/resultsetmetadata.cxx
+++ b/ucbhelper/source/provider/resultsetmetadata.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: resultsetmetadata.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/ucbhelper/source/provider/simpleauthenticationrequest.cxx b/ucbhelper/source/provider/simpleauthenticationrequest.cxx
index c5d7448fa29b..f292fdf5fc06 100644
--- a/ucbhelper/source/provider/simpleauthenticationrequest.cxx
+++ b/ucbhelper/source/provider/simpleauthenticationrequest.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: simpleauthenticationrequest.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/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx b/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
index 975547031621..8a34dc3c4e13 100755
--- a/ucbhelper/source/provider/simplecertificatevalidationrequest.cxx
+++ b/ucbhelper/source/provider/simplecertificatevalidationrequest.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: simplecertificatevalidationrequest.cxx,v $
- * $Revision: 1.3.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucbhelper/source/provider/simpleinteractionrequest.cxx b/ucbhelper/source/provider/simpleinteractionrequest.cxx
index 93fd33cc991f..6f5fb5d4e820 100644
--- a/ucbhelper/source/provider/simpleinteractionrequest.cxx
+++ b/ucbhelper/source/provider/simpleinteractionrequest.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: simpleinteractionrequest.cxx,v $
- * $Revision: 1.6.20.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucbhelper/source/provider/simpleioerrorrequest.cxx b/ucbhelper/source/provider/simpleioerrorrequest.cxx
index 290256c55ddf..da6eea06cda0 100644
--- a/ucbhelper/source/provider/simpleioerrorrequest.cxx
+++ b/ucbhelper/source/provider/simpleioerrorrequest.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: simpleioerrorrequest.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/ucbhelper/source/provider/simplenameclashresolverequest.cxx b/ucbhelper/source/provider/simplenameclashresolverequest.cxx
index 13d0705e000d..3c3c69d93b3e 100644
--- a/ucbhelper/source/provider/simplenameclashresolverequest.cxx
+++ b/ucbhelper/source/provider/simplenameclashresolverequest.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: simplenameclashresolverequest.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/ucbhelper/util/makefile.mk b/ucbhelper/util/makefile.mk
index 159d023a64fe..b7a195ab0bea 100644
--- a/ucbhelper/util/makefile.mk
+++ b/ucbhelper/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.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucbhelper/util/makefile.pmk b/ucbhelper/util/makefile.pmk
index 23f38aa614e5..fdb7754a69b9 100644
--- a/ucbhelper/util/makefile.pmk
+++ b/ucbhelper/util/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: makefile.pmk,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/ucbhelper/version.mk b/ucbhelper/version.mk
index 65623567d819..49f6f0fa67ad 100644
--- a/ucbhelper/version.mk
+++ b/ucbhelper/version.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: version.mk,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/ucbhelper/workben/myucp/makefile.mk b/ucbhelper/workben/myucp/makefile.mk
index ca6b3f941b0e..0d7f273fe877 100644
--- a/ucbhelper/workben/myucp/makefile.mk
+++ b/ucbhelper/workben/myucp/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucbhelper/workben/myucp/myucp_content.cxx b/ucbhelper/workben/myucp/myucp_content.cxx
index 2be1c0e8b844..bea998b60f28 100644
--- a/ucbhelper/workben/myucp/myucp_content.cxx
+++ b/ucbhelper/workben/myucp/myucp_content.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: myucp_content.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/ucbhelper/workben/myucp/myucp_content.hxx b/ucbhelper/workben/myucp/myucp_content.hxx
index a570533c2519..0645b0262683 100644
--- a/ucbhelper/workben/myucp/myucp_content.hxx
+++ b/ucbhelper/workben/myucp/myucp_content.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: myucp_content.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/ucbhelper/workben/myucp/myucp_contentcaps.cxx b/ucbhelper/workben/myucp/myucp_contentcaps.cxx
index 1c1d02fe33ae..d6981fd2f598 100644
--- a/ucbhelper/workben/myucp/myucp_contentcaps.cxx
+++ b/ucbhelper/workben/myucp/myucp_contentcaps.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: myucp_contentcaps.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/ucbhelper/workben/myucp/myucp_datasupplier.cxx b/ucbhelper/workben/myucp/myucp_datasupplier.cxx
index 23154df31439..467d7ec0c505 100644
--- a/ucbhelper/workben/myucp/myucp_datasupplier.cxx
+++ b/ucbhelper/workben/myucp/myucp_datasupplier.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: myucp_datasupplier.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/ucbhelper/workben/myucp/myucp_datasupplier.hxx b/ucbhelper/workben/myucp/myucp_datasupplier.hxx
index 244ecd5d5340..7d4cea7ec09e 100644
--- a/ucbhelper/workben/myucp/myucp_datasupplier.hxx
+++ b/ucbhelper/workben/myucp/myucp_datasupplier.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: myucp_datasupplier.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/ucbhelper/workben/myucp/myucp_provider.cxx b/ucbhelper/workben/myucp/myucp_provider.cxx
index 268a33c6a19a..9fa3c1625fc2 100644
--- a/ucbhelper/workben/myucp/myucp_provider.cxx
+++ b/ucbhelper/workben/myucp/myucp_provider.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: myucp_provider.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/ucbhelper/workben/myucp/myucp_provider.hxx b/ucbhelper/workben/myucp/myucp_provider.hxx
index 505bf16c8e4a..5fd9fe31ffad 100644
--- a/ucbhelper/workben/myucp/myucp_provider.hxx
+++ b/ucbhelper/workben/myucp/myucp_provider.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: myucp_provider.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/ucbhelper/workben/myucp/myucp_resultset.cxx b/ucbhelper/workben/myucp/myucp_resultset.cxx
index 3a96041f6b6e..d5d45ddfb97c 100644
--- a/ucbhelper/workben/myucp/myucp_resultset.cxx
+++ b/ucbhelper/workben/myucp/myucp_resultset.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: myucp_resultset.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/ucbhelper/workben/myucp/myucp_resultset.hxx b/ucbhelper/workben/myucp/myucp_resultset.hxx
index 703c2ded4907..3430e944cb13 100644
--- a/ucbhelper/workben/myucp/myucp_resultset.hxx
+++ b/ucbhelper/workben/myucp/myucp_resultset.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: myucp_resultset.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/ucbhelper/workben/myucp/myucp_services.cxx b/ucbhelper/workben/myucp/myucp_services.cxx
index f5692706c43f..a0cd8a00925b 100644
--- a/ucbhelper/workben/myucp/myucp_services.cxx
+++ b/ucbhelper/workben/myucp/myucp_services.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: myucp_services.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/ucbhelper/workben/ucbexplorer/makefile.mk b/ucbhelper/workben/ucbexplorer/makefile.mk
index eb3007349281..f8c1272e6760 100644
--- a/ucbhelper/workben/ucbexplorer/makefile.mk
+++ b/ucbhelper/workben/ucbexplorer/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx b/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
index 51490ed40296..4ca6cb71881d 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.cxx
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.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: ucbexplorer.cxx,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,12 +35,10 @@
 #include <com/sun/star/io/XActiveDataSink.hpp>
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/sdbc/XResultSet.hpp>
-#ifndef _COM_SUN_STAR_UCB_XCOMMMANDINFO_HPP_
 #include <com/sun/star/ucb/XCommandInfo.hpp>
-#endif
 #include <com/sun/star/ucb/XContentAccess.hpp>
-#include <com/sun/star/ucb/XContentCreator.hpp>
 #include <com/sun/star/ucb/CommandAbortedException.hpp>
+#include <com/sun/star/ucb/ContentInfo.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
 
 #include "rtl/ref.hxx"
@@ -57,9 +52,7 @@
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/group.hxx>
-#ifndef _SV_BUTTON_HXX
 #include <vcl/button.hxx>
-#endif
 #include <vcl/msgbox.hxx>
 #include <ucbhelper/macros.hxx>
 #include <ucbhelper/configurationkeys.hxx>
@@ -89,8 +82,8 @@ class TestDataSink : public cppu::OWeakObject, public XActiveDataSink
     uno::Reference< XInputStream > m_xStream;
 
 public:
-//  TestDataSink() {}
-//  virtual ~TestDataSink();
+//    TestDataSink() {}
+//    virtual ~TestDataSink();
 
     // XInterface methods
     virtual Any SAL_CALL queryInterface( const Type & rType )
@@ -128,7 +121,8 @@ private:
     DECL_LINK( NameHdl, Edit * );
 
 public:
-    StringInputDialog( const String& rTitle,
+    StringInputDialog( ResMgr& rResMgr,
+                       const String& rTitle,
                        const String& rDefaultText,
                        String* pGroupName = 0 );
     String GetValue() const { return m_aNameEdit.GetText(); }
@@ -147,15 +141,15 @@ class UcbExplorerListBoxEntry : public SvLBoxEntry
 
     enum EntryType { FOLDER, DOCUMENT, LINK };
 
-    ::ucb::Content m_aContent;
-    EntryType      m_eType;
+    ::ucbhelper::Content m_aContent;
+    EntryType            m_eType;
 
 public:
     UcbExplorerListBoxEntry();
     virtual ~UcbExplorerListBoxEntry();
 
     BOOL createNewContent( const ContentInfo& rInfo,
-                           ::ucb::Content& rNewContent );
+                           ::ucbhelper::Content& rNewContent );
 };
 
 //=========================================================================
@@ -176,13 +170,13 @@ private:
     virtual void         RequestingChilds( SvLBoxEntry* pParent );
 
 public:
-    UcbExplorerTreeListBox( Window* pParent, WinBits nWinStyle = 0 );
+    UcbExplorerTreeListBox( ResMgr & rResMgr, Window* pParent, WinBits nWinStyle = 0 );
     virtual ~UcbExplorerTreeListBox();
 
     virtual void Command( const CommandEvent& rCEvt );
 
     UcbExplorerListBoxEntry*
-    InsertEntry( ::ucb::Content& rContent, SvLBoxEntry* pParent );
+    InsertEntry( ::ucbhelper::Content& rContent, SvLBoxEntry* pParent );
     UcbExplorerListBoxEntry*
     InsertEntry( const String& rURL, SvLBoxEntry* pParent = 0 );
 };
@@ -200,7 +194,7 @@ class UcbExplorerWindow : public WorkWindow
     UcbExplorerTreeListBox m_aTree;
 
 public:
-    UcbExplorerWindow( Window *pParent, WinBits nWinStyle );
+    UcbExplorerWindow( ResMgr & rResMgr, Window *pParent, WinBits nWinStyle );
     virtual ~UcbExplorerWindow();
 
     virtual void Resize();
@@ -230,7 +224,7 @@ Any SAL_CALL TestDataSink::queryInterface( const Type & rType )
 {
     Any aRet = cppu::queryInterface(
                         rType,
-                           static_cast< XActiveDataSink * >( this ) );
+                            static_cast< XActiveDataSink * >( this ) );
     return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
@@ -273,16 +267,17 @@ uno::Reference< XInputStream > SAL_CALL TestDataSink::getInputStream()
 //
 //=========================================================================
 
-StringInputDialog::StringInputDialog( const String& rTitle,
+StringInputDialog::StringInputDialog( ResMgr& rResMgr,
+                                      const String& rTitle,
                                       const String& rDefaultText,
                                       String* pGroupName )
-: ModalDialog( 0, ResId( DLG_STRINGINPUT ) ),
-  m_aNameText ( this, ResId( FT_STRINGINPUT_DLG_NAME ) ),
-  m_aNameEdit ( this, ResId( ED_STRINGINPUT_DLG_NAME ) ),
-  m_aNameGroup( this, ResId( GB_STRINGINPUT_DLG_NAME ) ),
-  m_aOKBtn    ( this, ResId( BT_STRINGINPUT_DLG_OK ) ),
-  m_aCancelBtn( this, ResId( BT_STRINGINPUT_DLG_CANCEL ) ),
-  m_aHelpBtn  ( this, ResId( BT_STRINGINPUT_DLG_HELP ) )
+  : ModalDialog( 0, ResId( DLG_STRINGINPUT, rResMgr ) ),
+  m_aNameText ( this, ResId( FT_STRINGINPUT_DLG_NAME, rResMgr ) ),
+  m_aNameEdit ( this, ResId( ED_STRINGINPUT_DLG_NAME, rResMgr ) ),
+  m_aNameGroup( this, ResId( GB_STRINGINPUT_DLG_NAME, rResMgr ) ),
+  m_aOKBtn    ( this, ResId( BT_STRINGINPUT_DLG_OK, rResMgr ) ),
+  m_aCancelBtn( this, ResId( BT_STRINGINPUT_DLG_CANCEL, rResMgr ) ),
+  m_aHelpBtn  ( this, ResId( BT_STRINGINPUT_DLG_HELP, rResMgr ) )
 {
     FreeResource();
     SetText( rTitle );
@@ -343,7 +338,7 @@ UcbExplorerListBoxEntry::~UcbExplorerListBoxEntry()
 
 //=========================================================================
 BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
-                                                ::ucb::Content& rNewContent )
+                                                ::ucbhelper::Content& rNewContent )
 {
     sal_Int32 nCount = rInfo.Properties.getLength();
     Sequence< Any > aPropValues( nCount );
@@ -358,7 +353,10 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
         for ( sal_Int32 n = 0; n < nCount; ++n )
         {
             const OUString& rName = pProps[ n ].Name;
-            StringInputDialog* pDlg = new StringInputDialog( rName, rName );
+
+            std::auto_ptr< ResMgr > xManager(
+                ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
+            StringInputDialog* pDlg = new StringInputDialog( *xManager.get(), rName, rName );
             USHORT nRet = pDlg->Execute();
             if ( nRet == RET_OK )
             {
@@ -444,7 +442,10 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
         // Let the user specify the URL of a content containing the
         // data to supply to the new content.
 
+        std::auto_ptr< ResMgr > xManager(
+            ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
         StringInputDialog* pDlg = new StringInputDialog(
+                                            *xManager.get(),
                                             OUString::createFromAscii(
                                                 "Document Data Source URL" ),
                                             OUString() );
@@ -457,7 +458,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
             if ( aSourceURL.getLength() == 0 )
             {
                 DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - "
-                              "No document data URL!" );
+                               "No document data URL!" );
                 return FALSE;
             }
 
@@ -465,11 +466,11 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
             {
                 uno::Reference< XCommandEnvironment > xEnv;
 
-                ::ucb::ContentBroker* pBroker = ::ucb::ContentBroker::get();
+                ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get();
                 if ( pBroker )
                 {
                     uno::Reference< XInteractionHandler > xInteractionHandler(
-                         pBroker->getServiceManager()->createInstance(
+                        pBroker->getServiceManager()->createInstance(
                                 OUString::createFromAscii(
                                     "com.sun.star.task.InteractionHandler" ) ),
                         UNO_QUERY );
@@ -477,21 +478,21 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
                     uno::Reference< XProgressHandler > xProgressHandler
                                     /* = new ProgressHandler( *pBroker ) */ ;
 
-                    xEnv = new ::ucb::CommandEnvironment( xInteractionHandler,
-                                                               xProgressHandler );
+                    xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler,
+                                                                xProgressHandler );
                 }
 
-                ::ucb::Content aSourceContent( aSourceURL, xEnv );
+                ::ucbhelper::Content aSourceContent( aSourceURL, xEnv );
 
                 // Get source data.
                 rtl::Reference< TestDataSink > xSourceData = new TestDataSink;
-                aSourceContent.openStream( xSourceData.getBodyPtr() );
+                aSourceContent.openStream( xSourceData.get() );
                 xData = xSourceData->getInputStream();
             }
             catch ( ContentCreationException const & )
             {
                 DBG_ERROR( "UcbExplorerListBoxEntry::createNewContent - "
-                              "No content for document data!" );
+                               "No content for document data!" );
                 return FALSE;
             }
             catch ( CommandAbortedException const & )
@@ -516,7 +517,7 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
 
     // Create new content.
 
-       ULONG n = Application::ReleaseSolarMutex();
+        ULONG n = Application::ReleaseSolarMutex();
     BOOL bRet = sal_False;
 
     try
@@ -545,13 +546,14 @@ BOOL UcbExplorerListBoxEntry::createNewContent( const ContentInfo& rInfo,
 //
 //=========================================================================
 
-UcbExplorerTreeListBox::UcbExplorerTreeListBox(
-                                    Window* pParent, WinBits nWinStyle )
+UcbExplorerTreeListBox::UcbExplorerTreeListBox( ResMgr & rResMgr,
+                                                Window* pParent,
+                                                WinBits nWinStyle )
 : SvTreeListBox( pParent, nWinStyle ),
-  m_aFolderClosed( ResId( BMP_FOLDER_CLOSED ) ),
-  m_aFolderOpened( ResId( BMP_FOLDER_OPENED ) ),
-  m_aDocument( ResId( BMP_DOCUMENT ) ),
-  m_aLink( ResId( BMP_LINK ) )
+  m_aFolderClosed( ResId( BMP_FOLDER_CLOSED, rResMgr ) ),
+  m_aFolderOpened( ResId( BMP_FOLDER_OPENED, rResMgr ) ),
+  m_aDocument( ResId( BMP_DOCUMENT, rResMgr ) ),
+  m_aLink( ResId( BMP_LINK, rResMgr ) )
 {
 }
 
@@ -580,18 +582,18 @@ void UcbExplorerTreeListBox::RequestingChilds( SvLBoxEntry* pParent )
         {
             case UcbExplorerListBoxEntry::FOLDER:
             {
-                   ULONG n = Application::ReleaseSolarMutex();
+                    ULONG n = Application::ReleaseSolarMutex();
 
                 try
                 {
                     Sequence< OUString > aPropertyNames( 0 );
-//                  OUString* pNames = aPropertyNames.getArray();
-//                  pNames[ 0 ] = OUString::createFromAscii( "Title" );
+//                    OUString* pNames = aPropertyNames.getArray();
+//                    pNames[ 0 ] = OUString::createFromAscii( "Title" );
 
                     uno::Reference< XResultSet > xResultSet
                         = pEntry->m_aContent.createCursor(
                                     aPropertyNames,
-                                    ::ucb::INCLUDE_FOLDERS_AND_DOCUMENTS );
+                                    ::ucbhelper::INCLUDE_FOLDERS_AND_DOCUMENTS );
                     uno::Reference< XContentAccess > xContentAccess(
                                                     xResultSet, UNO_QUERY );
 
@@ -648,36 +650,32 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                 GetEntry( rPos, TRUE ) );
         if ( pEntry )
         {
-            PopupMenu* pMenu = new PopupMenu( ResId( MENU_POPUP ) );
+           std::auto_ptr< ResMgr > xManager(
+                ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
+           PopupMenu* pMenu = new PopupMenu( ResId( MENU_POPUP, *xManager.get() ) );
             PopupMenu* pNewMenu = 0;
 
-//          pMenu->SetSelectHdl( LINK( this,
-//                                     SfxCommonTemplateDialog_Impl,
-//                                     MenuSelectHdl ) );
+//            pMenu->SetSelectHdl( LINK( this,
+//                                       SfxCommonTemplateDialog_Impl,
+//                                       MenuSelectHdl ) );
 
             //////////////////////////////////////////////////////////////
             // Configure "New"
             //////////////////////////////////////////////////////////////
 
-            uno::Reference< XContentCreator > xCreator(
-                                    pEntry->m_aContent.get(), UNO_QUERY );
-            Sequence< ContentInfo > aInfo;
-            BOOL bCanCreate = xCreator.is();
-            if ( bCanCreate )
-            {
-                aInfo = xCreator->queryCreatableContentsInfo();
-                const ContentInfo* pInfo = aInfo.getConstArray();
-                sal_Int32 nCount = aInfo.getLength();
-                bCanCreate =  ( nCount > 0 );
+            Sequence< ContentInfo > aInfo
+                = pEntry->m_aContent.queryCreatableContentsInfo();
+            const ContentInfo* pInfo = aInfo.getConstArray();
+            sal_Int32 nCount = aInfo.getLength();
+            BOOL bCanCreate =  ( nCount > 0 );
 
-                pNewMenu = new PopupMenu;
-                pMenu->SetPopupMenu( MENU_NEW, pNewMenu );
+            pNewMenu = new PopupMenu;
+            pMenu->SetPopupMenu( MENU_NEW, pNewMenu );
 
-                for ( sal_Int32 n = 0; n < nCount; ++n )
-                {
-                    const ContentInfo& rInfo = pInfo[ n ];
-                    pNewMenu->InsertItem( 20000 + n + 1, rInfo.Type );
-                }
+            for ( sal_Int32 n = 0; n < nCount; ++n )
+            {
+                const ContentInfo& rInfo = pInfo[ n ];
+                pNewMenu->InsertItem( 20000 + n + 1, rInfo.Type );
             }
 
             pMenu->EnableItem( MENU_NEW, bCanCreate );
@@ -721,7 +719,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
             {
                 pMenu->EnableItem( MENU_DELETE,
                                    pEntry->m_aContent
-                                       .getCommands()->hasCommandByName(
+                                        .getCommands()->hasCommandByName(
                                         OUString::createFromAscii(
                                             "delete" ) ) );
             }
@@ -743,8 +741,8 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
             USHORT nSelected = pMenu->Execute( this, rPos );
             switch ( nSelected )
             {
-//              case MENU_NEW:
-//                  break;
+//                case MENU_NEW:
+//                    break;
 
                 case MENU_RENAME:
                 {
@@ -767,8 +765,11 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     {
                     }
 
+                    std::auto_ptr< ResMgr > xManager(
+                        ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
                     StringInputDialog* pDlg
                             = new StringInputDialog(
+                                    *xManager.get(),
                                     OUString::createFromAscii( "Title" ),
                                     aNewTitle );
 
@@ -884,7 +885,7 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
                     {
                         // New-menu entry selected.
 
-                           ::ucb::Content aNewContent;
+                        ::ucbhelper::Content aNewContent;
                         if ( pEntry->createNewContent(
                                     aInfo.getConstArray()[ nSelected - 20001 ],
                                     aNewContent ) )
@@ -910,8 +911,8 @@ void UcbExplorerTreeListBox::Command( const CommandEvent& rCEvt )
 
 //=========================================================================
 UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
-                                              ::ucb::Content& rContent,
-                                                 SvLBoxEntry* pParent )
+                                                ::ucbhelper::Content& rContent,
+                                                SvLBoxEntry* pParent )
 {
     try
     {
@@ -921,7 +922,7 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
         if ( !aTitle.getLength() )
             aTitle = OUString::createFromAscii( "/" );
 
-           UcbExplorerListBoxEntry* pEntry = 0;
+            UcbExplorerListBoxEntry* pEntry = 0;
 
         if ( rContent.isFolder() )
         {
@@ -995,18 +996,18 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
 
 //=========================================================================
 UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
-                                                  const String& rURL,
-                                                     SvLBoxEntry* pParent )
+                                                const String& rURL,
+                                                    SvLBoxEntry* pParent )
 {
     try
     {
         uno::Reference< XCommandEnvironment > xEnv;
 
-        ::ucb::ContentBroker* pBroker = ::ucb::ContentBroker::get();
+        ::ucbhelper::ContentBroker* pBroker = ::ucbhelper::ContentBroker::get();
         if ( pBroker )
         {
             uno::Reference< XInteractionHandler > xInteractionHandler(
-                 pBroker->getServiceManager()->createInstance(
+                pBroker->getServiceManager()->createInstance(
                         OUString::createFromAscii(
                             "com.sun.star.task.InteractionHandler" ) ),
                 UNO_QUERY );
@@ -1014,11 +1015,11 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
             uno::Reference< XProgressHandler > xProgressHandler
                                 /* = new ProgressHandler( *pBroker ) */ ;
 
-            xEnv = new ::ucb::CommandEnvironment( xInteractionHandler,
-                                                     xProgressHandler );
+            xEnv = new ::ucbhelper::CommandEnvironment( xInteractionHandler,
+                                                        xProgressHandler );
         }
 
-        ::ucb::Content aContent( rURL, xEnv );
+        ::ucbhelper::Content aContent( rURL, xEnv );
         return InsertEntry( aContent, pParent );
     }
     catch ( ContentCreationException const & )
@@ -1034,9 +1035,9 @@ UcbExplorerListBoxEntry* UcbExplorerTreeListBox::InsertEntry(
 //
 //=========================================================================
 
-UcbExplorerWindow::UcbExplorerWindow( Window *pParent, WinBits nWinStyle )
+UcbExplorerWindow::UcbExplorerWindow( ResMgr & rResMgr, Window *pParent, WinBits nWinStyle )
 : WorkWindow( pParent, nWinStyle ),
-  m_aTree( this, WB_HSCROLL )
+  m_aTree( rResMgr, this, WB_HSCROLL )
 {
     Font aTreeFont( m_aTree.GetFont() );
     aTreeFont.SetName( String( RTL_CONSTASCII_USTRINGPARAM("Courier") ) );
@@ -1105,7 +1106,7 @@ void MyApp::Main()
 
     comphelper::setProcessServiceFactory( xFac );
 
-    unO::Reference< XComponent > xComponent(    xFac, UNO_QUERY );
+    uno::Reference< XComponent > xComponent( xFac, UNO_QUERY );
 
     //////////////////////////////////////////////////////////////////////
     // Create UCB.
@@ -1116,16 +1117,16 @@ void MyApp::Main()
     Sequence< Any > aArgs( 2 );
     aArgs[ 0 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY1_LOCAL );
     aArgs[ 1 ] <<= OUString::createFromAscii( UCB_CONFIGURATION_KEY2_OFFICE );
-    sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xFac, aArgs );
+    sal_Bool bSuccess = ::ucbhelper::ContentBroker::initialize( xFac, aArgs );
 #else
     // Init UCB (Use provided configuration data)
-    ::ucb::ContentProviderDataList aProviders;
+    ::ucbhelper::ContentProviderDataList aProviders;
     aProviders.push_back(
-        ::ucb::ContentProviderData(
+        ::ucbhelper::ContentProviderData(
             OUString::createFromAscii( "com.sun.star.ucb.FileContentProvider" ),
             OUString::createFromAscii( "file" ),
             OUString() ) );
-    sal_Bool bSuccess = ::ucb::ContentBroker::initialize( xFac, aProviders );
+    sal_Bool bSuccess = ::ucbhelper::ContentBroker::initialize( xFac, aProviders );
 #endif
 
     if ( !bSuccess )
@@ -1138,12 +1139,12 @@ void MyApp::Main()
     // Create/init/show app window.
     //////////////////////////////////////////////////////////////////////
 
-    ResMgr* pMgr = ResMgr::CreateResMgr( CREATEVERSIONRESMGR( ucbexplorer ) );
-    Resource::SetResManager( pMgr );
+    std::auto_ptr< ResMgr > xManager(
+        ResMgr::CreateResMgr( CREATEVERSIONRESMGR_NAME( ucbexplorer ) ) );
 
-    UcbExplorerWindow aAppWin( 0, WB_APP | WB_STDWORK );
+    UcbExplorerWindow aAppWin( *xManager.get(), 0, WB_APP | WB_STDWORK );
 
-    MenuBar aMBMain( ResId( MENU_MAIN ) );
+    MenuBar aMBMain( ResId( MENU_MAIN, *xManager.get() ) );
 
     // Check for command line params
 #if 0
@@ -1158,7 +1159,7 @@ void MyApp::Main()
         aRootURL = UniString::CreateFromAscii(
                         RTL_CONSTASCII_STRINGPARAM( "vnd.sun.star.hier:/" ) );
 
-    String aTitle( ResId( TEXT_TITLEBAR ) );
+     String aTitle( ResId( TEXT_TITLEBAR, *xManager.get() ) );
     aTitle.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " - " ) );
     aTitle += aRootURL;
 
@@ -1183,7 +1184,7 @@ void MyApp::Main()
     // m_aTree holds UCB contents!
     aAppWin.m_aTree.Clear();
 
-    ::ucb::ContentBroker::deinitialize();
+    ::ucbhelper::ContentBroker::deinitialize();
 
     if ( xComponent.is() )
         xComponent->dispose();
diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc b/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
index 42ef0732c0e5..e93730da99ef 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.hrc
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.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: ucbexplorer.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/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src
index 14d4b8ee8770..4bee5900eaaf 100644
--- a/ucbhelper/workben/ucbexplorer/ucbexplorer.src
+++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.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: ucbexplorer.src,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,15 +24,6 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-//=========================================================================
-//
-// UCB Explorer ( resources )
-//
-// (C) 2000 StarOffice Entwicklungs GmbH, Hamburg, Germany
-//
-// $Author: rt $ $Date: 2008-04-10 16:20:05 $Revision$
-//
-//=========================================================================
 
 #include "ucbexplorer.hrc"
 
@@ -91,6 +79,7 @@ Menu MENU_POPUP
     };
 };
 
+/*
 Bitmap BMP_FOLDER_CLOSED
 {
     File = "bmp/fldclose.bmp" ;
@@ -107,6 +96,7 @@ Bitmap BMP_LINK
 {
     File = "bmp/link.bmp" ;
 };
+*/
 
 ModalDialog DLG_STRINGINPUT
 {
diff --git a/unotools/inc/makefile.mk b/unotools/inc/makefile.mk
index d6c17aaecb89..e28adc7305e5 100644
--- a/unotools/inc/makefile.mk
+++ b/unotools/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/inc/pch/precompiled_unotools.cxx b/unotools/inc/pch/precompiled_unotools.cxx
index a848d922583c..56609a47e969 100644
--- a/unotools/inc/pch/precompiled_unotools.cxx
+++ b/unotools/inc/pch/precompiled_unotools.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: precompiled_unotools.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/unotools/inc/pch/precompiled_unotools.hxx b/unotools/inc/pch/precompiled_unotools.hxx
index 30979736a134..dec72c148da6 100644
--- a/unotools/inc/pch/precompiled_unotools.hxx
+++ b/unotools/inc/pch/precompiled_unotools.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_unotools.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/unotools/inc/unotools/accelcfg.hxx b/unotools/inc/unotools/accelcfg.hxx
index 70a0d26545f5..a1884d34fbc3 100644
--- a/unotools/inc/unotools/accelcfg.hxx
+++ b/unotools/inc/unotools/accelcfg.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: accelcfg.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/unotools/inc/unotools/accessiblerelationsethelper.hxx b/unotools/inc/unotools/accessiblerelationsethelper.hxx
index e48850e3efc8..ba853381329f 100644
--- a/unotools/inc/unotools/accessiblerelationsethelper.hxx
+++ b/unotools/inc/unotools/accessiblerelationsethelper.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: accessiblerelationsethelper.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/unotools/inc/unotools/accessiblestatesethelper.hxx b/unotools/inc/unotools/accessiblestatesethelper.hxx
index 421a77b78f2b..3847beeee146 100644
--- a/unotools/inc/unotools/accessiblestatesethelper.hxx
+++ b/unotools/inc/unotools/accessiblestatesethelper.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: accessiblestatesethelper.hxx,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/unotools/inc/unotools/atom.hxx b/unotools/inc/unotools/atom.hxx
index e8409f6ce5e6..8576b31f6970 100644
--- a/unotools/inc/unotools/atom.hxx
+++ b/unotools/inc/unotools/atom.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: atom.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/unotools/inc/unotools/bootstrap.hxx b/unotools/inc/unotools/bootstrap.hxx
index d2c8a5f1875b..bbb476fdaf9e 100644
--- a/unotools/inc/unotools/bootstrap.hxx
+++ b/unotools/inc/unotools/bootstrap.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: bootstrap.hxx,v $
- * $Revision: 1.15.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/inc/unotools/cacheoptions.hxx b/unotools/inc/unotools/cacheoptions.hxx
index a9adf9a14467..432a91e67070 100644
--- a/unotools/inc/unotools/cacheoptions.hxx
+++ b/unotools/inc/unotools/cacheoptions.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: cacheoptions.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/unotools/inc/unotools/calendarwrapper.hxx b/unotools/inc/unotools/calendarwrapper.hxx
index c98e0867e8fa..f5a8a06b1f6c 100644
--- a/unotools/inc/unotools/calendarwrapper.hxx
+++ b/unotools/inc/unotools/calendarwrapper.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: calendarwrapper.hxx,v $
- * $Revision: 1.10.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/inc/unotools/charclass.hxx b/unotools/inc/unotools/charclass.hxx
index 3caf0ea3cc6d..4469ed8ffc3d 100644
--- a/unotools/inc/unotools/charclass.hxx
+++ b/unotools/inc/unotools/charclass.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: charclass.hxx,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/unotools/inc/unotools/cmdoptions.hxx b/unotools/inc/unotools/cmdoptions.hxx
index 85d8a0725f3c..c2454d9582ee 100644
--- a/unotools/inc/unotools/cmdoptions.hxx
+++ b/unotools/inc/unotools/cmdoptions.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: cmdoptions.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/unotools/inc/unotools/collatorwrapper.hxx b/unotools/inc/unotools/collatorwrapper.hxx
index 7440822a1d3a..e4f2a3443f1d 100644
--- a/unotools/inc/unotools/collatorwrapper.hxx
+++ b/unotools/inc/unotools/collatorwrapper.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: collatorwrapper.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/unotools/inc/unotools/compatibility.hxx b/unotools/inc/unotools/compatibility.hxx
index 0c7c41882c09..eb01e43f3ba0 100644
--- a/unotools/inc/unotools/compatibility.hxx
+++ b/unotools/inc/unotools/compatibility.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: compatibility.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/unotools/inc/unotools/componentresmodule.hxx b/unotools/inc/unotools/componentresmodule.hxx
index 59e05f085b1c..0fe4e126ea74 100644
--- a/unotools/inc/unotools/componentresmodule.hxx
+++ b/unotools/inc/unotools/componentresmodule.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: componentresmodule.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/unotools/inc/unotools/configitem.hxx b/unotools/inc/unotools/configitem.hxx
index 3cc0dc1b079e..d1477cba1b74 100644
--- a/unotools/inc/unotools/configitem.hxx
+++ b/unotools/inc/unotools/configitem.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: configitem.hxx,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/inc/unotools/configmgr.hxx b/unotools/inc/unotools/configmgr.hxx
index 679e90b17249..82af190aab4f 100644
--- a/unotools/inc/unotools/configmgr.hxx
+++ b/unotools/inc/unotools/configmgr.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: configmgr.hxx,v $
- * $Revision: 1.22.26.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/inc/unotools/confignode.hxx b/unotools/inc/unotools/confignode.hxx
index 580274004e1a..8745508375a1 100644
--- a/unotools/inc/unotools/confignode.hxx
+++ b/unotools/inc/unotools/confignode.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: confignode.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -88,6 +85,9 @@ namespace utl
         /// dtor
         ~OConfigurationNode() {}
 
+        /// returns the local name of the node
+        ::rtl::OUString     getLocalName() const;
+
         /** open a sub node
             @param      _rPath      access path of the to-be-opened sub node. May be a hierarchical path.
         */
diff --git a/unotools/inc/unotools/configpathes.hxx b/unotools/inc/unotools/configpathes.hxx
index 081021145055..2a1e76abf1fc 100644
--- a/unotools/inc/unotools/configpathes.hxx
+++ b/unotools/inc/unotools/configpathes.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: configpathes.hxx,v $
- * $Revision: 1.5.22.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/inc/unotools/configvaluecontainer.hxx b/unotools/inc/unotools/configvaluecontainer.hxx
index d4442d6bde6a..a66ca4cb753a 100644
--- a/unotools/inc/unotools/configvaluecontainer.hxx
+++ b/unotools/inc/unotools/configvaluecontainer.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: configvaluecontainer.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/unotools/inc/unotools/datetime.hxx b/unotools/inc/unotools/datetime.hxx
index aaccfc29eb0f..ef02822f1dc5 100644
--- a/unotools/inc/unotools/datetime.hxx
+++ b/unotools/inc/unotools/datetime.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: datetime.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/unotools/inc/unotools/defaultoptions.hxx b/unotools/inc/unotools/defaultoptions.hxx
index 603d7fd6d22a..ecd6b7928629 100644
--- a/unotools/inc/unotools/defaultoptions.hxx
+++ b/unotools/inc/unotools/defaultoptions.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: defaultoptions.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/unotools/inc/unotools/desktopterminationobserver.hxx b/unotools/inc/unotools/desktopterminationobserver.hxx
index effa35a9e293..6b1f0d3e52f6 100644
--- a/unotools/inc/unotools/desktopterminationobserver.hxx
+++ b/unotools/inc/unotools/desktopterminationobserver.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: desktopterminationobserver.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/unotools/inc/unotools/digitgroupingiterator.hxx b/unotools/inc/unotools/digitgroupingiterator.hxx
index 5525e01bb297..19f3ebf37abb 100644
--- a/unotools/inc/unotools/digitgroupingiterator.hxx
+++ b/unotools/inc/unotools/digitgroupingiterator.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: digitgroupingiterator.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/unotools/inc/unotools/docinfohelper.hxx b/unotools/inc/unotools/docinfohelper.hxx
index 80534af1430e..9ce9d346af20 100644
--- a/unotools/inc/unotools/docinfohelper.hxx
+++ b/unotools/inc/unotools/docinfohelper.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: docinfohelper.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/unotools/inc/unotools/dynamicmenuoptions.hxx b/unotools/inc/unotools/dynamicmenuoptions.hxx
index 2841970c5a84..9d695e166471 100644
--- a/unotools/inc/unotools/dynamicmenuoptions.hxx
+++ b/unotools/inc/unotools/dynamicmenuoptions.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: dynamicmenuoptions.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/unotools/inc/unotools/eventcfg.hxx b/unotools/inc/unotools/eventcfg.hxx
index 0cee43e59dc5..839811f9dd80 100644
--- a/unotools/inc/unotools/eventcfg.hxx
+++ b/unotools/inc/unotools/eventcfg.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: eventcfg.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/unotools/inc/unotools/eventlisteneradapter.hxx b/unotools/inc/unotools/eventlisteneradapter.hxx
index 9bd8586034bf..c46cabc4dffb 100644
--- a/unotools/inc/unotools/eventlisteneradapter.hxx
+++ b/unotools/inc/unotools/eventlisteneradapter.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: eventlisteneradapter.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/unotools/inc/unotools/extendedsecurityoptions.hxx b/unotools/inc/unotools/extendedsecurityoptions.hxx
index 114cf81d6ced..6e6b04472d31 100644
--- a/unotools/inc/unotools/extendedsecurityoptions.hxx
+++ b/unotools/inc/unotools/extendedsecurityoptions.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: extendedsecurityoptions.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/unotools/inc/unotools/fltrcfg.hxx b/unotools/inc/unotools/fltrcfg.hxx
index 1422ba1a7a8f..890efebde071 100644
--- a/unotools/inc/unotools/fltrcfg.hxx
+++ b/unotools/inc/unotools/fltrcfg.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: fltrcfg.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/unotools/inc/unotools/fontcfg.hxx b/unotools/inc/unotools/fontcfg.hxx
index 4d0ed4036328..633c12c4c99c 100644
--- a/unotools/inc/unotools/fontcfg.hxx
+++ b/unotools/inc/unotools/fontcfg.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: fontcfg.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/unotools/inc/unotools/fontcvt.hxx b/unotools/inc/unotools/fontcvt.hxx
index 679a2dc5a6d9..333ee36e706d 100644
--- a/unotools/inc/unotools/fontcvt.hxx
+++ b/unotools/inc/unotools/fontcvt.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: fontcvt.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/unotools/inc/unotools/fontdefs.hxx b/unotools/inc/unotools/fontdefs.hxx
index ef4f68bb9e8a..12868aabe525 100644
--- a/unotools/inc/unotools/fontdefs.hxx
+++ b/unotools/inc/unotools/fontdefs.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/unotools/inc/unotools/fontoptions.hxx b/unotools/inc/unotools/fontoptions.hxx
index 644670711595..7809fb4380cf 100644
--- a/unotools/inc/unotools/fontoptions.hxx
+++ b/unotools/inc/unotools/fontoptions.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: fontoptions.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/unotools/inc/unotools/historyoptions.hxx b/unotools/inc/unotools/historyoptions.hxx
index c1bd8f62fca1..50b411e5d17e 100644
--- a/unotools/inc/unotools/historyoptions.hxx
+++ b/unotools/inc/unotools/historyoptions.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: historyoptions.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/unotools/inc/unotools/historyoptions_const.hxx b/unotools/inc/unotools/historyoptions_const.hxx
index 48632b66b018..1d57d5146666 100644
--- a/unotools/inc/unotools/historyoptions_const.hxx
+++ b/unotools/inc/unotools/historyoptions_const.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: historyoptions_const.hxx,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/19 11: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.
  *
  ************************************************************************/
 
diff --git a/unotools/inc/unotools/idhelper.hxx b/unotools/inc/unotools/idhelper.hxx
index a2aa28d26c1b..d8c734025b12 100644
--- a/unotools/inc/unotools/idhelper.hxx
+++ b/unotools/inc/unotools/idhelper.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: idhelper.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/unotools/inc/unotools/inetoptions.hxx b/unotools/inc/unotools/inetoptions.hxx
index 42f01f40b7c2..f69d3d211c9c 100644
--- a/unotools/inc/unotools/inetoptions.hxx
+++ b/unotools/inc/unotools/inetoptions.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: inetoptions.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/unotools/inc/unotools/internaloptions.hxx b/unotools/inc/unotools/internaloptions.hxx
index d5c9adaa7b92..7e2be078811d 100644
--- a/unotools/inc/unotools/internaloptions.hxx
+++ b/unotools/inc/unotools/internaloptions.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: internaloptions.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/unotools/inc/unotools/intlwrapper.hxx b/unotools/inc/unotools/intlwrapper.hxx
index a48c9d20d0f4..e35f4cc9268f 100644
--- a/unotools/inc/unotools/intlwrapper.hxx
+++ b/unotools/inc/unotools/intlwrapper.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: intlwrapper.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/unotools/inc/unotools/itemholderbase.hxx b/unotools/inc/unotools/itemholderbase.hxx
index 3b8bbccb3549..df1892d41a12 100644
--- a/unotools/inc/unotools/itemholderbase.hxx
+++ b/unotools/inc/unotools/itemholderbase.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: itemholderbase.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/unotools/inc/unotools/javaoptions.hxx b/unotools/inc/unotools/javaoptions.hxx
index 9996a496bf31..38e023556716 100644
--- a/unotools/inc/unotools/javaoptions.hxx
+++ b/unotools/inc/unotools/javaoptions.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: javaoptions.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/unotools/inc/unotools/lingucfg.hxx b/unotools/inc/unotools/lingucfg.hxx
index 49500db964c2..720a2efb381c 100644
--- a/unotools/inc/unotools/lingucfg.hxx
+++ b/unotools/inc/unotools/lingucfg.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: lingucfg.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/unotools/inc/unotools/linguprops.hxx b/unotools/inc/unotools/linguprops.hxx
index 3edd1004bec0..4f2640116454 100644
--- a/unotools/inc/unotools/linguprops.hxx
+++ b/unotools/inc/unotools/linguprops.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: linguprops.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/unotools/inc/unotools/localedatawrapper.hxx b/unotools/inc/unotools/localedatawrapper.hxx
index 5af352dd33c1..fd09b07e58cb 100644
--- a/unotools/inc/unotools/localedatawrapper.hxx
+++ b/unotools/inc/unotools/localedatawrapper.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: localedatawrapper.hxx,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/unotools/inc/unotools/localfilehelper.hxx b/unotools/inc/unotools/localfilehelper.hxx
index a5b6fb44d818..11e0851c3298 100644
--- a/unotools/inc/unotools/localfilehelper.hxx
+++ b/unotools/inc/unotools/localfilehelper.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: localfilehelper.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/unotools/inc/unotools/localisationoptions.hxx b/unotools/inc/unotools/localisationoptions.hxx
index d401eccee51a..acce942f6a42 100644
--- a/unotools/inc/unotools/localisationoptions.hxx
+++ b/unotools/inc/unotools/localisationoptions.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: localisationoptions.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/unotools/inc/unotools/loghelper.hxx b/unotools/inc/unotools/loghelper.hxx
index 22efd5cff46d..d5421089dff4 100644
--- a/unotools/inc/unotools/loghelper.hxx
+++ b/unotools/inc/unotools/loghelper.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: loghelper.hxx,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/19 11:20:29 $
+ * 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 _SVT_LOGHELPER_HXX
diff --git a/unotools/inc/unotools/misccfg.hxx b/unotools/inc/unotools/misccfg.hxx
index 14ecb12b388a..01b8db21138f 100644
--- a/unotools/inc/unotools/misccfg.hxx
+++ b/unotools/inc/unotools/misccfg.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: misccfg.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/unotools/inc/unotools/moduleoptions.hxx b/unotools/inc/unotools/moduleoptions.hxx
index 8b759a0834cf..d48a390a30bc 100644
--- a/unotools/inc/unotools/moduleoptions.hxx
+++ b/unotools/inc/unotools/moduleoptions.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: moduleoptions.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/unotools/inc/unotools/nativenumberwrapper.hxx b/unotools/inc/unotools/nativenumberwrapper.hxx
index 35f7ba632ca0..9b7d5c130a51 100644
--- a/unotools/inc/unotools/nativenumberwrapper.hxx
+++ b/unotools/inc/unotools/nativenumberwrapper.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: nativenumberwrapper.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/unotools/inc/unotools/numberformatcodewrapper.hxx b/unotools/inc/unotools/numberformatcodewrapper.hxx
index 8e4f1ce793d0..394346275b14 100644
--- a/unotools/inc/unotools/numberformatcodewrapper.hxx
+++ b/unotools/inc/unotools/numberformatcodewrapper.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: numberformatcodewrapper.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/unotools/inc/unotools/options.hxx b/unotools/inc/unotools/options.hxx
index b5664edac2d1..0279e16df1d9 100755..100644
--- a/unotools/inc/unotools/options.hxx
+++ b/unotools/inc/unotools/options.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: options.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/unotools/inc/unotools/optionsdlg.hxx b/unotools/inc/unotools/optionsdlg.hxx
index 87649a82358c..833e8d5700c3 100644
--- a/unotools/inc/unotools/optionsdlg.hxx
+++ b/unotools/inc/unotools/optionsdlg.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: optionsdlg.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/unotools/inc/unotools/pathoptions.hxx b/unotools/inc/unotools/pathoptions.hxx
index e606180c25de..4d94c93cca4a 100644
--- a/unotools/inc/unotools/pathoptions.hxx
+++ b/unotools/inc/unotools/pathoptions.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: pathoptions.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/unotools/inc/unotools/printwarningoptions.hxx b/unotools/inc/unotools/printwarningoptions.hxx
index 3663fb8c63d0..94f3bc6a3ddb 100644
--- a/unotools/inc/unotools/printwarningoptions.hxx
+++ b/unotools/inc/unotools/printwarningoptions.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: printwarningoptions.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/unotools/inc/unotools/processfactory.hxx b/unotools/inc/unotools/processfactory.hxx
index 795f4ee8839f..fd852f2c46fa 100644
--- a/unotools/inc/unotools/processfactory.hxx
+++ b/unotools/inc/unotools/processfactory.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: processfactory.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/unotools/inc/unotools/progresshandlerwrap.hxx b/unotools/inc/unotools/progresshandlerwrap.hxx
index c8394dc8577c..4326da0a331f 100644
--- a/unotools/inc/unotools/progresshandlerwrap.hxx
+++ b/unotools/inc/unotools/progresshandlerwrap.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: progresshandlerwrap.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/unotools/inc/unotools/propertysethelper.hxx b/unotools/inc/unotools/propertysethelper.hxx
index 04b027dc3546..ad6508e76df3 100644
--- a/unotools/inc/unotools/propertysethelper.hxx
+++ b/unotools/inc/unotools/propertysethelper.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: propertysethelper.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/unotools/inc/unotools/propertysetinfo.hxx b/unotools/inc/unotools/propertysetinfo.hxx
index cd44940eb781..7e3f26dfc73b 100644
--- a/unotools/inc/unotools/propertysetinfo.hxx
+++ b/unotools/inc/unotools/propertysetinfo.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: propertysetinfo.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/unotools/inc/unotools/querydeep.hxx b/unotools/inc/unotools/querydeep.hxx
index 50af53d35dce..fd57f38147d0 100644
--- a/unotools/inc/unotools/querydeep.hxx
+++ b/unotools/inc/unotools/querydeep.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: querydeep.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/unotools/inc/unotools/readwritemutexguard.hxx b/unotools/inc/unotools/readwritemutexguard.hxx
index 46e3d36f2eac..3035d5bda878 100644
--- a/unotools/inc/unotools/readwritemutexguard.hxx
+++ b/unotools/inc/unotools/readwritemutexguard.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: readwritemutexguard.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/unotools/inc/unotools/regoptions.hxx b/unotools/inc/unotools/regoptions.hxx
index 3b0f6c760b1f..1cca531886ca 100644
--- a/unotools/inc/unotools/regoptions.hxx
+++ b/unotools/inc/unotools/regoptions.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: regoptions.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/unotools/inc/unotools/regpathhelper.hxx b/unotools/inc/unotools/regpathhelper.hxx
index 4dd2b5fbeb79..1f48dda63fc8 100644
--- a/unotools/inc/unotools/regpathhelper.hxx
+++ b/unotools/inc/unotools/regpathhelper.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: regpathhelper.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/unotools/inc/unotools/saveopt.hxx b/unotools/inc/unotools/saveopt.hxx
index bb50cadafb1d..dad0cd742323 100644
--- a/unotools/inc/unotools/saveopt.hxx
+++ b/unotools/inc/unotools/saveopt.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: saveopt.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/unotools/inc/unotools/searchopt.hxx b/unotools/inc/unotools/searchopt.hxx
index 4f53a1e050b0..ed4110011df7 100644
--- a/unotools/inc/unotools/searchopt.hxx
+++ b/unotools/inc/unotools/searchopt.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: searchopt.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/unotools/inc/unotools/securityoptions.hxx b/unotools/inc/unotools/securityoptions.hxx
index bbca1770b836..ddeed4b94520 100644
--- a/unotools/inc/unotools/securityoptions.hxx
+++ b/unotools/inc/unotools/securityoptions.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: securityoptions.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/unotools/inc/unotools/sharedunocomponent.hxx b/unotools/inc/unotools/sharedunocomponent.hxx
index 10c552c38336..70c01b0cc0af 100644
--- a/unotools/inc/unotools/sharedunocomponent.hxx
+++ b/unotools/inc/unotools/sharedunocomponent.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: sharedunocomponent.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/unotools/inc/unotools/sourceviewconfig.hxx b/unotools/inc/unotools/sourceviewconfig.hxx
index cc28bd3dae61..5f66d6d05c76 100644
--- a/unotools/inc/unotools/sourceviewconfig.hxx
+++ b/unotools/inc/unotools/sourceviewconfig.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: sourceviewconfig.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/unotools/inc/unotools/startoptions.hxx b/unotools/inc/unotools/startoptions.hxx
index a23fb08fce6b..4fbb2c091864 100644
--- a/unotools/inc/unotools/startoptions.hxx
+++ b/unotools/inc/unotools/startoptions.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: startoptions.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/unotools/inc/unotools/streamhelper.hxx b/unotools/inc/unotools/streamhelper.hxx
index 0dd6534eaeaa..d6250e7b0306 100644
--- a/unotools/inc/unotools/streamhelper.hxx
+++ b/unotools/inc/unotools/streamhelper.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: streamhelper.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/unotools/inc/unotools/streamsection.hxx b/unotools/inc/unotools/streamsection.hxx
index 4fa2e19b6e07..4c51ed648eb1 100644
--- a/unotools/inc/unotools/streamsection.hxx
+++ b/unotools/inc/unotools/streamsection.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: streamsection.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/unotools/inc/unotools/streamwrap.hxx b/unotools/inc/unotools/streamwrap.hxx
index 714129540412..d8544cc25f3e 100644
--- a/unotools/inc/unotools/streamwrap.hxx
+++ b/unotools/inc/unotools/streamwrap.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: streamwrap.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/unotools/inc/unotools/syslocale.hxx b/unotools/inc/unotools/syslocale.hxx
index adce66b7e84a..5d653297fde1 100644
--- a/unotools/inc/unotools/syslocale.hxx
+++ b/unotools/inc/unotools/syslocale.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: syslocale.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,6 +33,7 @@
 #include <unotools/charclass.hxx>
 #include <sal/types.h>
 #include <i18npool/lang.h>
+#include <rtl/textenc.h>
 
 class SvtSysLocale_Impl;
 class SvtSysLocaleOptions;
@@ -79,6 +77,12 @@ public:
             LanguageType                GetLanguage() const;
             com::sun::star::lang::Locale GetUILocale() const;
             LanguageType                GetUILanguage() const;
+
+    /** Get the best MIME encoding matching the system locale, or if that isn't
+        determinable one that matches the UI locale, or UTF8 if everything else
+        fails.
+     */
+    static  rtl_TextEncoding    GetBestMimeEncoding();
 };
 
 #endif  // INCLUDED_SVTOOLS_SYSLOCALE_HXX
diff --git a/unotools/inc/unotools/syslocaleoptions.hxx b/unotools/inc/unotools/syslocaleoptions.hxx
index b417e00eec12..63e271f1c435 100755..100644
--- a/unotools/inc/unotools/syslocaleoptions.hxx
+++ b/unotools/inc/unotools/syslocaleoptions.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: syslocaleoptions.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/unotools/inc/unotools/tempfile.hxx b/unotools/inc/unotools/tempfile.hxx
index fcd24a20be48..29ca06a23c71 100644
--- a/unotools/inc/unotools/tempfile.hxx
+++ b/unotools/inc/unotools/tempfile.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: tempfile.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/unotools/inc/unotools/textsearch.hxx b/unotools/inc/unotools/textsearch.hxx
index cbcaa9829674..e4cd095fcc14 100644
--- a/unotools/inc/unotools/textsearch.hxx
+++ b/unotools/inc/unotools/textsearch.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: textsearch.hxx,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/unotools/inc/unotools/transliterationwrapper.hxx b/unotools/inc/unotools/transliterationwrapper.hxx
index 3c5baf56b801..acd3bbf5dcf4 100644
--- a/unotools/inc/unotools/transliterationwrapper.hxx
+++ b/unotools/inc/unotools/transliterationwrapper.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: transliterationwrapper.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/unotools/inc/unotools/ucbhelper.hxx b/unotools/inc/unotools/ucbhelper.hxx
index 59536df150c0..687868adbdb4 100644
--- a/unotools/inc/unotools/ucbhelper.hxx
+++ b/unotools/inc/unotools/ucbhelper.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: ucbhelper.hxx,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/unotools/inc/unotools/ucblockbytes.hxx b/unotools/inc/unotools/ucblockbytes.hxx
index 5600cfdb16f4..2ba0a683745a 100644
--- a/unotools/inc/unotools/ucblockbytes.hxx
+++ b/unotools/inc/unotools/ucblockbytes.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: ucblockbytes.hxx,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/unotools/inc/unotools/ucbstreamhelper.hxx b/unotools/inc/unotools/ucbstreamhelper.hxx
index 4bc9686ff587..2c06d925ddb2 100644
--- a/unotools/inc/unotools/ucbstreamhelper.hxx
+++ b/unotools/inc/unotools/ucbstreamhelper.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: ucbstreamhelper.hxx,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/unotools/inc/unotools/undoopt.hxx b/unotools/inc/unotools/undoopt.hxx
index 288ec3c6b5de..319f5f4edf32 100644
--- a/unotools/inc/unotools/undoopt.hxx
+++ b/unotools/inc/unotools/undoopt.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: undoopt.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/unotools/inc/unotools/unotoolsdllapi.h b/unotools/inc/unotools/unotoolsdllapi.h
index 6aefb84432ec..521c9c3af3f6 100644
--- a/unotools/inc/unotools/unotoolsdllapi.h
+++ b/unotools/inc/unotools/unotoolsdllapi.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: unotoolsdllapi.h,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/unotools/inc/unotools/unotunnelhelper.hxx b/unotools/inc/unotools/unotunnelhelper.hxx
index cfe6084577e6..ec4f1243f4d9 100644
--- a/unotools/inc/unotools/unotunnelhelper.hxx
+++ b/unotools/inc/unotools/unotunnelhelper.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: unotunnelhelper.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/unotools/inc/unotools/useroptions.hxx b/unotools/inc/unotools/useroptions.hxx
index 67fd3e5bbf35..020ddd657eaf 100644
--- a/unotools/inc/unotools/useroptions.hxx
+++ b/unotools/inc/unotools/useroptions.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: useroptions.hxx,v $
- * $Revision: 1.2.312.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/inc/unotools/useroptions_const.hxx b/unotools/inc/unotools/useroptions_const.hxx
index 4dbd6da8bba3..34a12f6519bf 100644
--- a/unotools/inc/unotools/useroptions_const.hxx
+++ b/unotools/inc/unotools/useroptions_const.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: useroptions_const.hxx,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/19 11:17:50 $
+ * 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/unotools/inc/unotools/viewoptions.hxx b/unotools/inc/unotools/viewoptions.hxx
index 07f4da9e3159..6fa60ea3fb05 100644
--- a/unotools/inc/unotools/viewoptions.hxx
+++ b/unotools/inc/unotools/viewoptions.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: viewoptions.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/unotools/inc/unotools/workingsetoptions.hxx b/unotools/inc/unotools/workingsetoptions.hxx
index 9a422e25cc32..04a4a0bea6cb 100644
--- a/unotools/inc/unotools/workingsetoptions.hxx
+++ b/unotools/inc/unotools/workingsetoptions.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: workingsetoptions.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/unotools/inc/unotools/xmlaccelcfg.hxx b/unotools/inc/unotools/xmlaccelcfg.hxx
index 8b975f2a26ff..db561660d3c2 100644
--- a/unotools/inc/unotools/xmlaccelcfg.hxx
+++ b/unotools/inc/unotools/xmlaccelcfg.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: xmlaccelcfg.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/unotools/qa/complex/tempfile/TempFileTest.java b/unotools/qa/complex/tempfile/TempFileTest.java
index cc3cc19231b0..fa50bdeee043 100644
--- a/unotools/qa/complex/tempfile/TempFileTest.java
+++ b/unotools/qa/complex/tempfile/TempFileTest.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: TempFileTest.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/unotools/qa/complex/tempfile/TempFileUnitTest.java b/unotools/qa/complex/tempfile/TempFileUnitTest.java
index 3bac1809af7b..5cd0b7292105 100644
--- a/unotools/qa/complex/tempfile/TempFileUnitTest.java
+++ b/unotools/qa/complex/tempfile/TempFileUnitTest.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: TempFileUnitTest.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/unotools/qa/complex/tempfile/Test01.java b/unotools/qa/complex/tempfile/Test01.java
index 350127158033..dbf3d6c15de2 100644
--- a/unotools/qa/complex/tempfile/Test01.java
+++ b/unotools/qa/complex/tempfile/Test01.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: Test01.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/unotools/qa/complex/tempfile/Test02.java b/unotools/qa/complex/tempfile/Test02.java
index 9667544afd5b..18ca4de2e04b 100644
--- a/unotools/qa/complex/tempfile/Test02.java
+++ b/unotools/qa/complex/tempfile/Test02.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: Test02.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/unotools/qa/complex/tempfile/TestHelper.java b/unotools/qa/complex/tempfile/TestHelper.java
index ce7ba959096e..6edc2c362fa8 100644
--- a/unotools/qa/complex/tempfile/TestHelper.java
+++ b/unotools/qa/complex/tempfile/TestHelper.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: TestHelper.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/unotools/qa/complex/tempfile/makefile.mk b/unotools/qa/complex/tempfile/makefile.mk
index 0a8f51e7e71b..13d66ca3edd1 100644
--- a/unotools/qa/complex/tempfile/makefile.mk
+++ b/unotools/qa/complex/tempfile/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.3.20.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/accessibility/accessiblerelationsethelper.cxx b/unotools/source/accessibility/accessiblerelationsethelper.cxx
index 419a072678df..60e807ee9320 100644
--- a/unotools/source/accessibility/accessiblerelationsethelper.cxx
+++ b/unotools/source/accessibility/accessiblerelationsethelper.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: accessiblerelationsethelper.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/unotools/source/accessibility/accessiblestatesethelper.cxx b/unotools/source/accessibility/accessiblestatesethelper.cxx
index 71882d66278b..be7bf3fbeb28 100644
--- a/unotools/source/accessibility/accessiblestatesethelper.cxx
+++ b/unotools/source/accessibility/accessiblestatesethelper.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: accessiblestatesethelper.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/unotools/source/accessibility/makefile.mk b/unotools/source/accessibility/makefile.mk
index 7ed2e2bffe74..59536b12e517 100644
--- a/unotools/source/accessibility/makefile.mk
+++ b/unotools/source/accessibility/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/unotools/source/config/accelcfg.cxx b/unotools/source/config/accelcfg.cxx
index f911b36e83fe..fc0e6108138b 100644
--- a/unotools/source/config/accelcfg.cxx
+++ b/unotools/source/config/accelcfg.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: accelcfg.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/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index d2a08a766e20..b2e1bf1739f8 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.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: bootstrap.cxx,v $
- * $Revision: 1.28.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/config/cacheoptions.cxx b/unotools/source/config/cacheoptions.cxx
index dc8031ea0078..2b2b612274ac 100644
--- a/unotools/source/config/cacheoptions.cxx
+++ b/unotools/source/config/cacheoptions.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: cacheoptions.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/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 421b201d98c0..fd4fb07e7918 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.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: cmdoptions.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/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 46967eb7b43d..61ebe0211817 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.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: compatibility.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/unotools/source/config/configitem.cxx b/unotools/source/config/configitem.cxx
index 3d70f99f4ec0..eda74f873b5f 100644
--- a/unotools/source/config/configitem.cxx
+++ b/unotools/source/config/configitem.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: configitem.cxx,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/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 6a5d163871cd..5f16733b5249 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.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: configmgr.cxx,v $
- * $Revision: 1.47.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/config/confignode.cxx b/unotools/source/config/confignode.cxx
index 4b1b9fe272db..f196ebba0863 100644
--- a/unotools/source/config/confignode.cxx
+++ b/unotools/source/config/confignode.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: confignode.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,6 +38,7 @@
 #include <com/sun/star/lang/XComponent.hpp>
 #include <com/sun/star/util/XStringEscape.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/container/XNamed.hpp>
 #include <comphelper/extract.hxx>
 #include <rtl/string.hxx>
 #if OSL_DEBUG_LEVEL > 0
@@ -139,6 +137,22 @@ namespace utl
     }
 
     //------------------------------------------------------------------------
+    ::rtl::OUString OConfigurationNode::getLocalName() const
+    {
+        ::rtl::OUString sLocalName;
+        try
+        {
+            Reference< XNamed > xNamed( m_xDirectAccess, UNO_QUERY_THROW );
+            sLocalName = xNamed->getName();
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        return sLocalName;
+    }
+
+    //------------------------------------------------------------------------
     ::rtl::OUString OConfigurationNode::normalizeName(const ::rtl::OUString& _rName, NAMEORIGIN _eOrigin) const
     {
         ::rtl::OUString sName(_rName);
@@ -155,13 +169,9 @@ namespace utl
                     else
                         sName = xEscaper->unescapeString(sName);
                 }
-                catch(IllegalArgumentException&)
-                {
-                    OSL_ENSURE(sal_False, "OConfigurationNode::normalizeName: illegal argument (caught an exception saying so)!");
-                }
                 catch(Exception&)
                 {
-                    OSL_ENSURE(sal_False, "OConfigurationNode::normalizeName: caught an exception!");
+                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
         }
@@ -455,16 +465,9 @@ namespace utl
                 aReturn = m_xHierarchyAccess->getByHierarchicalName(_rPath);
             }
         }
-        catch(NoSuchElementException& e)
+        catch(const NoSuchElementException&)
         {
-            #if OSL_DEBUG_LEVEL > 0
-            rtl::OStringBuffer aBuf( 256 );
-            aBuf.append("OConfigurationNode::getNodeValue: caught a NoSuchElementException while trying to open ");
-            aBuf.append( rtl::OUStringToOString( e.Message, RTL_TEXTENCODING_ASCII_US ) );
-            OSL_ENSURE(sal_False, aBuf.getStr());
-            #else
-            (void)e;
-            #endif
+            DBG_UNHANDLED_EXCEPTION();
         }
         return aReturn;
     }
@@ -487,7 +490,7 @@ namespace utl
                 }
                 catch(Exception&)
                 {
-                    OSL_ENSURE(sal_False, "OConfigurationNode::cloneAsRoot: could not retrieve the node path!");
+                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
 
@@ -548,13 +551,9 @@ namespace utl
             m_xCommitter->commitChanges();
             return sal_True;
         }
-        catch(WrappedTargetException&)
-        {
-            OSL_ENSURE(sal_False, "OConfigurationTreeRoot::commit: caught a WrappedTargetException!");
-        }
-        catch(RuntimeException&)
+        catch(const Exception&)
         {
-            OSL_ENSURE(sal_False, "OConfigurationTreeRoot::commit: caught a RuntimeException!");
+            DBG_UNHANDLED_EXCEPTION();
         }
         return sal_False;
     }
@@ -591,7 +590,7 @@ namespace utl
             }
             catch(const Exception&)
             {
-                OSL_ENSURE(sal_False, "OConfigurationTreeRoot::createWithProvider: unable to check the service conformance of the provider given!");
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
 #endif
@@ -635,15 +634,9 @@ namespace utl
                             try { xComp->dispose(); } catch(Exception&) { }
                     }
                 }
-                catch(Exception& e)
+                catch(const Exception&)
                 {
-                #if OSL_DEBUG_LEVEL > 0
-                    ::rtl::OString sMessage( "OConfigurationTreeRoot::createWithProvider: caught an exception while creating the access object!\nmessage:\n" );
-                    sMessage += ::rtl::OString( e.Message.getStr(), e.Message.getLength(), RTL_TEXTENCODING_ASCII_US );
-                    OSL_ENSURE( sal_False, sMessage.getStr() );
-                #else
-                    (void)e;
-                #endif
+                    DBG_UNHANDLED_EXCEPTION();
                 }
             }
             bTryAgain = CM_PREFER_UPDATABLE == _eMode;
@@ -670,9 +663,9 @@ namespace utl
                 if (xProviderAsFac.is())
                     return createWithProvider(xProviderAsFac, _rPath, _nDepth, _eMode, _bLazyWrite);
             }
-            catch(Exception&)
+            catch(const Exception&)
             {
-                OSL_ENSURE(sal_False, "OConfigurationTreeRoot::createWithServiceFactory: error while instantiating the provider service!");
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
         return OConfigurationTreeRoot();
diff --git a/unotools/source/config/configpathes.cxx b/unotools/source/config/configpathes.cxx
index 3e90823a7975..dc66854a8d43 100644
--- a/unotools/source/config/configpathes.cxx
+++ b/unotools/source/config/configpathes.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: configpathes.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/unotools/source/config/configvaluecontainer.cxx b/unotools/source/config/configvaluecontainer.cxx
index 6c7962cc09c1..c04f29428bf5 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.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: configvaluecontainer.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/unotools/source/config/defaultoptions.cxx b/unotools/source/config/defaultoptions.cxx
index baaa4a220a93..1567bd1b841d 100644
--- a/unotools/source/config/defaultoptions.cxx
+++ b/unotools/source/config/defaultoptions.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: defaultoptions.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/unotools/source/config/docinfohelper.cxx b/unotools/source/config/docinfohelper.cxx
index bd2fd4fd24ea..677432e1f7d3 100644
--- a/unotools/source/config/docinfohelper.cxx
+++ b/unotools/source/config/docinfohelper.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: docinfohelper.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/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index d3fca4350a67..6ef88002a442 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.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: dynamicmenuoptions.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/unotools/source/config/eventcfg.cxx b/unotools/source/config/eventcfg.cxx
index 3155f4ac2fa7..a07c99b70381 100644
--- a/unotools/source/config/eventcfg.cxx
+++ b/unotools/source/config/eventcfg.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: eventcfg.cxx,v $
- * $Revision: 1.8.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/config/extendedsecurityoptions.cxx b/unotools/source/config/extendedsecurityoptions.cxx
index b4d21f79246b..716733e2d090 100644
--- a/unotools/source/config/extendedsecurityoptions.cxx
+++ b/unotools/source/config/extendedsecurityoptions.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: extendedsecurityoptions.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/unotools/source/config/fltrcfg.cxx b/unotools/source/config/fltrcfg.cxx
index a0870ff6a8a5..f9a12e900b7d 100644
--- a/unotools/source/config/fltrcfg.cxx
+++ b/unotools/source/config/fltrcfg.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: fltrcfg.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/unotools/source/config/fontcfg.cxx b/unotools/source/config/fontcfg.cxx
index 3ee556f372c7..a1d287337bea 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.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: fontcfg.cxx,v $
- * $Revision: 1.49.114.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/config/fontoptions.cxx b/unotools/source/config/fontoptions.cxx
index ac7fd2a94b62..5853dd36af98 100644
--- a/unotools/source/config/fontoptions.cxx
+++ b/unotools/source/config/fontoptions.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: fontoptions.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/unotools/source/config/historyoptions.cxx b/unotools/source/config/historyoptions.cxx
index 0a28884e24c2..5cb74f9bbf35 100644
--- a/unotools/source/config/historyoptions.cxx
+++ b/unotools/source/config/historyoptions.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: historyoptions.cxx,v $
- * $Revision: 1.21.234.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/config/inetoptions.cxx b/unotools/source/config/inetoptions.cxx
index 13c72d73152d..15bf425af744 100644
--- a/unotools/source/config/inetoptions.cxx
+++ b/unotools/source/config/inetoptions.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: inetoptions.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/unotools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx
index 54dce3d7094b..310b52f8c98f 100644
--- a/unotools/source/config/internaloptions.cxx
+++ b/unotools/source/config/internaloptions.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: internaloptions.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/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 214b5a9b4276..48b1decc4983 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.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: itemholder1.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/unotools/source/config/itemholder1.hxx b/unotools/source/config/itemholder1.hxx
index 89a5bc3da299..8e7fd285cc0a 100644
--- a/unotools/source/config/itemholder1.hxx
+++ b/unotools/source/config/itemholder1.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: itemholder1.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/unotools/source/config/javaoptions.cxx b/unotools/source/config/javaoptions.cxx
index 0eec89a31782..8c41aac2d3de 100644
--- a/unotools/source/config/javaoptions.cxx
+++ b/unotools/source/config/javaoptions.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: javaoptions.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/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index d4eff83efec6..35e0fb8af223 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.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: lingucfg.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/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx
index 2ac2524e7d08..f4b8bbd087ef 100644
--- a/unotools/source/config/localisationoptions.cxx
+++ b/unotools/source/config/localisationoptions.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: localisationoptions.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/unotools/source/config/makefile.mk b/unotools/source/config/makefile.mk
index de87d9503339..27e8f67f8888 100644
--- a/unotools/source/config/makefile.mk
+++ b/unotools/source/config/makefile.mk
@@ -1,15 +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: 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/unotools/source/config/menuoptions.cxx b/unotools/source/config/menuoptions.cxx
index c885d5a1e81c..2c5756c2140c 100644
--- a/unotools/source/config/menuoptions.cxx
+++ b/unotools/source/config/menuoptions.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: menuoptions.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/unotools/source/config/misccfg.cxx b/unotools/source/config/misccfg.cxx
index a1c905d292f3..e2cc8686d444 100644
--- a/unotools/source/config/misccfg.cxx
+++ b/unotools/source/config/misccfg.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: misccfg.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/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx
index f966d4415558..afce713ccc49 100644
--- a/unotools/source/config/moduleoptions.cxx
+++ b/unotools/source/config/moduleoptions.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: moduleoptions.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/unotools/source/config/options.cxx b/unotools/source/config/options.cxx
index 7c004e1475a6..c65fd09efd0c 100755..100644
--- a/unotools/source/config/options.cxx
+++ b/unotools/source/config/options.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: options.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/unotools/source/config/optionsdlg.cxx b/unotools/source/config/optionsdlg.cxx
index 5ac76af8efd7..cb98e8514358 100644
--- a/unotools/source/config/optionsdlg.cxx
+++ b/unotools/source/config/optionsdlg.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: optionsdlg.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/unotools/source/config/optionsdrawinglayer.cxx b/unotools/source/config/optionsdrawinglayer.cxx
index 7bfefdcbef09..c15f5a97e435 100644
--- a/unotools/source/config/optionsdrawinglayer.cxx
+++ b/unotools/source/config/optionsdrawinglayer.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: optionsdrawinglayer.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/unotools/source/config/pathoptions.cxx b/unotools/source/config/pathoptions.cxx
index 5b74ec1db879..2ae6f0c97f0c 100644
--- a/unotools/source/config/pathoptions.cxx
+++ b/unotools/source/config/pathoptions.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: pathoptions.cxx,v $
- * $Revision: 1.81 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/config/printwarningoptions.cxx b/unotools/source/config/printwarningoptions.cxx
index 29dfabd45ea7..d723b3c068d4 100644
--- a/unotools/source/config/printwarningoptions.cxx
+++ b/unotools/source/config/printwarningoptions.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: printwarningoptions.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/unotools/source/config/regoptions.cxx b/unotools/source/config/regoptions.cxx
index b0f41602da2e..81f089919dfd 100644
--- a/unotools/source/config/regoptions.cxx
+++ b/unotools/source/config/regoptions.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: regoptions.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/unotools/source/config/saveopt.cxx b/unotools/source/config/saveopt.cxx
index 49e01c0457e9..2b739316a3f9 100644
--- a/unotools/source/config/saveopt.cxx
+++ b/unotools/source/config/saveopt.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: saveopt.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/unotools/source/config/searchopt.cxx b/unotools/source/config/searchopt.cxx
index 01fbd9a3216d..f9318f150589 100644
--- a/unotools/source/config/searchopt.cxx
+++ b/unotools/source/config/searchopt.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: searchopt.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/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index ca2968d3a807..526e33d1917c 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.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: securityoptions.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/unotools/source/config/sourceviewconfig.cxx b/unotools/source/config/sourceviewconfig.cxx
index 3de0276643bf..cb37db74138d 100644
--- a/unotools/source/config/sourceviewconfig.cxx
+++ b/unotools/source/config/sourceviewconfig.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: sourceviewconfig.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/unotools/source/config/startoptions.cxx b/unotools/source/config/startoptions.cxx
index 172a931231fe..d6012c0ad84f 100644
--- a/unotools/source/config/startoptions.cxx
+++ b/unotools/source/config/startoptions.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: startoptions.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/unotools/source/config/syslocaleoptions.cxx b/unotools/source/config/syslocaleoptions.cxx
index 7b14c9cb8c2f..35333b0db6a8 100755..100644
--- a/unotools/source/config/syslocaleoptions.cxx
+++ b/unotools/source/config/syslocaleoptions.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: syslocaleoptions.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/unotools/source/config/undoopt.cxx b/unotools/source/config/undoopt.cxx
index c2c79120995f..25cb7837008f 100644
--- a/unotools/source/config/undoopt.cxx
+++ b/unotools/source/config/undoopt.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: undoopt.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/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx
index e06d6a794e20..6c63bbfee34b 100644
--- a/unotools/source/config/useroptions.cxx
+++ b/unotools/source/config/useroptions.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: useroptions.cxx,v $
- * $Revision: 1.24.238.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx
index 9ef8fc45d570..7f2250c611fc 100644
--- a/unotools/source/config/viewoptions.cxx
+++ b/unotools/source/config/viewoptions.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: viewoptions.cxx,v $
- * $Revision: 1.29.236.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/config/workingsetoptions.cxx b/unotools/source/config/workingsetoptions.cxx
index 6b17a63dad4d..aebac3377510 100644
--- a/unotools/source/config/workingsetoptions.cxx
+++ b/unotools/source/config/workingsetoptions.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: workingsetoptions.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/unotools/source/config/xmlaccelcfg.cxx b/unotools/source/config/xmlaccelcfg.cxx
index b1c3f1e31e2d..a446c60bbdc5 100644
--- a/unotools/source/config/xmlaccelcfg.cxx
+++ b/unotools/source/config/xmlaccelcfg.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: xmlaccelcfg.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/unotools/source/i18n/calendarwrapper.cxx b/unotools/source/i18n/calendarwrapper.cxx
index b56175af7e41..ebf8146ef0fa 100644
--- a/unotools/source/i18n/calendarwrapper.cxx
+++ b/unotools/source/i18n/calendarwrapper.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: calendarwrapper.cxx,v $
- * $Revision: 1.15.24.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/i18n/charclass.cxx b/unotools/source/i18n/charclass.cxx
index 5b411d1bb519..e82fd7a603ad 100644
--- a/unotools/source/i18n/charclass.cxx
+++ b/unotools/source/i18n/charclass.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: charclass.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/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx
index 99bb28cf6171..f4d679607424 100644
--- a/unotools/source/i18n/collatorwrapper.cxx
+++ b/unotools/source/i18n/collatorwrapper.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: collatorwrapper.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/unotools/source/i18n/intlwrapper.cxx b/unotools/source/i18n/intlwrapper.cxx
index e961861da824..9f52cc60bfeb 100644
--- a/unotools/source/i18n/intlwrapper.cxx
+++ b/unotools/source/i18n/intlwrapper.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: intlwrapper.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/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index fa70cc3dda81..8bbe6f182862 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.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: localedatawrapper.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/unotools/source/i18n/makefile.mk b/unotools/source/i18n/makefile.mk
index eab1aeb8dc48..bb21d65625cb 100644
--- a/unotools/source/i18n/makefile.mk
+++ b/unotools/source/i18n/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.21 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/i18n/nativenumberwrapper.cxx b/unotools/source/i18n/nativenumberwrapper.cxx
index f0efd10920d7..f6df87615c6c 100644
--- a/unotools/source/i18n/nativenumberwrapper.cxx
+++ b/unotools/source/i18n/nativenumberwrapper.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: nativenumberwrapper.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/unotools/source/i18n/numberformatcodewrapper.cxx b/unotools/source/i18n/numberformatcodewrapper.cxx
index 15280b345431..2638e6730164 100644
--- a/unotools/source/i18n/numberformatcodewrapper.cxx
+++ b/unotools/source/i18n/numberformatcodewrapper.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: numberformatcodewrapper.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/unotools/source/i18n/readwritemutexguard.cxx b/unotools/source/i18n/readwritemutexguard.cxx
index de614d120e5d..6adc5bab14bf 100644
--- a/unotools/source/i18n/readwritemutexguard.cxx
+++ b/unotools/source/i18n/readwritemutexguard.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: readwritemutexguard.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/unotools/source/i18n/textsearch.cxx b/unotools/source/i18n/textsearch.cxx
index 10909dd32307..3f722adb0dba 100644
--- a/unotools/source/i18n/textsearch.cxx
+++ b/unotools/source/i18n/textsearch.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: textsearch.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/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index 7647a6abc345..062e34286d4b 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.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: transliterationwrapper.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/unotools/source/misc/atom.cxx b/unotools/source/misc/atom.cxx
index 03a459326d08..3d7ccd1dd10e 100644
--- a/unotools/source/misc/atom.cxx
+++ b/unotools/source/misc/atom.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: atom.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/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 9f0eaa055da8..21c50d9ec7f1 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.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: componentresmodule.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/unotools/source/misc/datetime.cxx b/unotools/source/misc/datetime.cxx
index cab276309542..6bfd053b3fe9 100644
--- a/unotools/source/misc/datetime.cxx
+++ b/unotools/source/misc/datetime.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: datetime.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/unotools/source/misc/desktopterminationobserver.cxx b/unotools/source/misc/desktopterminationobserver.cxx
index d30ea7cc281d..23d5089f545e 100644
--- a/unotools/source/misc/desktopterminationobserver.cxx
+++ b/unotools/source/misc/desktopterminationobserver.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: desktopterminationobserver.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/unotools/source/misc/eventlisteneradapter.cxx b/unotools/source/misc/eventlisteneradapter.cxx
index b4c344e2cfd3..0e14a54cd3c0 100644
--- a/unotools/source/misc/eventlisteneradapter.cxx
+++ b/unotools/source/misc/eventlisteneradapter.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: eventlisteneradapter.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/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 5c4f902fbd55..1a31272a483c 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.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: fontcvt.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/unotools/source/misc/fontdefs.cxx b/unotools/source/misc/fontdefs.cxx
index 15e67c44f001..4a3532b44659 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.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/unotools/source/misc/makefile.mk b/unotools/source/misc/makefile.mk
index d588a216c159..46e173b9a055 100644
--- a/unotools/source/misc/makefile.mk
+++ b/unotools/source/misc/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.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/misc/sharedunocomponent.cxx b/unotools/source/misc/sharedunocomponent.cxx
index a426a6662fa5..5402ebc06085 100644
--- a/unotools/source/misc/sharedunocomponent.cxx
+++ b/unotools/source/misc/sharedunocomponent.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: sharedunocomponent.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/unotools/source/misc/syslocale.cxx b/unotools/source/misc/syslocale.cxx
index 8e9d75c6ce0c..f51ef35512cb 100644
--- a/unotools/source/misc/syslocale.cxx
+++ b/unotools/source/misc/syslocale.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: syslocale.cxx,v $
- * $Revision: 1.11 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,6 +36,9 @@
 #include <unotools/localedatawrapper.hxx>
 #include <comphelper/processfactory.hxx>
 #include <i18npool/mslangid.hxx>
+#include <rtl/tencinfo.h>
+#include <rtl/locale.h>
+#include <osl/nlsupport.h>
 
 using namespace osl;
 using namespace com::sun::star;
@@ -187,4 +187,28 @@ LanguageType SvtSysLocale::GetUILanguage() const
     return pImpl->aSysLocaleOptions.GetRealUILanguage();
 }
 
+//------------------------------------------------------------------------
+
+// static
+rtl_TextEncoding SvtSysLocale::GetBestMimeEncoding()
+{
+    const sal_Char* pCharSet = rtl_getBestMimeCharsetFromTextEncoding(
+            gsl_getSystemTextEncoding() );
+    if ( !pCharSet )
+    {
+        // If the system locale is unknown to us, e.g. LC_ALL=xx, match the UI
+        // language if possible.
+        ::com::sun::star::lang::Locale aLocale( SvtSysLocale().GetUILocale() );
+        rtl_Locale * pLocale = rtl_locale_register( aLocale.Language.getStr(),
+                aLocale.Country.getStr(), aLocale.Variant.getStr() );
+        rtl_TextEncoding nEnc = osl_getTextEncodingFromLocale( pLocale );
+        pCharSet = rtl_getBestMimeCharsetFromTextEncoding( nEnc );
+    }
+    rtl_TextEncoding nRet;
+    if ( pCharSet )
+        nRet = rtl_getTextEncodingFromMimeCharset( pCharSet );
+    else
+        nRet = RTL_TEXTENCODING_UTF8;
+    return nRet;
+}
 
diff --git a/unotools/source/processfactory/componentfactory.cxx b/unotools/source/processfactory/componentfactory.cxx
index 690cd86b8124..67055ee215ca 100644
--- a/unotools/source/processfactory/componentfactory.cxx
+++ b/unotools/source/processfactory/componentfactory.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: componentfactory.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/unotools/source/processfactory/makefile.mk b/unotools/source/processfactory/makefile.mk
index de27f67c982f..0e1e4aeacca8 100644
--- a/unotools/source/processfactory/makefile.mk
+++ b/unotools/source/processfactory/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.6 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/processfactory/processfactory.cxx b/unotools/source/processfactory/processfactory.cxx
index c8124bf106c8..e1f0cc876dce 100644
--- a/unotools/source/processfactory/processfactory.cxx
+++ b/unotools/source/processfactory/processfactory.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: processfactory.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/unotools/source/property/makefile.mk b/unotools/source/property/makefile.mk
index 292ef8cad062..c53f5a8d2cf5 100644
--- a/unotools/source/property/makefile.mk
+++ b/unotools/source/property/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/unotools/source/property/propertysethelper.cxx b/unotools/source/property/propertysethelper.cxx
index 28dc143873d6..fac76bbe882a 100644
--- a/unotools/source/property/propertysethelper.cxx
+++ b/unotools/source/property/propertysethelper.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: propertysethelper.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/unotools/source/property/propertysetinfo.cxx b/unotools/source/property/propertysetinfo.cxx
index ced5ae10a9d7..a5b8381de942 100644
--- a/unotools/source/property/propertysetinfo.cxx
+++ b/unotools/source/property/propertysetinfo.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: propertysetinfo.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/unotools/source/streaming/makefile.mk b/unotools/source/streaming/makefile.mk
index db53632a7170..b70d7fea4091 100644
--- a/unotools/source/streaming/makefile.mk
+++ b/unotools/source/streaming/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/streaming/streamhelper.cxx b/unotools/source/streaming/streamhelper.cxx
index f21872c67a5b..0ca20cf1c5e2 100644
--- a/unotools/source/streaming/streamhelper.cxx
+++ b/unotools/source/streaming/streamhelper.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: streamhelper.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/unotools/source/streaming/streamwrap.cxx b/unotools/source/streaming/streamwrap.cxx
index b9f03b022d6e..eefaa7498070 100644
--- a/unotools/source/streaming/streamwrap.cxx
+++ b/unotools/source/streaming/streamwrap.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: streamwrap.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/unotools/source/ucbhelper/XTempFile.hxx b/unotools/source/ucbhelper/XTempFile.hxx
index 34aa18f04829..115f6cf823a7 100644
--- a/unotools/source/ucbhelper/XTempFile.hxx
+++ b/unotools/source/ucbhelper/XTempFile.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: XTempFile.hxx,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/unotools/source/ucbhelper/localfilehelper.cxx b/unotools/source/ucbhelper/localfilehelper.cxx
index 81ee866eda2b..5ddd1f811923 100644
--- a/unotools/source/ucbhelper/localfilehelper.cxx
+++ b/unotools/source/ucbhelper/localfilehelper.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: localfilehelper.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/unotools/source/ucbhelper/makefile.mk b/unotools/source/ucbhelper/makefile.mk
index 850a6ea532a3..57088c69ca5c 100644
--- a/unotools/source/ucbhelper/makefile.mk
+++ b/unotools/source/ucbhelper/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.17 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/ucbhelper/progresshandlerwrap.cxx b/unotools/source/ucbhelper/progresshandlerwrap.cxx
index 540ded03e90b..7fdbdacabc4b 100644
--- a/unotools/source/ucbhelper/progresshandlerwrap.cxx
+++ b/unotools/source/ucbhelper/progresshandlerwrap.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: progresshandlerwrap.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/unotools/source/ucbhelper/tempfile.cxx b/unotools/source/ucbhelper/tempfile.cxx
index 36d738042400..e77dc529e410 100644
--- a/unotools/source/ucbhelper/tempfile.cxx
+++ b/unotools/source/ucbhelper/tempfile.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: tempfile.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/unotools/source/ucbhelper/ucbhelper.cxx b/unotools/source/ucbhelper/ucbhelper.cxx
index 2b301efc4e52..4160f2f2f443 100644
--- a/unotools/source/ucbhelper/ucbhelper.cxx
+++ b/unotools/source/ucbhelper/ucbhelper.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: ucbhelper.cxx,v $
- * $Revision: 1.24 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -46,15 +43,13 @@
 #include <com/sun/star/ucb/XAnyCompareFactory.hpp>
 #include <com/sun/star/ucb/XCommandInfo.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
+#include <com/sun/star/ucb/ContentInfo.hpp>
 #include <com/sun/star/ucb/ContentInfoAttribute.hpp>
-#include <com/sun/star/ucb/XContentCreator.hpp>
 #include <com/sun/star/ucb/XDynamicResultSet.hpp>
 #include <com/sun/star/ucb/XSortedDynamicResultSetFactory.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/container/XChild.hpp>
-#ifndef _COM_SUN_STAR_UCB_INTERACTIVEIODEXCEPTION_HPP_
 #include <com/sun/star/ucb/InteractiveIOException.hpp>
-#endif
 #include <com/sun/star/task/XInteractionHandler.hpp>
 #include <ucbhelper/commandenvironment.hxx>
 #include <ucbhelper/content.hxx>
@@ -489,11 +484,7 @@ sal_Bool UCBContentHelper::CanMakeFolder( const String& rFolder )
     try
     {
         Content aCnt( rFolder, uno::Reference< XCommandEnvironment > () );
-        uno::Reference< XContentCreator > xCreator = uno::Reference< XContentCreator >( aCnt.get(), UNO_QUERY );
-        if ( !xCreator.is() )
-            return sal_False;
-
-        Sequence< ContentInfo > aInfo = xCreator->queryCreatableContentsInfo();
+        Sequence< ContentInfo > aInfo = aCnt.queryCreatableContentsInfo();
         sal_Int32 nCount = aInfo.getLength();
         if ( nCount == 0 )
             return sal_False;
@@ -538,11 +529,7 @@ sal_Bool UCBContentHelper::MakeFolder( Content& aCnt, const String& aTitle, Cont
 
     try
     {
-        uno::Reference< XContentCreator > xCreator( aCnt.get(), UNO_QUERY );
-        if ( !xCreator.is() )
-            return sal_False;
-
-        Sequence< ContentInfo > aInfo = xCreator->queryCreatableContentsInfo();
+        Sequence< ContentInfo > aInfo = aCnt.queryCreatableContentsInfo();
         sal_Int32 nCount = aInfo.getLength();
         if ( nCount == 0 )
             return sal_False;
diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx
index 45ed6e728033..f21855d20aed 100644
--- a/unotools/source/ucbhelper/ucblockbytes.cxx
+++ b/unotools/source/ucbhelper/ucblockbytes.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: ucblockbytes.cxx,v $
- * $Revision: 1.60 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 8a574dec66d4..f27f663b3698 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.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: ucbstreamhelper.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/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index 75024c3c9b35..023211dc3527 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.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: xtempfile.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/unotools/util/makefile.mk b/unotools/util/makefile.mk
index 637e58765f83..8e725d2de2fa 100644
--- a/unotools/util/makefile.mk
+++ b/unotools/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.21 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/unotools/util/makefile.pmk b/unotools/util/makefile.pmk
index a59b857ac7b2..0c0e54319f0e 100644
--- a/unotools/util/makefile.pmk
+++ b/unotools/util/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: makefile.pmk,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/vcl/aqua/inc/aqua11yfactory.h b/vcl/aqua/inc/aqua11yfactory.h
index 70d36be3da8e..1982093f8bba 100644
--- a/vcl/aqua/inc/aqua11yfactory.h
+++ b/vcl/aqua/inc/aqua11yfactory.h
@@ -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: aqua11yfactory.h,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/vcl/aqua/inc/aqua11yfocustracker.hxx b/vcl/aqua/inc/aqua11yfocustracker.hxx
index 289abf60622d..1dbf68c4a5ef 100644
--- a/vcl/aqua/inc/aqua11yfocustracker.hxx
+++ b/vcl/aqua/inc/aqua11yfocustracker.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: aqua11yfocustracker.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/vcl/aqua/inc/aqua11ylistener.hxx b/vcl/aqua/inc/aqua11ylistener.hxx
index 33228ccb22d9..461b149e4650 100644
--- a/vcl/aqua/inc/aqua11ylistener.hxx
+++ b/vcl/aqua/inc/aqua11ylistener.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: aqua11ylistener.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/vcl/aqua/inc/aqua11ywrapper.h b/vcl/aqua/inc/aqua11ywrapper.h
index f77adb396213..079dcfe7f112 100644
--- a/vcl/aqua/inc/aqua11ywrapper.h
+++ b/vcl/aqua/inc/aqua11ywrapper.h
@@ -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: aqua11ywrapper.h,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/vcl/aqua/inc/aquaprintview.h b/vcl/aqua/inc/aquaprintview.h
index c5ce20c17425..84d9dd54d6aa 100755
--- a/vcl/aqua/inc/aquaprintview.h
+++ b/vcl/aqua/inc/aquaprintview.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: aquaprintview.h,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,20 +32,36 @@
 #include <Cocoa/Cocoa.h>
 #include "postmac.h"
 
-class ImplQPrinter;
+#include "vcl/print.hxx"
+
 class AquaSalInfoPrinter;
 
+struct PrintAccessoryViewState
+{
+    bool        bNeedRestart;
+    sal_Int32   nLastPage;
+
+    PrintAccessoryViewState()
+    : bNeedRestart( false ), nLastPage( 0 ) {}
+};
+
 @interface AquaPrintView : NSView
 {
-    ImplQPrinter*       mpQPrinter;
-    AquaSalInfoPrinter* mpInfoPrinter;
+    vcl::PrinterController*     mpController;
+    AquaSalInfoPrinter*         mpInfoPrinter;
 }
--(id)initWithQPrinter: (ImplQPrinter*)pPrinter withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter;
+-(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter;
 -(MacOSBOOL)knowsPageRange: (NSRangePointer)range;
 -(NSRect)rectForPage: (int)page;
 -(NSPoint)locationOfPrintRect: (NSRect)aRect;
 -(void)drawRect: (NSRect)rect;
 @end
 
+@interface AquaPrintAccessoryView : NSObject
+{
+}
++(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController withState: (PrintAccessoryViewState*)pState;
+@end
+
 
 #endif
diff --git a/vcl/aqua/inc/aquavclevents.hxx b/vcl/aqua/inc/aquavclevents.hxx
index aa54fb64c901..8e03c59d0954 100644
--- a/vcl/aqua/inc/aquavclevents.hxx
+++ b/vcl/aqua/inc/aquavclevents.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: aquavclevents.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/vcl/aqua/inc/aquavcltypes.h b/vcl/aqua/inc/aquavcltypes.h
index 48a6e1efee07..7346282963d7 100644
--- a/vcl/aqua/inc/aquavcltypes.h
+++ b/vcl/aqua/inc/aquavcltypes.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: aquavcltypes.h,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/vcl/aqua/inc/keyboardfocuslistener.hxx b/vcl/aqua/inc/keyboardfocuslistener.hxx
index d0752591cb47..71eba2f46c02 100644
--- a/vcl/aqua/inc/keyboardfocuslistener.hxx
+++ b/vcl/aqua/inc/keyboardfocuslistener.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: keyboardfocuslistener.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/vcl/aqua/inc/salatsuifontutils.hxx b/vcl/aqua/inc/salatsuifontutils.hxx
index 77752bd3d549..81e60871ae86 100644
--- a/vcl/aqua/inc/salatsuifontutils.hxx
+++ b/vcl/aqua/inc/salatsuifontutils.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: salatsuifontutils.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/vcl/aqua/inc/salbmp.h b/vcl/aqua/inc/salbmp.h
index bc940b571d26..a4ea1bcaee49 100644
--- a/vcl/aqua/inc/salbmp.h
+++ b/vcl/aqua/inc/salbmp.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: salbmp.h,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/vcl/aqua/inc/salcolorutils.hxx b/vcl/aqua/inc/salcolorutils.hxx
index 3fcc0f265f53..74ccb69756fd 100755
--- a/vcl/aqua/inc/salcolorutils.hxx
+++ b/vcl/aqua/inc/salcolorutils.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: salcolorutils.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/vcl/aqua/inc/salconst.h b/vcl/aqua/inc/salconst.h
index 5c54afa143cf..2046ec20a806 100755
--- a/vcl/aqua/inc/salconst.h
+++ b/vcl/aqua/inc/salconst.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: salconst.h,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/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx
index a84be1fc2c25..fb7c8cddd6d4 100644
--- a/vcl/aqua/inc/saldata.hxx
+++ b/vcl/aqua/inc/saldata.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: saldata.hxx,v $
- * $Revision: 1.22.64.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/inc/salfontutils.hxx b/vcl/aqua/inc/salfontutils.hxx
index cd0b6b2c9e66..6f9f61efda70 100644
--- a/vcl/aqua/inc/salfontutils.hxx
+++ b/vcl/aqua/inc/salfontutils.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: salfontutils.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/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h
index 5ddd96dae34d..fd783270875e 100644
--- a/vcl/aqua/inc/salframe.h
+++ b/vcl/aqua/inc/salframe.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: salframe.h,v $
- * $Revision: 1.26 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/inc/salframeview.h b/vcl/aqua/inc/salframeview.h
index e823837e7af6..498c9679e97c 100755
--- a/vcl/aqua/inc/salframeview.h
+++ b/vcl/aqua/inc/salframeview.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: salframeview.h,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/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h
index 4933dbc48586..d83067cb64b8 100644
--- a/vcl/aqua/inc/salgdi.h
+++ b/vcl/aqua/inc/salgdi.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: salgdi.h,v $
- * $Revision: 1.45.14.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -175,6 +172,9 @@ public:
     void                RefreshRect(float lX, float lY, float lWidth, float lHeight);
 
     void                SetState();
+    void                UnsetState();
+    // InvalidateContext does an UnsetState and sets mrContext to 0
+    void                InvalidateContext();
 
     virtual BOOL        unionClipRegion( long nX, long nY, long nWidth, long nHeight );
     virtual bool        unionClipRegion( const ::basegfx::B2DPolyPolygon& );
@@ -359,6 +359,7 @@ private:
     void ApplyXorContext();
     void Pattern50Fill();
     UInt32 getState( ControlState nState );
+    UInt32 getTrackState( ControlState nState );
 };
 
 class XorEmulation
diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h
index 5b1cf0d84562..8a44f7ef3304 100644
--- a/vcl/aqua/inc/salinst.h
+++ b/vcl/aqua/inc/salinst.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: salinst.h,v $
- * $Revision: 1.20.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/inc/salmathutils.hxx b/vcl/aqua/inc/salmathutils.hxx
index 40e52e94a8ff..6106dc328740 100755
--- a/vcl/aqua/inc/salmathutils.hxx
+++ b/vcl/aqua/inc/salmathutils.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: salmathutils.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/vcl/aqua/inc/salmenu.h b/vcl/aqua/inc/salmenu.h
index e48c8fcae863..100e8c22972c 100644
--- a/vcl/aqua/inc/salmenu.h
+++ b/vcl/aqua/inc/salmenu.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: salmenu.h,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/vcl/aqua/inc/salnativewidgets.h b/vcl/aqua/inc/salnativewidgets.h
index 16ff913268cd..11d4ea5c1c62 100755
--- a/vcl/aqua/inc/salnativewidgets.h
+++ b/vcl/aqua/inc/salnativewidgets.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: salnativewidgets.h,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/vcl/aqua/inc/salnsmenu.h b/vcl/aqua/inc/salnsmenu.h
index 4065d96a623c..e9b2cbe922b8 100755
--- a/vcl/aqua/inc/salnsmenu.h
+++ b/vcl/aqua/inc/salnsmenu.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: salnsmenu.h,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/vcl/aqua/inc/salnstimer.h b/vcl/aqua/inc/salnstimer.h
index 030775ef3f87..e29fef43b6b4 100755
--- a/vcl/aqua/inc/salnstimer.h
+++ b/vcl/aqua/inc/salnstimer.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: salnstimer.h,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/vcl/aqua/inc/salobj.h b/vcl/aqua/inc/salobj.h
index 25e9b226af14..0041b22c16a0 100644
--- a/vcl/aqua/inc/salobj.h
+++ b/vcl/aqua/inc/salobj.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: salobj.h,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/vcl/aqua/inc/salpixmaputils.hxx b/vcl/aqua/inc/salpixmaputils.hxx
index 13406431a8e8..18d00b9856a0 100755
--- a/vcl/aqua/inc/salpixmaputils.hxx
+++ b/vcl/aqua/inc/salpixmaputils.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: salpixmaputils.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/vcl/aqua/inc/salprn.h b/vcl/aqua/inc/salprn.h
index ec08261e8321..6bcafa2ee2e3 100644
--- a/vcl/aqua/inc/salprn.h
+++ b/vcl/aqua/inc/salprn.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: salprn.h,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,8 +70,8 @@ class AquaSalInfoPrinter : public SalInfoPrinter
 
     int                       mnStartPageOffsetX;
     int                       mnStartPageOffsetY;
-    ULONG                     mnCurPageRangeStart;
-    ULONG                     mnCurPageRangeCount;
+    sal_Int32                 mnCurPageRangeStart;
+    sal_Int32                 mnCurPageRangeCount;
 
     public:
     AquaSalInfoPrinter( const SalPrinterQueueInfo& pInfo );
@@ -96,19 +93,17 @@ class AquaSalInfoPrinter : public SalInfoPrinter
     virtual String              GetPaperBinName( const ImplJobSetup* i_pSetupData, ULONG i_nPaperBin );
     virtual void                InitPaperFormats( const ImplJobSetup* i_pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* i_pSetupData );
-    virtual DuplexMode          GetDuplexMode( const ImplJobSetup* i_pSetupData );
-
 
     // the artificial separation between InfoPrinter and Printer
     // is not really useful for us
     // so let's make AquaSalPrinter just a forwarder to AquaSalInfoPrinter
     // and concentrate the real work in one class
     // implement pull model print system
-    BOOL                        StartJob( const String* pFileName,
-                                          const String& rAppName,
-                                          ImplJobSetup* pSetupData,
-                                          ImplQPrinter* pQPrinter,
-                                          bool bIsQuickJob );
+    BOOL                        StartJob( const String* i_pFileName,
+                                          const String& rJobName,
+                                          const String& i_rAppName,
+                                          ImplJobSetup* i_pSetupData,
+                                          vcl::PrinterController& i_rController );
     BOOL                        EndJob();
     BOOL                        AbortJob();
     SalGraphics*                StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData );
@@ -117,8 +112,12 @@ class AquaSalInfoPrinter : public SalInfoPrinter
 
     NSPrintInfo* getPrintInfo() const { return mpPrintInfo; }
     void setStartPageOffset( int nOffsetX, int nOffsetY ) { mnStartPageOffsetX = nOffsetX; mnStartPageOffsetY = nOffsetY; }
-    ULONG getCurPageRangeStart() const { return mnCurPageRangeStart; }
-    ULONG getCurPageRangeCount() const { return mnCurPageRangeCount; }
+    sal_Int32 getCurPageRangeStart() const { return mnCurPageRangeStart; }
+    sal_Int32 getCurPageRangeCount() const { return mnCurPageRangeCount; }
+
+    // match width/height against known paper formats, possibly switching orientation
+    const PaperInfo* matchPaper( long i_nWidth, long i_nHeight, Orientation& o_rOrientation ) const;
+    void setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation );
 
     private:
     AquaSalInfoPrinter( const AquaSalInfoPrinter& );
@@ -139,13 +138,16 @@ class AquaSalPrinter : public SalPrinter
     virtual BOOL                    StartJob( const XubString* i_pFileName,
                                               const XubString& i_rJobName,
                                               const XubString& i_rAppName,
-                                              ULONG i_nCopies, BOOL i_bCollate,
+                                              ULONG i_nCopies,
+                                              bool i_bCollate,
+                                              bool i_bDirect,
                                               ImplJobSetup* i_pSetupData );
     // implement pull model print system
-    virtual BOOL                    StartJob( const String* pFileName,
-                                              const String& rAppName,
-                                              ImplJobSetup* pSetupData,
-                                              ImplQPrinter* pQPrinter );
+    virtual BOOL                    StartJob( const String* i_pFileName,
+                                              const String& rJobName,
+                                              const String& i_rAppName,
+                                              ImplJobSetup* i_pSetupData,
+                                              vcl::PrinterController& i_rListener );
 
     virtual BOOL                    EndJob();
     virtual BOOL                    AbortJob();
@@ -162,7 +164,7 @@ const double fPtTo100thMM = 35.27777778;
 
 inline int PtTo10Mu( double nPoints ) { return (int)(((nPoints)*fPtTo100thMM)+0.5); }
 
-inline double TenMuToPt( double nUnits ) { return (((nUnits)/fPtTo100thMM)+0.5); }
+inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+0.5); }
 
 
 
diff --git a/vcl/aqua/inc/salsys.h b/vcl/aqua/inc/salsys.h
index f93ea88f437b..6f5c45880e68 100644
--- a/vcl/aqua/inc/salsys.h
+++ b/vcl/aqua/inc/salsys.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: salsys.h,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/vcl/aqua/inc/saltimer.h b/vcl/aqua/inc/saltimer.h
index 8fcd711c3c18..374b9c5a45c5 100644
--- a/vcl/aqua/inc/saltimer.h
+++ b/vcl/aqua/inc/saltimer.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: saltimer.h,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/vcl/aqua/inc/salvd.h b/vcl/aqua/inc/salvd.h
index 9bc26b0bd746..865cb7b5b766 100644
--- a/vcl/aqua/inc/salvd.h
+++ b/vcl/aqua/inc/salvd.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: salvd.h,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/vcl/aqua/inc/svsys.h b/vcl/aqua/inc/svsys.h
index 3c1dd01cd7d8..1edce25cea28 100644
--- a/vcl/aqua/inc/svsys.h
+++ b/vcl/aqua/inc/svsys.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: svsys.h,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/vcl/aqua/inc/vclnsapp.h b/vcl/aqua/inc/vclnsapp.h
index 622f1bfd6bcd..59b070b421ea 100755
--- a/vcl/aqua/inc/vclnsapp.h
+++ b/vcl/aqua/inc/vclnsapp.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: vclnsapp.h,v $
- * $Revision: 1.6.68.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
index a98f35faef80..3a7f13f8a545 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h
@@ -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: aqua11yactionwrapper.h,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/vcl/aqua/source/a11y/aqua11yactionwrapper.mm b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
index 33deca2baa3f..fcd49fd67ff4 100644
--- a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm
@@ -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: aqua11yactionwrapper.mm,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/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
index e2b630ca39a9..c1806054e253 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
@@ -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: aqua11ycomponentwrapper.h,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/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
index 32d290ce81c6..a700b0b89ae9 100644
--- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm
@@ -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: aqua11ycomponentwrapper.mm,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/vcl/aqua/source/a11y/aqua11yfactory.mm b/vcl/aqua/source/a11y/aqua11yfactory.mm
index a49bce957b3b..eb745ea24aa5 100644
--- a/vcl/aqua/source/a11y/aqua11yfactory.mm
+++ b/vcl/aqua/source/a11y/aqua11yfactory.mm
@@ -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: aqua11yfactory.mm,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/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
index 486427defb32..9ac9401abd62 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.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: aqua11yfocuslistener.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/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
index ce420820b0f5..1fdd340c698e 100644
--- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.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: aqua11yfocuslistener.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/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
index 24a56f477dd4..2a8ebb39bd80 100644
--- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx
+++ b/vcl/aqua/source/a11y/aqua11yfocustracker.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: aqua11yfocustracker.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/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/aqua/source/a11y/aqua11ylistener.cxx
index 0bca467d9aa5..7f680f43b3a6 100644
--- a/vcl/aqua/source/a11y/aqua11ylistener.cxx
+++ b/vcl/aqua/source/a11y/aqua11ylistener.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: aqua11ylistener.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/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h
index 769f6c3c6caa..f847eb3f41c3 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.h
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h
@@ -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: aqua11yrolehelper.h,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/vcl/aqua/source/a11y/aqua11yrolehelper.mm b/vcl/aqua/source/a11y/aqua11yrolehelper.mm
index 4bf88d49d04a..b8ebdb08c3df 100644
--- a/vcl/aqua/source/a11y/aqua11yrolehelper.mm
+++ b/vcl/aqua/source/a11y/aqua11yrolehelper.mm
@@ -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: aqua11yrolehelper.mm,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/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
index f13c2aedf3e4..a88e6c71c04b 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h
@@ -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: aqua11yselectionwrapper.h,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/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
index 3f53087746f8..53ab6dd36128 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
@@ -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: aqua11yselectionwrapper.mm,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/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
index 7e9fb6bfe459..8753365377e3 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h
@@ -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: aqua11ytablewrapper.h,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/vcl/aqua/source/a11y/aqua11ytablewrapper.mm b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
index 017e0b4ad724..08205ac8a66b 100644
--- a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm
@@ -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: aqua11ytablewrapper.mm,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/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
index be16f09e0c33..fcf185ca5478 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h
@@ -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: aqua11ytextattributeswrapper.h,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/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
index e521e7362323..6577cebf295e 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -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: aqua11ytextattributeswrapper.mm,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/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
index 89e63e973da0..dfdab349bafe 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h
@@ -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: aqua11ytextwrapper.h,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/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
index 5859e5f661ba..2033135564d8 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
@@ -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: aqua11ytextwrapper.mm,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/vcl/aqua/source/a11y/aqua11yutil.h b/vcl/aqua/source/a11y/aqua11yutil.h
index 6c1832c18db4..adf565f4d9bb 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.h
+++ b/vcl/aqua/source/a11y/aqua11yutil.h
@@ -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: aqua11yutil.h,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/vcl/aqua/source/a11y/aqua11yutil.mm b/vcl/aqua/source/a11y/aqua11yutil.mm
index 44f95169ca68..4749a3b40822 100644
--- a/vcl/aqua/source/a11y/aqua11yutil.mm
+++ b/vcl/aqua/source/a11y/aqua11yutil.mm
@@ -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: aqua11yutil.mm,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/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
index 9f9d533afb9c..d3afebf7f828 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h
@@ -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: aqua11yvaluewrapper.h,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/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm b/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
index e760836060c1..85ef0041da95 100644
--- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm
@@ -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: aqua11yvaluewrapper.mm,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/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm
index 64e0e9ef0308..959746d533dc 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -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: aqua11ywrapper.mm,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/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
index 76821361ddf5..aa35062d15c4 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h
@@ -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: aqua11ywrapperbutton.h,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/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
index 92d36fc7573f..48f1804c58a2 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm
@@ -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: aqua11ywrapperbutton.mm,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/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
index 1555e62860fb..95fee9a3ec4b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h
@@ -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: aqua11ywrappercheckbox.h,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/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
index 534dff2c3ba9..c4ac34dc5bce 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
@@ -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: aqua11ywrappercheckbox.mm,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/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
index 1e37057fa294..7ed76d607176 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h
@@ -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: aqua11ywrappercombobox.h,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/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
index 2d0e58bdd75e..85aed320e470 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
@@ -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: aqua11ywrappercombobox.mm,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/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
index 48e8ab3578d3..7757e067ee22 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h
@@ -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: aqua11ywrappergroup.h,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/vcl/aqua/source/a11y/aqua11ywrappergroup.mm b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
index 736cd7207415..42298f9c745b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm
@@ -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: aqua11ywrappergroup.mm,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/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
index 904c80d7c44c..95df8323467b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h
@@ -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: aqua11ywrapperlist.h,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/vcl/aqua/source/a11y/aqua11ywrapperlist.mm b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
index 960f439b322f..eeb210d70e65 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm
@@ -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: aqua11ywrapperlist.mm,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/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
index 5eaf1d071b46..13ceee6f826f 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h
@@ -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: aqua11ywrapperradiobutton.h,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/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
index d603184e0f60..54d6edac619a 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm
@@ -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: aqua11ywrapperradiobutton.mm,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/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
index f0664bb3e852..544b709223b3 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h
@@ -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: aqua11ywrapperradiogroup.h,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/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
index 83653085c8e9..f89ac78b044c 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm
@@ -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: aqua11ywrapperradiogroup.mm,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/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
index cf9bde2f3e90..252af6f5987f 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h
@@ -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: aqua11ywrapperrow.h,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/vcl/aqua/source/a11y/aqua11ywrapperrow.mm b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
index b43e5dba1c73..d49e229218bf 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm
@@ -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: aqua11ywrapperrow.mm,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/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
index adda660f2bde..2c206fd0904b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h
@@ -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: aqua11ywrapperscrollarea.h,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/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
index ac62eb31377c..f375e5ce788d 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm
@@ -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: aqua11ywrapperscrollarea.mm,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/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
index a1a1ef0b3975..1070c682cd5e 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h
@@ -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: aqua11ywrapperscrollbar.h,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/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
index 24bd08089dac..826da647055b 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm
@@ -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: aqua11ywrapperscrollbar.mm,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/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
index 54f891eabe50..084a72ea7a18 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h
@@ -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: aqua11ywrappersplitter.h,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/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
index b67eb910f36a..4dc645c006c8 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm
@@ -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: aqua11ywrappersplitter.mm,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/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
index 6bd0ce74184b..c21e5573d125 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h
@@ -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: aqua11ywrapperstatictext.h,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/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
index 56f816e81ced..7192e64b2e7c 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm
@@ -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: aqua11ywrapperstatictext.mm,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/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
index 033dd8426cce..be72b9e27396 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h
@@ -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: aqua11ywrappertabgroup.h,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/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
index df2c6dac3461..708ae5440c4f 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm
@@ -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: aqua11ywrappertabgroup.mm,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/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
index 1c53c92ec6b3..724f85994053 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h
@@ -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: aqua11ywrappertextarea.h,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/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
index 35e75f9d5d74..9a425eb2b893 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm
@@ -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: aqua11ywrappertextarea.mm,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/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
index 5bef4da9ff72..e7ac0a25acec 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h
@@ -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: aqua11ywrappertoolbar.h,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/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
index bc7574645d6c..28990355af55 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm
@@ -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: aqua11ywrappertoolbar.mm,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/vcl/aqua/source/a11y/documentfocuslistener.cxx b/vcl/aqua/source/a11y/documentfocuslistener.cxx
index f20a67a85f29..02a7337ce397 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.cxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.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: documentfocuslistener.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/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx
index 222a1354d46d..863bc59d173f 100644
--- a/vcl/aqua/source/a11y/documentfocuslistener.hxx
+++ b/vcl/aqua/source/a11y/documentfocuslistener.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: documentfocuslistener.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/vcl/aqua/source/a11y/makefile.mk b/vcl/aqua/source/a11y/makefile.mk
index 5b76331eee5c..0a16281e5a69 100644
--- a/vcl/aqua/source/a11y/makefile.mk
+++ b/vcl/aqua/source/a11y/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.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/app/makefile.mk b/vcl/aqua/source/app/makefile.mk
index a90c95c74a6e..a0ddcbc02226 100644
--- a/vcl/aqua/source/app/makefile.mk
+++ b/vcl/aqua/source/app/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.18 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx
index 180f6a106459..3cb878636ad3 100644
--- a/vcl/aqua/source/app/saldata.cxx
+++ b/vcl/aqua/source/app/saldata.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: saldata.cxx,v $
- * $Revision: 1.13.64.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index 4ec3339d5372..62c59e78c963 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.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: salinst.cxx,v $
- * $Revision: 1.53.22.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/app/salnstimer.mm b/vcl/aqua/source/app/salnstimer.mm
index aa0dff558e6a..73e49fd99c61 100755
--- a/vcl/aqua/source/app/salnstimer.mm
+++ b/vcl/aqua/source/app/salnstimer.mm
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: salnstimer.mm,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/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 78b5defe6dd9..3b548099feef 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.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: salsys.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/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx
index 6a313013f8d1..724857e92a0c 100644
--- a/vcl/aqua/source/app/saltimer.cxx
+++ b/vcl/aqua/source/app/saltimer.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: saltimer.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/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm
index 5a295b5e1171..f33599fa086e 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: vclnsapp.mm,v $
- * $Revision: 1.8.46.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index af05f084a97e..9c88a88e7b6b 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.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: DataFlavorMapping.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/vcl/aqua/source/dtrans/DataFlavorMapping.hxx b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index 03cb77e319f7..a1ebac6ab4a9 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.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: DataFlavorMapping.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/vcl/aqua/source/dtrans/DragActionConversion.cxx b/vcl/aqua/source/dtrans/DragActionConversion.cxx
index 793dcca503a0..06ce57e8748f 100644
--- a/vcl/aqua/source/dtrans/DragActionConversion.cxx
+++ b/vcl/aqua/source/dtrans/DragActionConversion.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: DragActionConversion.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/vcl/aqua/source/dtrans/DragActionConversion.hxx b/vcl/aqua/source/dtrans/DragActionConversion.hxx
index 137e2af30be1..7facfef794b6 100644
--- a/vcl/aqua/source/dtrans/DragActionConversion.hxx
+++ b/vcl/aqua/source/dtrans/DragActionConversion.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: DragActionConversion.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/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx
index 074ce5c6c318..adb247d70711 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.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: DragSource.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/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx
index 1268a466adf3..5d02b9874149 100644
--- a/vcl/aqua/source/dtrans/DragSource.hxx
+++ b/vcl/aqua/source/dtrans/DragSource.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: DragSource.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/vcl/aqua/source/dtrans/DragSourceContext.cxx b/vcl/aqua/source/dtrans/DragSourceContext.cxx
index cd657a6147e9..cd70dc55c896 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.cxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.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: DragSourceContext.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/vcl/aqua/source/dtrans/DragSourceContext.hxx b/vcl/aqua/source/dtrans/DragSourceContext.hxx
index 3526ec846fd6..5d84c165d851 100644
--- a/vcl/aqua/source/dtrans/DragSourceContext.hxx
+++ b/vcl/aqua/source/dtrans/DragSourceContext.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: DragSourceContext.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/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx
index 88ffc1e51d02..c928d66e156d 100644
--- a/vcl/aqua/source/dtrans/DropTarget.cxx
+++ b/vcl/aqua/source/dtrans/DropTarget.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: DropTarget.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/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx
index 91b50c041916..6baa8bb69d01 100644
--- a/vcl/aqua/source/dtrans/DropTarget.hxx
+++ b/vcl/aqua/source/dtrans/DropTarget.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: DropTarget.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/vcl/aqua/source/dtrans/OSXTransferable.cxx b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index a893f09d89cc..7b596768d061 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.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: OSXTransferable.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/vcl/aqua/source/dtrans/OSXTransferable.hxx b/vcl/aqua/source/dtrans/OSXTransferable.hxx
index 9b371523c440..6601905f1610 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.hxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.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: OSXTransferable.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/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx
index 27bf308dce9b..d3a4e9bc604c 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.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: aqua_clipboard.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/vcl/aqua/source/dtrans/aqua_clipboard.hxx b/vcl/aqua/source/dtrans/aqua_clipboard.hxx
index 90bb404fdb36..8f45f50717f3 100644
--- a/vcl/aqua/source/dtrans/aqua_clipboard.hxx
+++ b/vcl/aqua/source/dtrans/aqua_clipboard.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: aqua_clipboard.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/vcl/aqua/source/dtrans/aqua_service.cxx b/vcl/aqua/source/dtrans/aqua_service.cxx
index aeaf697670ef..571bea2e554f 100644
--- a/vcl/aqua/source/dtrans/aqua_service.cxx
+++ b/vcl/aqua/source/dtrans/aqua_service.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: aqua_service.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/vcl/aqua/source/dtrans/makefile.mk b/vcl/aqua/source/dtrans/makefile.mk
index e802c98abf64..369799c9a260 100644
--- a/vcl/aqua/source/dtrans/makefile.mk
+++ b/vcl/aqua/source/dtrans/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/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/aqua/source/dtrans/service_entry.cxx
index 38784ecb53dd..16308951bcfe 100644
--- a/vcl/aqua/source/dtrans/service_entry.cxx
+++ b/vcl/aqua/source/dtrans/service_entry.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: service_entry.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/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx
index db60712ce852..85c87c6b9ba9 100644
--- a/vcl/aqua/source/dtrans/test_aquacb.cxx
+++ b/vcl/aqua/source/dtrans/test_aquacb.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: test_aquacb.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/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
new file mode 100644
index 000000000000..74c66ab1401d
--- /dev/null
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -0,0 +1,1234 @@
+/************************************************************************
+ *
+ * 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_vcl.hxx"
+
+#include "aquaprintview.h"
+#include "salinst.h"
+#include "vcl/print.hxx"
+#include "vcl/image.hxx"
+#include "vcl/virdev.hxx"
+#include "vcl/svdata.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/unohelp.hxx"
+
+#include "vcl/svids.hrc"
+
+#include "tools/resary.hxx"
+
+#include "com/sun/star/i18n/XBreakIterator.hpp"
+#include "com/sun/star/i18n/WordType.hpp"
+
+#include <map>
+
+using namespace vcl;
+using namespace com::sun::star;
+using namespace com::sun::star::beans;
+using namespace com::sun::star::uno;
+
+/* Note: the accesory view as implemented here is already deprecated in Leopard. Unfortunately
+   as long as our baseline is Tiger we cannot gain the advantages over multiple accessory views
+   as well havs having accessory views AND a preview (as long as you are linked vs. 10.4 libraries
+   the preview insists on not being present. This is unfortunate.
+*/
+
+class ControllerProperties;
+
+@interface ControlTarget : NSObject
+{
+    ControllerProperties* mpController;
+}
+-(id)initWithControllerMap: (ControllerProperties*)pController;
+-(void)triggered:(id)pSender;
+-(void)triggeredNumeric:(id)pSender;
+-(void)triggeredPreview:(id)pSender;
+-(void)dealloc;
+@end
+
+
+class ControllerProperties
+{
+    vcl::PrinterController*             mpController;
+    std::map< int, rtl::OUString >      maTagToPropertyName;
+    std::map< int, sal_Int32 >          maTagToValueInt;
+    std::map< NSView*, NSView* >        maViewPairMap;
+    std::vector< NSObject* >            maViews;
+    int                                 mnNextTag;
+    sal_Int32                           mnLastPageCount;
+    PrintAccessoryViewState*            mpState;
+    NSPrintOperation*                   mpOp;
+    NSView*                             mpAccessoryView;
+    NSTabView*                          mpTabView;
+    NSBox*                              mpPreviewBox;
+    NSImageView*                        mpPreview;
+    NSTextField*                        mpPageEdit;
+    NSStepper*                          mpStepper;
+    NSTextView*                         mpPagesLabel;
+    ResStringArray                      maLocalizedStrings;        
+
+    public:
+    ControllerProperties( vcl::PrinterController* i_pController,
+                          NSPrintOperation* i_pOp,
+                          NSView* i_pAccessoryView,
+                          NSTabView* i_pTabView,
+                          PrintAccessoryViewState* i_pState )
+    : mpController( i_pController ),
+      mnNextTag( 0 ),
+      mnLastPageCount( i_pController->getFilteredPageCount() ),
+      mpState( i_pState ),
+      mpOp( i_pOp ),
+      mpAccessoryView( i_pAccessoryView ),
+      mpTabView( i_pTabView ),
+      mpPreviewBox( nil ),
+      mpPreview( nil ),
+      mpPageEdit( nil ),
+      mpStepper( nil ),
+      mpPagesLabel( nil ),
+      maLocalizedStrings( VclResId( SV_PRINT_NATIVE_STRINGS ) )
+    {
+        mpState->bNeedRestart = false;
+        DBG_ASSERT( maLocalizedStrings.Count() >= 4, "resources not found !" );
+    }
+    
+    rtl::OUString getMoreString()
+    {
+        return maLocalizedStrings.Count() >= 4
+               ? rtl::OUString( maLocalizedStrings.GetString( 3 ) )
+               : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "More" ) );
+    }
+    
+    void updatePrintJob()
+    {
+        // TODO: refresh page count etc from mpController 
+
+        // page range may have changed depending on options
+        sal_Int32 nPages = mpController->getFilteredPageCount();
+        #if OSL_DEBUG_LEVEL > 1
+        if( nPages != mnLastPageCount )
+            fprintf( stderr, "trouble: number of pages changed from %ld to %ld !\n", mnLastPageCount, nPages );
+        #endif
+        mpState->bNeedRestart = (nPages != mnLastPageCount);
+        NSTabViewItem* pItem = [mpTabView selectedTabViewItem];
+        if( pItem )
+            mpState->nLastPage = [mpTabView indexOfTabViewItem: pItem];
+        else
+            mpState->nLastPage = 0;
+        mnLastPageCount = nPages;
+        if( mpState->bNeedRestart )
+        {
+            #if 0
+            // Warning: bad hack ahead
+            // Apple does not give us a chance of changing the page count,
+            // and they don't let us cancel the dialog either
+            // hack: send a cancel message to the window displaying our views.
+            // this is ugly.
+            for( std::vector< NSObject* >::iterator it = maViews.begin(); it != maViews.end(); ++it )
+            {
+                if( [*it isKindOfClass: [NSView class]] )
+                {
+                    NSView* pView = (NSView*)*it;
+                    NSWindow* pWindow = [pView window];
+                    if( pWindow )
+                    {
+                        [pWindow cancelOperation: nil];
+                        break;
+                    }
+                }
+            }
+            #else
+            NSWindow* pWindow = [NSApp modalWindow];
+            if( pWindow )
+                [pWindow cancelOperation: nil];
+            #endif
+            [[mpOp printInfo] setJobDisposition: NSPrintCancelJob];
+        }
+        else
+        {
+            sal_Int32 nPage = [mpStepper intValue];
+            updatePreviewImage( nPage-1 );
+        }
+    }
+    
+    int addNameTag( const rtl::OUString& i_rPropertyName )
+    {
+        int nNewTag = mnNextTag++;
+        maTagToPropertyName[ nNewTag ] = i_rPropertyName;
+        return nNewTag;
+    }
+
+    int addNameAndValueTag( const rtl::OUString& i_rPropertyName, sal_Int32 i_nValue )
+    {
+        int nNewTag = mnNextTag++;
+        maTagToPropertyName[ nNewTag ] = i_rPropertyName;
+        maTagToValueInt[ nNewTag ] = i_nValue;
+        return nNewTag;
+    }
+    
+    void addObservedControl( NSObject* i_pView )
+    {
+        maViews.push_back( i_pView );
+    }
+    
+    void addViewPair( NSView* i_pLeft, NSView* i_pRight )
+    {
+        maViewPairMap[ i_pLeft ] = i_pRight;
+        maViewPairMap[ i_pRight ] = i_pLeft;
+    }
+    
+    NSView* getPair( NSView* i_pLeft ) const
+    {
+        NSView* pRight = nil;
+        std::map< NSView*, NSView* >::const_iterator it = maViewPairMap.find( i_pLeft );
+        if( it != maViewPairMap.end() )
+            pRight = it->second;
+        return pRight;
+    }
+    
+    void changePropertyWithIntValue( int i_nTag )
+    {
+        std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+        std::map< int, sal_Int32 >::const_iterator value_it = maTagToValueInt.find( i_nTag );
+        if( name_it != maTagToPropertyName.end() && value_it != maTagToValueInt.end() )
+        {
+            PropertyValue* pVal = mpController->getValue( name_it->second );
+            if( pVal )
+            {
+                pVal->Value <<= value_it->second;
+                updatePrintJob();
+            }
+        }
+    }
+
+    void changePropertyWithIntValue( int i_nTag, sal_Int64 i_nValue )
+    {
+        std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+        if( name_it != maTagToPropertyName.end() )
+        {
+            PropertyValue* pVal = mpController->getValue( name_it->second );
+            if( pVal )
+            {
+                pVal->Value <<= i_nValue;
+                updatePrintJob();
+            }
+        }
+    }
+    
+    void changePropertyWithBoolValue( int i_nTag, sal_Bool i_bValue )
+    {
+        std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+        if( name_it != maTagToPropertyName.end() )
+        {
+            PropertyValue* pVal = mpController->getValue( name_it->second );
+            if( pVal )
+            {
+                pVal->Value <<= i_bValue;
+                updatePrintJob(); 
+            }
+        }
+    }
+    
+    void changePropertyWithStringValue( int i_nTag, const rtl::OUString& i_rValue )
+    {
+        std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( i_nTag );
+        if( name_it != maTagToPropertyName.end() )
+        {
+            PropertyValue* pVal = mpController->getValue( name_it->second );
+            if( pVal )
+            {
+                pVal->Value <<= i_rValue;
+                updatePrintJob(); 
+            }
+        }
+    }
+    
+    void updateEnableState()
+    {
+        for( std::vector< NSObject* >::iterator it = maViews.begin(); it != maViews.end(); ++it )
+        {
+            NSObject* pObj = *it;
+            NSControl* pCtrl = nil;
+            NSCell* pCell = nil;
+            if( [pObj isKindOfClass: [NSControl class]] )
+                pCtrl = (NSControl*)pObj;
+            else if( [pObj isKindOfClass: [NSCell class]] )
+                pCell = (NSCell*)pObj;
+            
+            int nTag = pCtrl ? [pCtrl tag] :
+                       pCell ? [pCell tag] :
+                       -1;
+            
+            std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( nTag );
+            if( name_it != maTagToPropertyName.end() )
+            {
+                MacOSBOOL bEnabled = mpController->isUIOptionEnabled( name_it->second ) ? YES : NO;
+                if( pCtrl )
+                {
+                    [pCtrl setEnabled: bEnabled];
+                    NSView* pOther = getPair( pCtrl );
+                    if( pOther && [pOther isKindOfClass: [NSControl class]] )
+                        [(NSControl*)pOther setEnabled: bEnabled];
+                }
+                else if( pCell )
+                    [pCell setEnabled: bEnabled];
+                
+            }
+        }
+    }
+    
+    void updatePreviewImage( sal_Int32 i_nPage )
+    {
+        sal_Int32 nPages = mpController->getFilteredPageCount();
+        NSRect aViewFrame = [mpPreview frame];
+        Size aPixelSize( static_cast<long>(aViewFrame.size.width),
+                         static_cast<long>(aViewFrame.size.height) );
+        if( i_nPage >= 0 && nPages > i_nPage )
+        {
+            GDIMetaFile aMtf;
+            PrinterController::PageSize aPageSize( mpController->getFilteredPageFile( i_nPage, aMtf, false ) );
+            VirtualDevice aDev;
+            // see salprn.cxx, currently we pretend to be a 720dpi device on printers
+            aDev.SetReferenceDevice( 720, 720 );
+            aDev.EnableOutput( TRUE );
+            Size aLogicSize( aDev.PixelToLogic( aPixelSize, MapMode( MAP_100TH_MM ) ) );
+            double fScaleX = double(aLogicSize.Width())/double(aPageSize.aSize.Width());
+            double fScaleY = double(aLogicSize.Height())/double(aPageSize.aSize.Height());
+            double fScale = (fScaleX < fScaleY) ? fScaleX : fScaleY;
+            aMtf.WindStart();
+            aMtf.Scale( fScale, fScale );
+            aMtf.WindStart();
+            aLogicSize.Width() = long(double(aPageSize.aSize.Width()) * fScale);
+            aLogicSize.Height() = long(double(aPageSize.aSize.Height()) * fScale);
+            aPixelSize = aDev.LogicToPixel( aLogicSize, MapMode( MAP_100TH_MM ) );
+            aDev.SetOutputSizePixel( aPixelSize );
+            aMtf.WindStart();
+            aDev.SetMapMode( MapMode( MAP_100TH_MM ) );
+            aMtf.Play( &aDev, Point( 0, 0 ), aLogicSize );
+            aDev.EnableMapMode( FALSE );
+            Image aImage( aDev.GetBitmap( Point( 0, 0 ), aPixelSize ) );
+            NSImage* pImage = CreateNSImage( aImage );
+            [mpPreview setImage: [pImage autorelease]];
+        }
+        else
+            [mpPreview setImage: nil];
+    }
+
+    void setupPreview( ControlTarget* i_pCtrlTarget )
+    {
+        if( maLocalizedStrings.Count() < 3 )
+            return;
+        
+        // get the preview control
+        NSRect aPreviewFrame = [mpAccessoryView frame];
+        aPreviewFrame.origin.x = 0;
+        aPreviewFrame.origin.y = 5;
+        aPreviewFrame.size.width = 190;
+        aPreviewFrame.size.height -= 7;
+
+        // create a box to put the preview controls in
+        mpPreviewBox = [[NSBox alloc] initWithFrame: aPreviewFrame];
+        [mpPreviewBox setTitle: [CreateNSString( maLocalizedStrings.GetString( 0 ) ) autorelease]];
+        [mpAccessoryView addSubview: [mpPreviewBox autorelease]];
+
+        // now create the image view of the preview
+        NSSize aMargins = [mpPreviewBox contentViewMargins];
+        aPreviewFrame.origin.x = 0;
+        aPreviewFrame.origin.y = 34;
+        aPreviewFrame.size.height -= 61;
+        mpPreview = [[NSImageView alloc] initWithFrame: aPreviewFrame];
+        [mpPreview setImageScaling: NSScaleNone];
+        [mpPreview setImageAlignment: NSImageAlignCenter];
+        [mpPreview setImageFrameStyle: NSImageFrameNone];
+        [mpPreviewBox addSubview: [mpPreview autorelease]];
+    
+        // add a label
+        sal_Int32 nPages = mpController->getFilteredPageCount();
+        rtl::OUStringBuffer aBuf( 16 );
+        aBuf.appendAscii( "/ " );
+        aBuf.append( rtl::OUString::valueOf( nPages ) );
+    
+        NSString* pText = CreateNSString( aBuf.makeStringAndClear() );
+        NSRect aTextRect = { { 100, 5 }, { 100, 22 } };
+        mpPagesLabel = [[NSTextView alloc] initWithFrame: aTextRect];
+        [mpPagesLabel setFont: [NSFont controlContentFontOfSize: 0]];
+        [mpPagesLabel setEditable: NO];
+        [mpPagesLabel setSelectable: NO];
+        [mpPagesLabel setDrawsBackground: NO];
+        [mpPagesLabel setString: [pText autorelease]];
+        [mpPagesLabel setToolTip: [CreateNSString( maLocalizedStrings.GetString( 2 ) ) autorelease]];
+        [mpPreviewBox addSubview: [mpPagesLabel autorelease]];
+    
+        NSRect aFieldRect = { { 45, 5 }, { 35, 25 } };
+        mpPageEdit = [[NSTextField alloc] initWithFrame: aFieldRect];
+        [mpPageEdit setEditable: YES];
+        [mpPageEdit setSelectable: YES];
+        [mpPageEdit setDrawsBackground: YES];
+        [mpPageEdit setToolTip: [CreateNSString( maLocalizedStrings.GetString( 1 ) ) autorelease]];
+        [mpPreviewBox addSubview: [mpPageEdit autorelease]];
+    
+        // add a stepper control
+        NSRect aStepFrame = { { 85, 5 }, { 15, 25 } };
+        mpStepper = [[NSStepper alloc] initWithFrame: aStepFrame];
+        [mpStepper setIncrement: 1];
+        [mpStepper setValueWraps: NO];
+        [mpPreviewBox addSubview: [mpStepper autorelease]];
+                        
+        // constrain the text field to decimal numbers
+        NSNumberFormatter* pFormatter = [[NSNumberFormatter alloc] init];
+        [pFormatter setFormatterBehavior: NSNumberFormatterBehavior10_4];
+        [pFormatter setMinimum: [[NSNumber numberWithInt: 1] autorelease]];
+        [pFormatter setMaximum: [[NSNumber numberWithInt: nPages] autorelease]];
+        [pFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
+        [pFormatter setAllowsFloats: NO];
+        [pFormatter setMaximumFractionDigits: 0];
+        [mpPageEdit setFormatter: pFormatter];
+        [mpStepper setMinValue: 1];
+        [mpStepper setMaxValue: nPages];
+    
+        [mpPageEdit setIntValue: 1];
+        [mpStepper setIntValue: 1];
+    
+        // connect target and action
+        [mpStepper setTarget: i_pCtrlTarget];
+        [mpStepper setAction: @selector(triggeredPreview:)];
+        [mpPageEdit setTarget: i_pCtrlTarget];
+        [mpPageEdit setAction: @selector(triggeredPreview:)];
+        
+        // set first preview image
+        updatePreviewImage( 0 );
+    }
+    
+    void changePreview( NSObject* i_pSender )
+    {
+        if( [i_pSender isMemberOfClass: [NSTextField class]] )
+        {
+            NSTextField* pField = (NSTextField*)i_pSender;
+            if( pField == mpPageEdit ) // sanity check
+            {
+                sal_Int32 nPage = [pField intValue];
+                [mpStepper setIntValue: nPage];
+                updatePreviewImage( nPage-1 );
+            }
+        }
+        else if( [i_pSender isMemberOfClass: [NSStepper class]] )
+        {
+            NSStepper* pStepper = (NSStepper*)i_pSender;
+            if( pStepper == mpStepper ) // sanity check
+            {
+                sal_Int32 nPage = [pStepper intValue];
+                [mpPageEdit setIntValue: nPage];
+                updatePreviewImage( nPage-1 );
+            }
+        }
+    }
+};
+
+static void filterAccelerator( rtl::OUString& io_rText )
+{
+    rtl::OUStringBuffer aBuf( io_rText.getLength() );
+    for( sal_Int32 nIndex = 0; nIndex != -1; )
+        aBuf.append( io_rText.getToken( 0, '~', nIndex ) );
+    io_rText = aBuf.makeStringAndClear();
+}
+
+@implementation ControlTarget
+-(id)initWithControllerMap: (ControllerProperties*)pController
+{
+    if( (self = [super init]) )
+    {
+        mpController = pController; 
+    }
+    return self;
+}
+-(void)triggered:(id)pSender;
+{
+    if( [pSender isMemberOfClass: [NSPopUpButton class]] )
+    {
+        NSPopUpButton* pBtn = (NSPopUpButton*)pSender;
+        NSMenuItem* pSelected = [pBtn selectedItem];
+        if( pSelected )
+        {
+            int nTag = [pSelected tag];
+            mpController->changePropertyWithIntValue( nTag );
+        }
+    }
+    else if( [pSender isMemberOfClass: [NSButton class]] )
+    {
+        NSButton* pBtn = (NSButton*)pSender;
+        int nTag = [pBtn tag];
+        mpController->changePropertyWithBoolValue( nTag, [pBtn state] == NSOnState );
+    }
+    else if( [pSender isMemberOfClass: [NSMatrix class]] )
+    {
+        NSObject* pObj = [(NSMatrix*)pSender selectedCell];
+        if( [pObj isMemberOfClass: [NSButtonCell class]] )
+        {
+            NSButtonCell* pCell = (NSButtonCell*)pObj;
+            int nTag = [pCell tag];
+            mpController->changePropertyWithIntValue( nTag );
+        }
+    }
+    else if( [pSender isMemberOfClass: [NSTextField class]] )
+    {
+        NSTextField* pField = (NSTextField*)pSender;
+        int nTag = [pField tag];
+        rtl::OUString aValue = GetOUString( [pSender stringValue] );
+        mpController->changePropertyWithStringValue( nTag, aValue );
+    }
+    else
+    {
+        DBG_ERROR( "unsupported class" );
+    }
+    mpController->updateEnableState();
+}
+-(void)triggeredNumeric:(id)pSender;
+{
+    if( [pSender isMemberOfClass: [NSTextField class]] )
+    {
+        NSTextField* pField = (NSTextField*)pSender;
+        int nTag = [pField tag];
+        sal_Int64 nValue = [pField intValue];
+        
+        NSView* pOther = mpController->getPair( pField );
+        if( pOther )
+            [(NSControl*)pOther setIntValue: nValue];
+
+        mpController->changePropertyWithIntValue( nTag, nValue );
+    }
+    else if( [pSender isMemberOfClass: [NSStepper class]] )
+    {
+        NSStepper* pStep = (NSStepper*)pSender;
+        int nTag = [pStep tag];
+        sal_Int64 nValue = [pStep intValue];
+
+        NSView* pOther = mpController->getPair( pStep );
+        if( pOther )
+            [(NSControl*)pOther setIntValue: nValue];
+
+        mpController->changePropertyWithIntValue( nTag, nValue );
+    }
+    else
+    {
+        DBG_ERROR( "unsupported class" );
+    }
+    mpController->updateEnableState();
+}
+-(void)triggeredPreview:(id)pSender
+{
+    mpController->changePreview( pSender );
+}
+-(void)dealloc
+{
+    delete mpController;
+    [super dealloc];
+}
+@end
+
+struct ColumnItem
+{
+    NSControl*      pControl;
+    long            nOffset;
+    NSControl*      pSubControl;
+    
+    ColumnItem( NSControl* i_pControl = nil, long i_nOffset = 0, NSControl* i_pSub = nil )
+    : pControl( i_pControl )
+    , nOffset( i_nOffset )
+    , pSubControl( i_pSub )
+    {}
+    
+    long getWidth() const
+    {
+        long nWidth = 0;
+        if( pControl )
+        {
+            NSRect aCtrlRect = [pControl frame];
+            nWidth = aCtrlRect.size.width;
+            nWidth += nOffset;
+            if( pSubControl )
+            {
+                NSRect aSubRect = [pSubControl frame];
+                nWidth += aSubRect.size.width;
+                nWidth += aSubRect.origin.x - (aCtrlRect.origin.x + aCtrlRect.size.width);
+            }
+        }
+        return nWidth;
+    }
+};
+
+static void adjustViewAndChildren( NSView* pView, NSSize& rMaxSize,
+                                   std::vector< ColumnItem >& rLeftColumn,
+                                   std::vector< ColumnItem >& rRightColumn
+                                  )
+{
+    // balance columns
+    
+    // first get overall column widths
+    long nLeftWidth = 0;
+    long nRightWidth = 0;
+    for( size_t i = 0; i < rLeftColumn.size(); i++ )
+    {
+        long nW = rLeftColumn[i].getWidth();
+        if( nW > nLeftWidth )
+            nLeftWidth = nW;
+    }
+    for( size_t i = 0; i < rRightColumn.size(); i++ )
+    {
+        long nW = rRightColumn[i].getWidth();
+        if( nW > nRightWidth )
+            nRightWidth = nW;
+    }
+    
+    // right align left column
+    for( size_t i = 0; i < rLeftColumn.size(); i++ )
+    {
+        if( rLeftColumn[i].pControl )
+        {
+            NSRect aCtrlRect = [rLeftColumn[i].pControl frame];
+            long nX = nLeftWidth - aCtrlRect.size.width;
+            if( rLeftColumn[i].pSubControl )
+            {
+                NSRect aSubRect = [rLeftColumn[i].pSubControl frame];
+                nX -= aSubRect.size.width + (aSubRect.origin.x - (aCtrlRect.origin.x + aCtrlRect.size.width));
+                aSubRect.origin.x = nLeftWidth - aSubRect.size.width;
+                [rLeftColumn[i].pSubControl setFrame: aSubRect];
+            }
+            aCtrlRect.origin.x = nX;
+            [rLeftColumn[i].pControl setFrame: aCtrlRect];
+        }
+    }
+
+    // left align right column
+    for( size_t i = 0; i < rRightColumn.size(); i++ )
+    {
+        if( rRightColumn[i].pControl )
+        {
+            NSRect aCtrlRect = [rRightColumn[i].pControl frame];
+            long nX = nLeftWidth + 3;
+            if( rRightColumn[i].pSubControl )
+            {
+                NSRect aSubRect = [rRightColumn[i].pSubControl frame];
+                aSubRect.origin.x = nX + aSubRect.origin.x - aCtrlRect.origin.x; 
+                [rRightColumn[i].pSubControl setFrame: aSubRect];
+            }
+            aCtrlRect.origin.x = nX;
+            [rRightColumn[i].pControl setFrame: aCtrlRect];
+        }
+    }
+    
+    NSArray* pSubViews = [pView subviews];
+    unsigned int nViews = [pSubViews count];
+    NSRect aUnion = { { 0, 0 }, { 0, 0 } };
+
+    // get the combined frame of all subviews
+    for( unsigned int n = 0; n < nViews; n++ )
+    {
+        aUnion = NSUnionRect( aUnion, [[pSubViews objectAtIndex: n] frame] );
+    }
+    
+    // move everything so it will fit
+    for( unsigned int n = 0; n < nViews; n++ )
+    {
+        NSView* pCurSubView = [pSubViews objectAtIndex: n];
+        NSRect aFrame = [pCurSubView frame];
+        aFrame.origin.x -= aUnion.origin.x - 5;
+        aFrame.origin.y -= aUnion.origin.y - 5;
+        [pCurSubView setFrame: aFrame];
+    }
+    
+    // resize the view itself
+    aUnion.size.height += 10;
+    aUnion.size.width += 20;
+    [pView setFrameSize: aUnion.size];
+    
+    if( aUnion.size.width > rMaxSize.width )
+        rMaxSize.width = aUnion.size.width;
+    if( aUnion.size.height > rMaxSize.height )
+        rMaxSize.height = aUnion.size.height;
+}
+
+static void adjustTabViews( NSTabView* pTabView, NSSize aTabSize )
+{
+    // loop over all contained tab pages
+    NSArray* pTabbedViews = [pTabView tabViewItems];
+    int nViews = [pTabbedViews count];
+    for( int i = 0; i < nViews; i++ )
+    {
+        NSTabViewItem* pItem = (NSTabViewItem*)[pTabbedViews objectAtIndex: i];
+        NSView* pView = [pItem view];
+        if( pView )
+        {
+            NSRect aRect = [pView frame];
+            double nDiff = aTabSize.height - aRect.size.height;
+            aRect.size = aTabSize;
+            [pView setFrame: aRect];
+            
+            NSArray* pSubViews = [pView subviews];
+            unsigned int nSubViews = [pSubViews count];
+
+            // move everything up
+            for( unsigned int n = 0; n < nSubViews; n++ )
+            {
+                NSView* pCurSubView = [pSubViews objectAtIndex: n];
+                NSRect aFrame = [pCurSubView frame];
+                aFrame.origin.y += nDiff;
+                // give separators the correct width
+                // separators are currently the only NSBoxes we use
+                if( [pCurSubView isMemberOfClass: [NSBox class]] )
+                {
+                    aFrame.size.width = aTabSize.width - aFrame.origin.x - 10;
+                }
+                [pCurSubView setFrame: aFrame];
+            }
+        }
+    }
+}
+
+static NSControl* createLabel( const rtl::OUString& i_rText )
+{
+    NSString* pText = CreateNSString( i_rText );
+    NSRect aTextRect = { { 0, 0 }, {20, 15} };
+    NSTextField* pTextView = [[NSTextField alloc] initWithFrame: aTextRect];
+    [pTextView setFont: [NSFont controlContentFontOfSize: 0]];
+    [pTextView setEditable: NO];
+    [pTextView setSelectable: NO];
+    [pTextView setDrawsBackground: NO];
+    [pTextView setBordered: NO];
+    [pTextView setStringValue: pText];
+    [pTextView sizeToFit];
+    [pText release];
+    return pTextView;
+}
+
+static sal_Int32 findBreak( const rtl::OUString& i_rText, sal_Int32 i_nPos )
+{
+    sal_Int32 nRet = i_rText.getLength();
+    Reference< i18n::XBreakIterator > xBI( vcl::unohelper::CreateBreakIterator() );
+    if( xBI.is() )
+    {
+        i18n::Boundary aBoundary = xBI->getWordBoundary( i_rText, i_nPos,
+                                                         Application::GetSettings().GetLocale(),
+                                                         i18n::WordType::ANYWORD_IGNOREWHITESPACES,
+                                                         sal_True );
+        nRet = aBoundary.endPos;
+    }
+    return nRet;
+}
+
+static void linebreakCell( NSCell* pBtn, const rtl::OUString& i_rText )
+{
+    NSString* pText = CreateNSString( i_rText );
+    [pBtn setTitle: pText];
+    [pText release];
+    NSSize aSize = [pBtn cellSize];
+    if( aSize.width > 280 )
+    {
+        // need two lines
+        sal_Int32 nLen = i_rText.getLength();
+        sal_Int32 nIndex = nLen / 2;
+        nIndex = findBreak( i_rText, nIndex );
+        if( nIndex < nLen )
+        {
+            rtl::OUStringBuffer aBuf( i_rText );
+            aBuf.setCharAt( nIndex, '\n' );
+            pText = CreateNSString( aBuf.makeStringAndClear() );
+            [pBtn setTitle: pText];
+            [pText release];
+        }
+    }
+}
+
+
+@implementation AquaPrintAccessoryView
++(NSObject*)setupPrinterPanel: (NSPrintOperation*)pOp withController: (vcl::PrinterController*)pController  withState: (PrintAccessoryViewState*)pState;
+{
+    const Sequence< PropertyValue >& rOptions( pController->getUIOptions() );
+    if( rOptions.getLength() == 0 )
+        return nil;
+
+    NSView* pCurParent = 0;
+    long nCurY = 0;
+    long nCurX = 0;
+    NSRect aViewFrame = { { 0, 0 }, {600, 400 } };
+    NSRect aTabViewFrame = { { 190, 0 }, {410, 400 } };
+    NSSize aMaxTabSize = { 0, 0 };
+    NSView* pAccessoryView = [[NSView alloc] initWithFrame: aViewFrame];
+    NSTabView* pTabView = [[NSTabView alloc] initWithFrame: aTabViewFrame];
+    [pAccessoryView addSubview: [pTabView autorelease]];
+    
+    sal_Bool bIgnoreSubgroup = sal_False;
+    
+    ControllerProperties* pControllerProperties = new ControllerProperties( pController, pOp, pAccessoryView, pTabView, pState );
+    ControlTarget* pCtrlTarget = [[ControlTarget alloc] initWithControllerMap: pControllerProperties];
+    
+    std::vector< ColumnItem > aLeftColumn, aRightColumn;
+
+    for( int i = 0; i < rOptions.getLength(); i++ )
+    {
+        Sequence< beans::PropertyValue > aOptProp;
+        rOptions[i].Value >>= aOptProp;
+
+        // extract ui element
+        bool bEnabled = true;
+        rtl::OUString aCtrlType;
+        rtl::OUString aText;
+        rtl::OUString aPropertyName;
+        Sequence< rtl::OUString > aChoices;
+        sal_Int64 nMinValue = 0, nMaxValue = 0;
+        long nAttachOffset = 0;
+        sal_Bool bIgnore = sal_False;
+
+        for( int n = 0; n < aOptProp.getLength(); n++ )
+        {
+            const beans::PropertyValue& rEntry( aOptProp[ n ] );
+            if( rEntry.Name.equalsAscii( "Text" ) )
+            {
+                rEntry.Value >>= aText;
+                filterAccelerator( aText );
+            }
+            else if( rEntry.Name.equalsAscii( "ControlType" ) )
+            {
+                rEntry.Value >>= aCtrlType;
+            }
+            else if( rEntry.Name.equalsAscii( "Choices" ) )
+            {
+                rEntry.Value >>= aChoices;
+            }
+            else if( rEntry.Name.equalsAscii( "Property" ) )
+            {
+                PropertyValue aVal;
+                rEntry.Value >>= aVal;
+                aPropertyName = aVal.Name;
+            }
+            else if( rEntry.Name.equalsAscii( "Enabled" ) )
+            {
+                sal_Bool bValue = sal_True;
+                rEntry.Value >>= bValue;
+                bEnabled = bValue;
+            }
+            else if( rEntry.Name.equalsAscii( "MinValue" ) )
+            {
+                rEntry.Value >>= nMinValue;
+            }
+            else if( rEntry.Name.equalsAscii( "MaxValue" ) )
+            {
+                rEntry.Value >>= nMaxValue;
+            }
+            else if( rEntry.Name.equalsAscii( "AttachToDependency" ) )
+            {
+                nAttachOffset = 20;
+            }
+            else if( rEntry.Name.equalsAscii( "InternalUIOnly" ) )
+            {
+                rEntry.Value >>= bIgnore;
+            }
+        }
+
+        if( aCtrlType.equalsAscii( "Group" ) ||
+            aCtrlType.equalsAscii( "Subgroup" ) ||
+            aCtrlType.equalsAscii( "Radio" ) ||
+            aCtrlType.equalsAscii( "List" )  ||
+            aCtrlType.equalsAscii( "Edit" )  ||
+            aCtrlType.equalsAscii( "Range" )  ||
+            aCtrlType.equalsAscii( "Bool" ) )
+        {
+            // since our build target is MacOSX 10.4 we can have only one accessory view
+            // so we have a single accessory view that is tabbed for grouping
+            if( aCtrlType.equalsAscii( "Group" )
+                || ! pCurParent
+                || ( aCtrlType.equalsAscii( "Subgroup" ) && nCurY < -250 && ! bIgnore ) 
+               )
+            {
+                rtl::OUString aGroupTitle( aText );
+                if( aCtrlType.equalsAscii( "Subgroup" ) )
+                    aGroupTitle = pControllerProperties->getMoreString();
+                // set size of current parent
+                if( pCurParent )
+                    adjustViewAndChildren( pCurParent, aMaxTabSize, aLeftColumn, aRightColumn );
+                
+                // new tab item
+                if( ! aText.getLength() )
+                    aText = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OOo" ) );
+                NSString* pLabel = CreateNSString( aGroupTitle );
+                NSTabViewItem* pItem = [[NSTabViewItem alloc] initWithIdentifier: pLabel ];
+                [pItem setLabel: pLabel];
+                [pTabView addTabViewItem: pItem];
+                pCurParent = [[NSView alloc] initWithFrame: aTabViewFrame];
+                [pItem setView: pCurParent];
+                [pLabel release];
+                
+                // reset indent
+                nCurX = 20;
+                // reset Y
+                nCurY = 0;
+                // clear columns
+                aLeftColumn.clear();
+                aRightColumn.clear();
+            }
+            
+            if( aCtrlType.equalsAscii( "Subgroup" ) && pCurParent )
+            {
+                bIgnoreSubgroup = bIgnore;
+                if( bIgnore )
+                    continue;
+                
+                NSControl* pTextView = createLabel( aText );
+                [pCurParent addSubview: [pTextView autorelease]];                
+                NSRect aTextRect = [pTextView frame];
+                // move to nCurY
+                aTextRect.origin.y = nCurY - aTextRect.size.height;
+                [pTextView setFrame: aTextRect];
+
+                NSRect aSepRect = { { aTextRect.size.width + 1, aTextRect.origin.y }, { 100, 6 } };
+                NSBox* pBox = [[NSBox alloc] initWithFrame: aSepRect];
+                [pBox setBoxType: NSBoxSeparator];
+                [pCurParent addSubview: [pBox autorelease]];
+                
+                // update nCurY
+                nCurY = aTextRect.origin.y - 5;
+            }
+            else if( bIgnoreSubgroup || bIgnore )
+                continue;
+            else if( aCtrlType.equalsAscii( "Bool" ) && pCurParent )
+            {
+                NSRect aCheckRect = { { nCurX + nAttachOffset, 0 }, { 0, 15 } };
+                NSButton* pBtn = [[NSButton alloc] initWithFrame: aCheckRect];
+                [pBtn setButtonType: NSSwitchButton];                
+                sal_Bool bVal = sal_False;                
+                PropertyValue* pVal = pController->getValue( aPropertyName );
+                if( pVal )
+                    pVal->Value >>= bVal;
+                [pBtn setState: bVal ? NSOnState : NSOffState];
+                linebreakCell( [pBtn cell], aText );
+                [pBtn sizeToFit];
+                [pCurParent addSubview: [pBtn autorelease]];
+                
+                aRightColumn.push_back( ColumnItem( pBtn ) );
+                
+                // connect target
+                [pBtn setTarget: pCtrlTarget];
+                [pBtn setAction: @selector(triggered:)];
+                int nTag = pControllerProperties->addNameTag( aPropertyName );
+                pControllerProperties->addObservedControl( pBtn );
+                [pBtn setTag: nTag];
+
+                aCheckRect = [pBtn frame];
+
+                // move to nCurY
+                aCheckRect.origin.y = nCurY - aCheckRect.size.height;
+                [pBtn setFrame: aCheckRect];
+
+                // update nCurY
+                nCurY = aCheckRect.origin.y - 5;
+            }
+            else if( aCtrlType.equalsAscii( "Radio" ) && pCurParent )
+            {
+                sal_Int32 nOff = 0;
+                if( aText.getLength() )
+                {
+                    // add a label
+                    NSControl* pTextView = createLabel( aText );
+                    NSRect aTextRect = [pTextView frame];
+                    aTextRect.origin.x = nCurX + nAttachOffset;
+                    [pCurParent addSubview: [pTextView autorelease]];
+                    
+                    aLeftColumn.push_back( ColumnItem( pTextView ) );
+    
+                    // move to nCurY
+                    aTextRect.origin.y = nCurY - aTextRect.size.height;
+                    [pTextView setFrame: aTextRect];
+                    
+                    // update nCurY
+                    nCurY = aTextRect.origin.y - 5;
+                    
+                    // indent the radio group relative to the text
+                    // nOff = 20;
+                }
+                
+                // setup radio matrix
+                NSButtonCell* pProto = [[NSButtonCell alloc] init];
+                
+                NSRect aRadioRect = { { nCurX + nOff, 0 }, { 280 - nCurX, 5*aChoices.getLength() } };
+                [pProto setTitle: @"RadioButtonGroup"];
+                [pProto setButtonType: NSRadioButton];
+                NSMatrix* pMatrix = [[NSMatrix alloc] initWithFrame: aRadioRect
+                                                      mode: NSRadioModeMatrix
+                                                      prototype: (NSCell*)pProto
+                                                      numberOfRows: aChoices.getLength()
+                                                      numberOfColumns: 1];
+                // get currently selected value
+                sal_Int32 nSelectVal = 0;
+                PropertyValue* pVal = pController->getValue( aPropertyName );
+                if( pVal && pVal->Value.hasValue() )
+                    pVal->Value >>= nSelectVal;
+                // set individual titles
+                NSArray* pCells = [pMatrix cells];
+                for( sal_Int32 m = 0; m < aChoices.getLength(); m++ )
+                {
+                    NSCell* pCell = [pCells objectAtIndex: m];
+                    filterAccelerator( aChoices[m] );
+                    linebreakCell( pCell, aChoices[m] );
+                    //NSString* pTitle = CreateNSString( aChoices[m] );
+                    //[pCell setTitle: pTitle];
+                    // connect target and action
+                    [pCell setTarget: pCtrlTarget];
+                    [pCell setAction: @selector(triggered:)];
+                    int nTag = pControllerProperties->addNameAndValueTag( aPropertyName, m );
+                    pControllerProperties->addObservedControl( pCell );
+                    [pCell setTag: nTag];
+                    //[pTitle release];
+                    // set current selection
+                    if( nSelectVal == m )
+                        [pMatrix selectCellAtRow: m column: 0];
+                }
+                [pMatrix sizeToFit];
+                aRadioRect = [pMatrix frame];
+
+                // move it down, so it comes to the correct position
+                aRadioRect.origin.y = nCurY - aRadioRect.size.height;
+                [pMatrix setFrame: aRadioRect];
+                [pCurParent addSubview: [pMatrix autorelease]];
+
+                aRightColumn.push_back( ColumnItem( pMatrix ) );
+
+                // update nCurY
+                nCurY = aRadioRect.origin.y - 5;
+                
+                [pProto release];
+            }
+            else if( aCtrlType.equalsAscii( "List" ) && pCurParent )
+            {
+                // don't indent attached lists, looks bad in the existing cases
+                NSControl* pTextView = createLabel( aText );
+                [pCurParent addSubview: [pTextView autorelease]];
+                aLeftColumn.push_back( ColumnItem( pTextView ) );
+                NSRect aTextRect = [pTextView frame];
+                aTextRect.origin.x = nCurX /* + nAttachOffset*/;
+
+                // don't indent attached lists, looks bad in the existing cases
+                NSRect aBtnRect = { { nCurX /*+ nAttachOffset*/ + aTextRect.size.width, 0 }, { 0, 15 } };
+                NSPopUpButton* pBtn = [[NSPopUpButton alloc] initWithFrame: aBtnRect pullsDown: NO];
+
+                // iterate options
+                for( sal_Int32 m = 0; m < aChoices.getLength(); m++ )
+                {
+                    NSString* pItemText = CreateNSString( aChoices[m] );
+                    [pBtn addItemWithTitle: pItemText];
+                    NSMenuItem* pItem = [pBtn itemWithTitle: pItemText];
+                    int nTag = pControllerProperties->addNameAndValueTag( aPropertyName, m );
+                    [pItem setTag: nTag];
+                    [pItemText release];
+                }
+
+                PropertyValue* pVal = pController->getValue( aPropertyName );
+                sal_Int32 aSelectVal = 0;
+                if( pVal && pVal->Value.hasValue() )
+                    pVal->Value >>= aSelectVal;
+                [pBtn selectItemAtIndex: aSelectVal];
+                
+                // add the button to observed controls for enabled state changes
+                // also add a tag just for this purpose
+                pControllerProperties->addObservedControl( pBtn );
+                [pBtn setTag: pControllerProperties->addNameTag( aPropertyName )];
+
+                [pBtn sizeToFit];
+                [pCurParent addSubview: [pBtn autorelease]];
+                
+                aRightColumn.push_back( ColumnItem( pBtn ) );
+
+                // connect target and action
+                [pBtn setTarget: pCtrlTarget];
+                [pBtn setAction: @selector(triggered:)];
+                
+                // move to nCurY
+                aBtnRect = [pBtn frame];
+                aBtnRect.origin.y = nCurY - aBtnRect.size.height;
+                [pBtn setFrame: aBtnRect];
+                
+                // align label
+                aTextRect.origin.y = aBtnRect.origin.y + (aBtnRect.size.height - aTextRect.size.height)/2;
+                [pTextView setFrame: aTextRect];
+
+                // update nCurY
+                nCurY = aBtnRect.origin.y - 5;
+            }
+            else if( (aCtrlType.equalsAscii( "Edit" ) || aCtrlType.equalsAscii( "Range" )) && pCurParent )
+            {
+                sal_Int32 nOff = 0;
+                if( aText.getLength() )
+                {
+                    // add a label
+                    NSControl* pTextView = createLabel( aText );
+                    [pCurParent addSubview: [pTextView autorelease]];
+                    
+                    aLeftColumn.push_back( ColumnItem( pTextView ) );
+                    
+                    // move to nCurY
+                    NSRect aTextRect = [pTextView frame];
+                    aTextRect.origin.x = nCurX + nAttachOffset;
+                    aTextRect.origin.y = nCurY - aTextRect.size.height;
+                    [pTextView setFrame: aTextRect];
+                    
+                    // update nCurY
+                    nCurY = aTextRect.origin.y - 5;
+                    
+                    // and set the offset for the real edit field
+                    nOff = aTextRect.size.width + 5;
+                }
+                
+                NSRect aFieldRect = { { nCurX + nOff +  nAttachOffset, 0 }, { 100, 25 } };
+                NSTextField* pFieldView = [[NSTextField alloc] initWithFrame: aFieldRect];
+                [pFieldView setEditable: YES];
+                [pFieldView setSelectable: YES];
+                [pFieldView setDrawsBackground: YES];
+                [pFieldView sizeToFit]; // FIXME: this does nothing
+                [pCurParent addSubview: [pFieldView autorelease]];
+                
+                aRightColumn.push_back( ColumnItem( pFieldView ) );
+                
+                // add the field to observed controls for enabled state changes
+                // also add a tag just for this purpose
+                pControllerProperties->addObservedControl( pFieldView );
+                int nTag = pControllerProperties->addNameTag( aPropertyName );
+                [pFieldView setTag: nTag];
+                // pControllerProperties->addNamedView( pFieldView, aPropertyName );
+
+                // move to nCurY
+                aFieldRect.origin.y = nCurY - aFieldRect.size.height;
+                [pFieldView setFrame: aFieldRect];
+
+                // current value
+                PropertyValue* pVal = pController->getValue( aPropertyName );
+                if( aCtrlType.equalsAscii( "Range" ) )
+                {
+                    // add a stepper control
+                    NSRect aStepFrame = { { aFieldRect.origin.x + aFieldRect.size.width + 5,
+                                            aFieldRect.origin.y },
+                                        { 15, aFieldRect.size.height } };
+                    NSStepper* pStep = [[NSStepper alloc] initWithFrame: aStepFrame];
+                    [pStep setIncrement: 1];
+                    [pStep setValueWraps: NO];
+                    [pStep setTag: nTag];
+                    [pCurParent addSubview: [pStep autorelease]];
+                    
+                    aRightColumn.back().pSubControl = pStep;
+                    
+                    pControllerProperties->addObservedControl( pStep );
+                    [pStep setTarget: pCtrlTarget];
+                    [pStep setAction: @selector(triggered:)];
+                    
+                    // constrain the text field to decimal numbers
+                    NSNumberFormatter* pFormatter = [[NSNumberFormatter alloc] init];
+                    [pFormatter setFormatterBehavior: NSNumberFormatterBehavior10_4];
+                    [pFormatter setNumberStyle: NSNumberFormatterDecimalStyle];
+                    [pFormatter setAllowsFloats: NO];
+                    [pFormatter setMaximumFractionDigits: 0];
+                    if( nMinValue != nMaxValue )
+                    {
+                        [pFormatter setMinimum: [[NSNumber numberWithInt: nMinValue] autorelease]];
+                        [pStep setMinValue: nMinValue];
+                        [pFormatter setMaximum: [[NSNumber numberWithInt: nMaxValue] autorelease]];
+                        [pStep setMaxValue: nMaxValue];
+                    }
+                    [pFieldView setFormatter: pFormatter];
+
+                    sal_Int64 nSelectVal = 0;
+                    if( pVal && pVal->Value.hasValue() )
+                        pVal->Value >>= nSelectVal;
+                    
+                    [pFieldView setIntValue: nSelectVal];
+                    [pStep setIntValue: nSelectVal];
+
+                    pControllerProperties->addViewPair( pFieldView, pStep );
+                    // connect target and action
+                    [pFieldView setTarget: pCtrlTarget];
+                    [pFieldView setAction: @selector(triggeredNumeric:)];
+                    [pStep setTarget: pCtrlTarget];
+                    [pStep setAction: @selector(triggeredNumeric:)];
+                }
+                else
+                {
+                    // connect target and action
+                    [pFieldView setTarget: pCtrlTarget];
+                    [pFieldView setAction: @selector(triggered:)];
+
+                    if( pVal && pVal->Value.hasValue() )
+                    {
+                        rtl::OUString aValue;
+                        pVal->Value >>= aValue;
+                        if( aValue.getLength() )
+                        {
+                            NSString* pText = CreateNSString( aValue );
+                            [pFieldView setStringValue: pText];
+                            [pText release];
+                        }
+                    }
+                }
+
+                // update nCurY
+                nCurY = aFieldRect.origin.y - 5;
+                
+            }
+        }
+        else
+        {
+            DBG_ERROR( "Unsupported UI option" );
+        }
+    }
+    
+    pControllerProperties->updateEnableState();
+    adjustViewAndChildren( pCurParent, aMaxTabSize, aLeftColumn, aRightColumn );
+    
+    // leave some space for the preview
+    if( aMaxTabSize.height < 200 )
+        aMaxTabSize.height = 200;
+    
+    // now reposition everything again so it is upper bound
+    adjustTabViews( pTabView, aMaxTabSize );
+    
+    // find the minimum needed tab size
+    NSSize aTabCtrlSize = [pTabView minimumSize];
+    aTabCtrlSize.height += aMaxTabSize.height + 10;
+    if( aTabCtrlSize.width < aMaxTabSize.width + 10 )
+        aTabCtrlSize.width = aMaxTabSize.width + 10;
+    [pTabView setFrameSize: aTabCtrlSize];
+    aViewFrame.size.width = aTabCtrlSize.width + aTabViewFrame.origin.x;
+    aViewFrame.size.height = aTabCtrlSize.height + aTabViewFrame.origin.y;
+    [pAccessoryView setFrameSize: aViewFrame.size];
+    
+    pControllerProperties->setupPreview( pCtrlTarget );
+
+    // set the accessory view
+    [pOp setAccessoryView: [pAccessoryView autorelease]];
+    
+    // set the current selecte tab item
+    if( pState->nLastPage >= 0 && pState->nLastPage < [pTabView numberOfTabViewItems] )
+        [pTabView selectTabViewItemAtIndex: pState->nLastPage];
+        
+    return pCtrlTarget;
+}
+
+@end
diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm
index ba139da5f5a4..ae42c5c09e8d 100755
--- a/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/vcl/aqua/source/gdi/aquaprintview.mm
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: aquaprintview.mm,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,15 +30,15 @@
 
 #include "aquaprintview.h"
 #include "salprn.h"
-#include "vcl/impprn.hxx"
+#include "vcl/print.hxx"
 
 @implementation AquaPrintView
--(id)initWithQPrinter: (ImplQPrinter*)pPrinter withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter
+-(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter
 {
     NSRect aRect = { { 0, 0 }, [pInfoPrinter->getPrintInfo() paperSize] };
     if( (self = [super initWithFrame: aRect]) != nil )
     {
-        mpQPrinter = pPrinter;
+        mpController = pController;
         mpInfoPrinter = pInfoPrinter;
     }
     return self;
@@ -79,6 +76,7 @@
     int nPage = (int)(aPaperSize.width * rect.origin.y + rect.origin.x);
     
     // page count is 1 based
-    mpQPrinter->PrintPage( nPage-1 + mpInfoPrinter->getCurPageRangeStart() );
+    if( nPage - 1 < (mpInfoPrinter->getCurPageRangeStart() + mpInfoPrinter->getCurPageRangeCount() ) )
+        mpController->printFilteredPage( nPage-1 );
 }
 @end
diff --git a/vcl/aqua/source/gdi/makefile.mk b/vcl/aqua/source/gdi/makefile.mk
index deb6832a5525..6cf1d498cce2 100644
--- a/vcl/aqua/source/gdi/makefile.mk
+++ b/vcl/aqua/source/gdi/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.154.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,6 +58,7 @@ SLOFILES=   $(SLO)$/salmathutils.obj      \
             $(SLO)$/salvd.obj             \
             $(SLO)$/salprn.obj            \
             $(SLO)$/aquaprintview.obj     \
+            $(SLO)$/aquaprintaccessoryview.obj     \
             $(SLO)$/salbmp.obj
 
 .IF "$(ENABLE_CAIRO)" == "TRUE"
diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx
index 1387a46c6345..335505de85ac 100755
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.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/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx
index 23755ae2f571..1566f0961f54 100644
--- a/vcl/aqua/source/gdi/salatsuifontutils.cxx
+++ b/vcl/aqua/source/gdi/salatsuifontutils.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/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx
index 8b7b23a681a0..0e58c35b5fad 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.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: salbmp.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/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx
index 5128458448cd..ec33b2dd8f8d 100755
--- a/vcl/aqua/source/gdi/salcolorutils.cxx
+++ b/vcl/aqua/source/gdi/salcolorutils.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: salcolorutils.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/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx
index 263a5b6e6803..a54a7fad7ac5 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.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
  *
@@ -604,7 +604,8 @@ void AquaSalGraphics::EndSetClipRegion()
 void AquaSalGraphics::SetLineColor()
 {
     maLineColor.SetAlpha( 0.0 );   // transparent
-    CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
+    if( CheckContext() )
+        CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
 }
 
 // -----------------------------------------------------------------------
@@ -612,7 +613,8 @@ void AquaSalGraphics::SetLineColor()
 void AquaSalGraphics::SetLineColor( SalColor nSalColor )
 {
     maLineColor = RGBAColor( nSalColor );
-    CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
+    if( CheckContext() )
+        CGContextSetStrokeColor( mrContext, maLineColor.AsArray() );
 }
 
 // -----------------------------------------------------------------------
@@ -620,7 +622,8 @@ void AquaSalGraphics::SetLineColor( SalColor nSalColor )
 void AquaSalGraphics::SetFillColor()
 {
     maFillColor.SetAlpha( 0.0 );   // transparent
-    CGContextSetFillColor( mrContext, maFillColor.AsArray() );
+    if( CheckContext() )
+        CGContextSetFillColor( mrContext, maFillColor.AsArray() );
 }
 
 // -----------------------------------------------------------------------
@@ -628,7 +631,8 @@ void AquaSalGraphics::SetFillColor()
 void AquaSalGraphics::SetFillColor( SalColor nSalColor )
 {
     maFillColor = RGBAColor( nSalColor );
-    CGContextSetFillColor( mrContext, maFillColor.AsArray() );
+    if( CheckContext() )
+        CGContextSetFillColor( mrContext, maFillColor.AsArray() );
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx
index 99a1629006d2..f7c234d2c4c4 100755
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.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: salgdiutils.cxx,v $
- * $Revision: 1.21 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -68,6 +65,13 @@ void AquaSalGraphics::SetPrinterGraphics( CGContextRef xContext, long nDPIX, lon
     mnRealDPIX  = nDPIX;
     mnRealDPIY  = nDPIY;
 
+    // a previously set clip path is now invalid
+    if( mxClipPath )
+    {
+        CGPathRelease( mxClipPath );
+        mxClipPath = NULL;
+    }
+
     if( mrContext )
     {
         CGContextSetFillColorSpace( mrContext, GetSalData()->mxRGBSpace );
@@ -126,6 +130,28 @@ void AquaSalGraphics::SetVirDevGraphics( CGLayerRef xLayer, CGContextRef xContex
 
 // ----------------------------------------------------------------------
 
+void AquaSalGraphics::InvalidateContext()
+{
+    UnsetState();
+    mrContext = 0;
+}
+
+// ----------------------------------------------------------------------
+
+void AquaSalGraphics::UnsetState()
+{
+    if( mrContext )
+    {
+        CGContextRestoreGState( mrContext );
+        mrContext = 0;
+    }
+    if( mxClipPath )
+    {
+        CGPathRelease( mxClipPath );
+        mxClipPath = NULL;
+    }
+}
+
 void AquaSalGraphics::SetState()
 {
     CGContextRestoreGState( mrContext );
@@ -134,9 +160,9 @@ void AquaSalGraphics::SetState()
     // setup clipping
     if( mxClipPath )
     {
-        CGContextBeginPath( mrContext );                // discard any existing path
+        CGContextBeginPath( mrContext );            // discard any existing path
         CGContextAddPath( mrContext, mxClipPath );  // set the current path to the clipping path
-        CGContextClip( mrContext );                     // use it for clipping
+        CGContextClip( mrContext );                 // use it for clipping
     }
 
     // set RGB colorspace and line and fill colors
@@ -205,7 +231,7 @@ bool AquaSalGraphics::CheckContext()
             CGContextRelease( rReleaseContext );
     }
 
-    DBG_ASSERT( mrContext, "<<<WARNING>>> AquaSalGraphics::CheckContext() FAILED!!!!\n" );
+    DBG_ASSERT( mrContext || mbPrinter, "<<<WARNING>>> AquaSalGraphics::CheckContext() FAILED!!!!\n" );
     return (mrContext != NULL);
 }
 
diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx
index bbc0613d4e7e..8df44acbf730 100755
--- a/vcl/aqua/source/gdi/salmathutils.cxx
+++ b/vcl/aqua/source/gdi/salmathutils.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: salmathutils.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/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx
index 754358823a93..3baa38320075 100644
--- a/vcl/aqua/source/gdi/salnativewidgets.cxx
+++ b/vcl/aqua/source/gdi/salnativewidgets.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: salnativewidgets.cxx,v $
- * $Revision: 1.15 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -450,6 +447,15 @@ UInt32 AquaSalGraphics::getState( ControlState nState )
     return kThemeStateActive;
 }
 
+UInt32 AquaSalGraphics::getTrackState( ControlState nState )
+{
+    bool bDrawActive = mpFrame ? ([mpFrame->getWindow() isKeyWindow] ? true : false) : true;
+    if( (nState & CTRL_STATE_ENABLED) == 0 || ! bDrawActive )
+            return kThemeTrackInactive;
+
+    return kThemeTrackActive;
+}
+
 /*
  * DrawNativeControl()
  *
@@ -767,7 +773,10 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
             aTrackInfo.attributes           = kThemeTrackHorizontal;
             if( Application::GetSettings().GetLayoutRTL() )
                 aTrackInfo.attributes      |= kThemeTrackRightToLeft;
-            aTrackInfo.enableState          = (nState & CTRL_STATE_ENABLED) ? kThemeTrackActive : kThemeTrackInactive;
+            aTrackInfo.enableState          = getTrackState( nState );
+            // the intro bitmap never gets key anyway; we want to draw that enabled
+            if( nType == CTRL_INTROPROGRESS )
+                aTrackInfo.enableState          = kThemeTrackActive;
             aTrackInfo.filler1              = 0;
             aTrackInfo.trackInfo.progress.phase   = static_cast<UInt8>(CFAbsoluteTimeGetCurrent()*10.0);
 
@@ -799,7 +808,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType,
                 aTrackDraw.attributes = kThemeTrackShowThumb;
                 if( nPart == PART_DRAW_BACKGROUND_HORZ )
                     aTrackDraw.attributes |= kThemeTrackHorizontal;
-                aTrackDraw.enableState = kThemeTrackActive;
+                aTrackDraw.enableState = getTrackState( nState );
 
                 ScrollBarTrackInfo aScrollInfo;
                 aScrollInfo.viewsize = pScrollbarVal->mnVisibleSize;
diff --git a/vcl/aqua/source/gdi/salpixmaputils.cxx b/vcl/aqua/source/gdi/salpixmaputils.cxx
index 0e6df6d19e1a..b39120080b88 100755
--- a/vcl/aqua/source/gdi/salpixmaputils.cxx
+++ b/vcl/aqua/source/gdi/salpixmaputils.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: salpixmaputils.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/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx
index b9a1f4ef7748..cee243093ff3 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.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: salprn.cxx,v $
- * $Revision: 1.16 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -38,7 +35,6 @@
 #include "saldata.hxx"
 #include "vcl/jobset.h"
 #include "vcl/salptype.hxx"
-#include "vcl/impprn.hxx"
 #include "vcl/print.hxx"
 #include "vcl/unohelp.hxx"
 
@@ -47,11 +43,13 @@
 #include "com/sun/star/lang/XMultiServiceFactory.hpp"
 #include "com/sun/star/container/XNameAccess.hpp"
 #include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/awt/Size.hpp"
 
 #include <algorithm>
 
 using namespace rtl;
 using namespace vcl;
+using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::beans;
@@ -67,7 +65,9 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
     mpPrintInfo( nil ),
     mePageOrientation( ORIENTATION_PORTRAIT ),
     mnStartPageOffsetX( 0 ),
-    mnStartPageOffsetY( 0 )
+    mnStartPageOffsetY( 0 ),
+    mnCurPageRangeStart( 0 ),
+    mnCurPageRangeCount( 0 )
 {
     NSString* pStr = CreateNSString( i_rQueue.maPrinterName );
     mpPrinter = [NSPrinter printerWithName: pStr];
@@ -87,6 +87,7 @@ AquaSalInfoPrinter::AquaSalInfoPrinter( const SalPrinterQueueInfo& i_rQueue ) :
     const int nWidth = 100, nHeight = 100;
     maContextMemory.reset( reinterpret_cast<sal_uInt8*>( rtl_allocateMemory( nWidth * 4 * nHeight ) ),
                            boost::bind( rtl_freeMemory, _1 ) );
+
     if( maContextMemory )
     {
         mrContext = CGBitmapContextCreate( maContextMemory.get(), nWidth, nHeight, 8, nWidth * 4, GetSalData()->mxRGBSpace, kCGImageAlphaNoneSkipFirst );
@@ -134,7 +135,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
                 dY -= aPaperSize.height - aImageRect.size.height - aImageRect.origin.y;
                 CGContextTranslateCTM( i_rContext, dX + mnStartPageOffsetX, dY - mnStartPageOffsetY );
                 // scale to be top/down and reflect our "virtual" DPI
-                CGContextScaleCTM( i_rContext, 0.1, -0.1 );
+                CGContextScaleCTM( i_rContext, 72.0/double(nDPIX), -(72.0/double(nDPIY)) );
             }
             else
             {
@@ -148,7 +149,7 @@ void AquaSalInfoPrinter::SetupPrinterGraphics( CGContextRef i_rContext ) const
                 dY = -aPaperSize.width;
                 CGContextTranslateCTM( i_rContext, dX + mnStartPageOffsetY, dY - mnStartPageOffsetX );
                 // scale to be top/down and reflect our "virtual" DPI
-                CGContextScaleCTM( i_rContext, -0.1, 0.1 );
+                CGContextScaleCTM( i_rContext, -(72.0/double(nDPIY)), (72.0/double(nDPIX)) );
             }
             mpGraphics->SetPrinterGraphics( i_rContext, nDPIX, nDPIY, 1.0 );
         }
@@ -296,6 +297,28 @@ BOOL AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData )
 
 // -----------------------------------------------------------------------
 
+void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientation i_eSetOrientation )
+{
+
+    Orientation ePaperOrientation = ORIENTATION_PORTRAIT;
+    const PaperInfo* pPaper = matchPaper( i_nWidth, i_nHeight, ePaperOrientation );
+
+    if( pPaper )
+    {
+        NSString* pPaperName = [CreateNSString( rtl::OStringToOUString(PaperInfo::toPSName(pPaper->getPaper()), RTL_TEXTENCODING_ASCII_US) ) autorelease];
+        [mpPrintInfo setPaperName: pPaperName];
+    }
+    else if( i_nWidth > 0 && i_nHeight > 0 )
+    {
+        NSSize aPaperSize = { TenMuToPt(i_nWidth), TenMuToPt(i_nHeight) };
+        [mpPrintInfo setPaperSize: aPaperSize];
+    }
+    // this seems counterintuitive
+    mePageOrientation = i_eSetOrientation;
+}
+
+// -----------------------------------------------------------------------
+
 BOOL AquaSalInfoPrinter::SetData( ULONG i_nFlags, ImplJobSetup* io_pSetupData )
 {
     if( ! io_pSetupData || io_pSetupData->mnSystem != JOBSETUP_SYSTEM_MAC )
@@ -304,31 +327,32 @@ BOOL AquaSalInfoPrinter::SetData( ULONG i_nFlags, ImplJobSetup* io_pSetupData )
 
     if( mpPrintInfo )
     {
+        if( (i_nFlags & SAL_JOBSET_ORIENTATION) != 0 )
+            mePageOrientation = io_pSetupData->meOrientation;
+
         if( (i_nFlags & SAL_JOBSET_PAPERSIZE) !=  0)
         {
             // set paper format
-            double width = 0, height = 0;
+            long width = 21000, height = 29700;
             if( io_pSetupData->mePaperFormat == PAPER_USER )
             {
                 // #i101108# sanity check
                 if( io_pSetupData->mnPaperWidth && io_pSetupData->mnPaperHeight )
                 {
-                    width = TenMuToPt( io_pSetupData->mnPaperWidth );
-                    height = TenMuToPt( io_pSetupData->mnPaperHeight );
+                    width = io_pSetupData->mnPaperWidth;
+                    height = io_pSetupData->mnPaperHeight;
                 }
             }
             else
-                getPaperSize( width, height, io_pSetupData->mePaperFormat );
-
-            if( width > 0 && height > 0 )
             {
-                NSSize aPaperSize = { width, height };
-                [mpPrintInfo setPaperSize: aPaperSize];
+                double w = 595,  h = 842;
+                getPaperSize( w, h, io_pSetupData->mePaperFormat );
+                width = static_cast<long>(PtTo10Mu( w ));
+                height = static_cast<long>(PtTo10Mu( h ));
             }
-        }
 
-        if( (i_nFlags & SAL_JOBSET_ORIENTATION) != 0 )
-            mePageOrientation = io_pSetupData->meOrientation;
+            setPaperSize( width, height, mePageOrientation );
+        }
     }
 
     return mpPrintInfo != nil;
@@ -424,6 +448,8 @@ ULONG AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup* i_pSetupData, USH
             return 0;
         case PRINTER_CAPABILITIES_SETORIENTATION:
             return 1;
+        case PRINTER_CAPABILITIES_SETDUPLEX:
+            return 0;
         case PRINTER_CAPABILITIES_SETPAPERBIN:
             return 0;
         case PRINTER_CAPABILITIES_SETPAPERSIZE:
@@ -432,6 +458,8 @@ ULONG AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup* i_pSetupData, USH
             return 1;
         case PRINTER_CAPABILITIES_EXTERNALDIALOG:
             return getUseNativeDialog() ? 1 : 0;
+        case PRINTER_CAPABILITIES_PDF:
+            return 1;
         default: break;
     };
     return 0;
@@ -470,58 +498,129 @@ void AquaSalInfoPrinter::GetPageInfo( const ImplJobSetup*,
     }
 }
 
-BOOL AquaSalInfoPrinter::StartJob( const String* pFileName,
-                                   const String& rAppName,
-                                   ImplJobSetup* pSetupData,
-                                   ImplQPrinter* pQPrinter,
-                                   bool bIsQuickJob )
+static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPage )
+{
+    Size aPageSize;
+    Sequence< PropertyValue > aPageParms( i_rController.getPageParameters( i_nPage ) );
+    for( sal_Int32 nProperty = 0, nPropertyCount = aPageParms.getLength(); nProperty < nPropertyCount; ++nProperty )
+    {
+        if( aPageParms[ nProperty ].Name.equalsAscii( "PageSize" ) )
+        {
+            awt::Size aSize;
+            aPageParms[ nProperty].Value >>= aSize;
+            aPageSize.Width() = aSize.Width;
+            aPageSize.Height() = aSize.Height;
+            break;
+        }
+    }
+    return aPageSize;
+}
+
+BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName,
+                                   const String& i_rJobName,
+                                   const String& i_rAppName,
+                                   ImplJobSetup* i_pSetupData,
+                                   vcl::PrinterController& i_rController
+                                   )
 {
     if( mbJob )
         return FALSE;
 
     BOOL bSuccess = FALSE;
-    std::vector<ULONG> aPaperRanges;
-    if( ! pQPrinter->GetPaperRanges( aPaperRanges, true ) )
-        return FALSE;
-
-    size_t nRanges = aPaperRanges.size();
+    bool bWasAborted = false;
     AquaSalInstance* pInst = GetSalData()->mpFirstInstance;
-
-    for( ULONG nCurRange = 0; nCurRange < nRanges-1; nCurRange++ )
+    PrintAccessoryViewState aAccViewState;
+    sal_Int32 nAllPages = 0;
+
+    aAccViewState.bNeedRestart = true;
+
+    // reset IsLastPage
+    i_rController.setLastPage( sal_False );
+
+    // update job data
+    if( i_pSetupData )
+        SetData( ~0, i_pSetupData );
+
+    // do we want a progress panel ?
+    sal_Bool bShowProgressPanel = sal_True;
+    beans::PropertyValue* pMonitor = i_rController.getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MonitorVisible" ) ) );
+    if( pMonitor )
+        pMonitor->Value >>= bShowProgressPanel;
+    if( ! i_rController.isShowDialogs() )
+        bShowProgressPanel = sal_False;
+
+    // FIXME: jobStarted() should be done after the print dialog has ended (if there is one)
+    // how do I know when that might be ?
+    i_rController.jobStarted();
+    do
     {
-        mnStartPageOffsetX = mnStartPageOffsetY = 0;
+        if( aAccViewState.bNeedRestart )
+        {
+            mnCurPageRangeStart = 0;
+            mnCurPageRangeCount = 0;
+            nAllPages = i_rController.getFilteredPageCount();
+        }
+
+        aAccViewState.bNeedRestart = false;
+
+        Size aCurSize( 21000, 29700 );
+        if( nAllPages > 0 )
+        {
+            mnCurPageRangeCount = 1;
+            aCurSize = getPageSize( i_rController, mnCurPageRangeStart );
+            Size aNextSize( aCurSize );
+
+            // print pages up to a different size
+            while( mnCurPageRangeCount + mnCurPageRangeStart < nAllPages )
+            {
+                aNextSize = getPageSize( i_rController, mnCurPageRangeStart + mnCurPageRangeCount );
+                if( aCurSize == aNextSize // same page size
+                    ||
+                    (aCurSize.Width() == aNextSize.Height() && aCurSize.Height() == aNextSize.Width()) // same size, but different orientation
+                    )
+                {
+                    mnCurPageRangeCount++;
+                }
+                else
+                    break;
+            }
+        }
+        else
+            mnCurPageRangeCount = 0;
 
-        // update job data
-        ImplJobSetup* pSetup = pQPrinter->GetPageSetup( aPaperRanges[ nCurRange ] );
-        if( pSetup )
-            SetData( ~0, pSetup );
-        DBG_ASSERT( pSetup, "no job setup for range" );
+        // now for the current run
+        mnStartPageOffsetX = mnStartPageOffsetY = 0;
+        // setup the paper size and orientation
+        // do this on our associated Printer object, since that is
+        // out interface to the applications which occasionally rely on the paper
+        // information (e.g. brochure printing scales to the found paper size)
+        // also SetPaperSizeUser has the advantage that we can share a
+        // platform independent paper matching algorithm
+        boost::shared_ptr<Printer> pPrinter( i_rController.getPrinter() );
+        pPrinter->SetMapMode( MapMode( MAP_100TH_MM ) );
+        pPrinter->SetPaperSizeUser( aCurSize, true );
 
-        mnCurPageRangeStart = aPaperRanges[nCurRange];
-        mnCurPageRangeCount = aPaperRanges[nCurRange+1] - aPaperRanges[nCurRange];
         // create view
-        NSView* pPrintView = [[AquaPrintView alloc] initWithQPrinter: pQPrinter withInfoPrinter: this];
+        NSView* pPrintView = [[AquaPrintView alloc] initWithController: &i_rController withInfoPrinter: this];
 
         NSMutableDictionary* pPrintDict = [mpPrintInfo dictionary];
 
         // set filename
-        if( pFileName )
+        if( i_pFileName )
         {
             [mpPrintInfo setJobDisposition: NSPrintSaveJob];
-            NSString* pPath = CreateNSString( *pFileName );
+            NSString* pPath = CreateNSString( *i_pFileName );
             [pPrintDict setObject: pPath forKey: NSPrintSavePath];
             [pPath release];
-
-            // in this case we can only deliver the print job in one file
-            mnCurPageRangeStart = 0;
-            mnCurPageRangeCount = aPaperRanges.back();
-            nCurRange = nRanges;
         }
 
-        [pPrintDict setObject: [[NSNumber numberWithInt: (int)pQPrinter->GetCopyCount()] autorelease] forKey: NSPrintCopies];
+        [pPrintDict setObject: [[NSNumber numberWithInt: (int)i_rController.getPrinter()->GetCopyCount()] autorelease] forKey: NSPrintCopies];
         [pPrintDict setObject: [[NSNumber numberWithBool: YES] autorelease] forKey: NSPrintDetailedErrorReporting];
         [pPrintDict setObject: [[NSNumber numberWithInt: 1] autorelease] forKey: NSPrintFirstPage];
-        [pPrintDict setObject: [[NSNumber numberWithInt: (int)mnCurPageRangeCount] autorelease] forKey: NSPrintLastPage];
+        // #i103253# weird: for some reason, autoreleasing the value below like the others above
+        // leads do a double free malloc error. Why this value should behave differently from all the others
+        // is a mystery.
+        [pPrintDict setObject: [NSNumber numberWithInt: mnCurPageRangeCount] forKey: NSPrintLastPage];
 
 
         // create print operation
@@ -529,17 +628,47 @@ BOOL AquaSalInfoPrinter::StartJob( const String* pFileName,
 
         if( pPrintOperation )
         {
-            bool bShowPanel = (! bIsQuickJob && getUseNativeDialog() );
+            NSObject* pReleaseAfterUse = nil;
+            bool bShowPanel = (! i_rController.isDirectPrint() && getUseNativeDialog() && i_rController.isShowDialogs() );
             [pPrintOperation setShowsPrintPanel: bShowPanel ? YES : NO ];
-            // [pPrintOperation setShowsProgressPanel: NO];
+            [pPrintOperation setShowsProgressPanel: bShowProgressPanel ? YES : NO];
+
+            // set job title (since MacOSX 10.5)
+            if( [pPrintOperation respondsToSelector: @selector(setJobTitle:)] )
+                [pPrintOperation performSelector: @selector(setJobTitle:) withObject: [CreateNSString( i_rJobName ) autorelease]];
+
+            if( bShowPanel && mnCurPageRangeStart == 0 ) // only the first range of pages gets the accesory view
+                pReleaseAfterUse = [AquaPrintAccessoryView setupPrinterPanel: pPrintOperation withController: &i_rController withState: &aAccViewState];
+
             bSuccess = TRUE;
             mbJob = true;
             pInst->startedPrintJob();
             [pPrintOperation runOperation];
             pInst->endedPrintJob();
+            bWasAborted = [[[pPrintOperation printInfo] jobDisposition] compare: NSPrintCancelJob] == NSOrderedSame;
             mbJob = false;
+            if( pReleaseAfterUse )
+                [pReleaseAfterUse release];
         }
-    }
+
+        mnCurPageRangeStart += mnCurPageRangeCount;
+        mnCurPageRangeCount = 1;
+    } while( aAccViewState.bNeedRestart || mnCurPageRangeStart + mnCurPageRangeCount < nAllPages );
+
+    // inform application that it can release its data
+    // this is awkward, but the XRenderable interface has no method for this,
+    // so we need to call XRenderadble::render one last time with IsLastPage = TRUE
+    i_rController.setLastPage( sal_True );
+    GDIMetaFile aPageFile;
+    if( mrContext )
+        SetupPrinterGraphics( mrContext );
+    i_rController.getFilteredPageFile( 0, aPageFile );
+
+    i_rController.setJobState( bWasAborted
+                             ? view::PrintableState_JOB_ABORTED
+                             : view::PrintableState_JOB_SPOOLED );
+
+    mnCurPageRangeStart = mnCurPageRangeCount = 0;
 
     return bSuccess;
 }
@@ -581,6 +710,7 @@ SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, BOOL i_b
 
 BOOL AquaSalInfoPrinter::EndPage()
 {
+    mpGraphics->InvalidateContext();
     return TRUE;
 }
 
@@ -606,31 +736,24 @@ AquaSalPrinter::~AquaSalPrinter()
 
 // -----------------------------------------------------------------------
 
-BOOL AquaSalPrinter::StartJob( const String* pFileName,
-                               const String& rAppName,
-                               ImplJobSetup* pSetupData,
-                               ImplQPrinter* pQPrinter )
+BOOL AquaSalPrinter::StartJob( const String* i_pFileName,
+                               const String& i_rJobName,
+                               const String& i_rAppName,
+                               ImplJobSetup* i_pSetupData,
+                               vcl::PrinterController& i_rController )
 {
-    bool bIsQuickJob = false;
-    std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator quick_it =
-        pSetupData->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) ) );
-
-    if( quick_it != pSetupData->maValueMap.end() )
-    {
-        if( quick_it->second.equalsIgnoreAsciiCaseAscii( "true" ) )
-            bIsQuickJob = true;
-    }
-
-    return mpInfoPrinter->StartJob( pFileName, rAppName, pSetupData, pQPrinter, bIsQuickJob );
+    return mpInfoPrinter->StartJob( i_pFileName, i_rJobName, i_rAppName, i_pSetupData, i_rController );
 }
 
 // -----------------------------------------------------------------------
 
 BOOL AquaSalPrinter::StartJob( const XubString* i_pFileName,
-                           const XubString& i_rJobName,
-                           const XubString& i_rAppName,
-                           ULONG i_nCopies, BOOL i_bCollate,
-                           ImplJobSetup* i_pSetupData )
+                               const XubString& i_rJobName,
+                               const XubString& i_rAppName,
+                               ULONG i_nCopies,
+                               bool i_bCollate,
+                               bool i_bDirect,
+                               ImplJobSetup* i_pSetupData )
 {
     DBG_ERROR( "should never be called" );
     return FALSE;
@@ -671,20 +794,62 @@ ULONG AquaSalPrinter::GetErrorCode()
     return mpInfoPrinter->GetErrorCode();
 }
 
-////////////////////////////
-//////   IMPLEMENT US  /////
-////////////////////////////
-
-DuplexMode AquaSalInfoPrinter::GetDuplexMode( const ImplJobSetup* i_pSetupData )
+void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* i_pSetupData )
 {
-    return DUPLEX_UNKNOWN;
+    m_aPaperFormats.clear();
+    m_bPapersInit = true;
+
+    if( mpPrinter )
+    {
+        if( [mpPrinter statusForTable: @"PPD"] == NSPrinterTableOK )
+        {
+            NSArray* pPaperNames = [mpPrinter stringListForKey: @"PageSize" inTable: @"PPD"];
+            if( pPaperNames )
+            {
+                unsigned int nPapers = [pPaperNames count];
+                for( unsigned int i = 0; i < nPapers; i++ )
+                {
+                    NSString* pPaper = [pPaperNames objectAtIndex: i];
+                    NSSize aPaperSize = [mpPrinter pageSizeForPaper: pPaper];
+                    if( aPaperSize.width > 0 && aPaperSize.height > 0 )
+                    {
+                        PaperInfo aInfo( PtTo10Mu( aPaperSize.width ),
+                                         PtTo10Mu( aPaperSize.height ) );
+                        m_aPaperFormats.push_back( aInfo );
+                    }
+                }
+            }
+        }
+    }
 }
 
-void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* i_pSetupData )
+const PaperInfo* AquaSalInfoPrinter::matchPaper( long i_nWidth, long i_nHeight, Orientation& o_rOrientation ) const
 {
+    if( ! m_bPapersInit )
+        const_cast<AquaSalInfoPrinter*>(this)->InitPaperFormats( NULL );
+
+    const PaperInfo* pMatch = NULL;
+    o_rOrientation = ORIENTATION_PORTRAIT;
+    for( int n = 0; n < 2 ; n++ )
+    {
+        for( size_t i = 0; i < m_aPaperFormats.size(); i++ )
+        {
+            if( abs( m_aPaperFormats[i].getWidth() - i_nWidth ) < 50 &&
+                abs( m_aPaperFormats[i].getHeight() - i_nHeight ) < 50 )
+            {
+                pMatch = &m_aPaperFormats[i];
+                return pMatch;
+            }
+        }
+        o_rOrientation = ORIENTATION_LANDSCAPE;
+        std::swap( i_nWidth, i_nHeight );
+    }
+    return pMatch;
 }
 
 int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* i_pSetupData )
 {
-    return 0;
+    return 900;
 }
+
+
diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx
index 4d25d5d8b63b..eb09a44f5edd 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.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: salvd.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/vcl/aqua/source/res/makefile.mk b/vcl/aqua/source/res/makefile.mk
index e037108bda94..2043504450e7 100644
--- a/vcl/aqua/source/res/makefile.mk
+++ b/vcl/aqua/source/res/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/window/makefile.mk b/vcl/aqua/source/window/makefile.mk
index df11c7b2d04f..7afbce885e4a 100644
--- a/vcl/aqua/source/window/makefile.mk
+++ b/vcl/aqua/source/window/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.13 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx
index 7fe3b93ef2e8..71c84ee0c2f1 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.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: salframe.cxx,v $
- * $Revision: 1.69 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index 51f1b1a3b63c..67926a38608d 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: salframeview.mm,v $
- * $Revision: 1.12.22.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx
index 5c838701933c..f39d7c675bc4 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.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: salmenu.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/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm
index 4778bc2f71d5..015c43aed70f 100755
--- a/vcl/aqua/source/window/salnsmenu.mm
+++ b/vcl/aqua/source/window/salnsmenu.mm
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: salnsmenu.mm,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/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx
index 79da1b155cad..07d337dcc81a 100644
--- a/vcl/aqua/source/window/salobj.cxx
+++ b/vcl/aqua/source/window/salobj.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: salobj.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/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx
index 9caec2d30031..b413184f477f 100644
--- a/vcl/inc/cupsmgr.hxx
+++ b/vcl/inc/cupsmgr.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: cupsmgr.hxx,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/vcl/inc/list.h b/vcl/inc/list.h
index 66bff6912bc0..82fff328681b 100644
--- a/vcl/inc/list.h
+++ b/vcl/inc/list.h
@@ -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/vcl/inc/makefile.mk b/vcl/inc/makefile.mk
index 6ae41d079c96..f1f917284f71 100644
--- a/vcl/inc/makefile.mk
+++ b/vcl/inc/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/pch/precompiled_vcl.cxx b/vcl/inc/pch/precompiled_vcl.cxx
index f44551df73b0..af8e2048bd88 100644
--- a/vcl/inc/pch/precompiled_vcl.cxx
+++ b/vcl/inc/pch/precompiled_vcl.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: precompiled_vcl.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/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 69b9f9b0cb81..37ba36569834 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.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_vcl.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/vcl/inc/postgraphitestl.h b/vcl/inc/postgraphitestl.h
new file mode 100644
index 000000000000..736aa248b7ff
--- /dev/null
+++ b/vcl/inc/postgraphitestl.h
@@ -0,0 +1,9 @@
+#ifdef std_was_redefined_as_stlport
+//  put things back the way they were
+#   define std std_was_redefined_as_stlport
+#   undef _STLP_OUTERMOST_HEADER_ID
+//  force config to be re-read
+#   undef _STLP_NOTHROW_INHERENTLY
+#   undef _STLP_CONFIG_H
+#   include <stddef.h>
+#endif
diff --git a/vcl/inc/pregraphitestl.h b/vcl/inc/pregraphitestl.h
new file mode 100644
index 000000000000..ece0af477113
--- /dev/null
+++ b/vcl/inc/pregraphitestl.h
@@ -0,0 +1,30 @@
+#if defined(GRAPHITEADAPTSTL) && defined(std)
+#   include <ostream>
+#   include <istream>
+#   include <fstream>
+#   include <iostream>
+#   include <vector>
+#   include <algorithm>
+#   define std_was_redefined_as_stlport std
+#   undef std
+#   define _STLP_OUTERMOST_HEADER_ID 0xdeadbeaf
+#   pragma GCC visibility push(default)
+#   include _STLP_NATIVE_HEADER(exception_defines.h)
+#   include _STLP_NATIVE_HEADER(limits)
+#   include _STLP_NATIVE_HEADER(memory)
+#   include _STLP_NATIVE_HEADER(exception)
+#   include _STLP_NATIVE_HEADER(iosfwd)
+#   include _STLP_NATIVE_HEADER(algorithm)
+#   include _STLP_NATIVE_HEADER(string)
+#   include _STLP_NATIVE_HEADER(streambuf)
+#   include _STLP_NATIVE_HEADER(ios)
+#   include _STLP_NATIVE_HEADER(locale)
+#   include _STLP_NATIVE_HEADER(stdexcept)
+#   include _STLP_NATIVE_HEADER(ostream)
+#   include _STLP_NATIVE_HEADER(istream)
+#   include _STLP_NATIVE_HEADER(iostream)
+#   include _STLP_NATIVE_HEADER(vector)
+#   pragma GCC visibility pop
+#endif
+//sil_std resolves to the std that Graphite was built with
+namespace sil_std = std;
diff --git a/vcl/inc/sft.hxx b/vcl/inc/sft.hxx
index e2252802ba18..88ba2844e1e0 100644
--- a/vcl/inc/sft.hxx
+++ b/vcl/inc/sft.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/vcl/inc/vcl/ImageListProvider.hxx b/vcl/inc/vcl/ImageListProvider.hxx
index 03e0646af14d..5c0640d21ea4 100644
--- a/vcl/inc/vcl/ImageListProvider.hxx
+++ b/vcl/inc/vcl/ImageListProvider.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: toolbox.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/vcl/inc/vcl/abstdlg.hxx b/vcl/inc/vcl/abstdlg.hxx
index 66468fc0b3db..1d4e08991bda 100644
--- a/vcl/inc/vcl/abstdlg.hxx
+++ b/vcl/inc/vcl/abstdlg.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: abstdlg.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -72,6 +69,7 @@ public:
 class VCL_DLLPUBLIC VclAbstractDialogFactory
 {
 public:
+                                        virtual ~VclAbstractDialogFactory();    // needed for export of vtable
     static VclAbstractDialogFactory*    Create();
     // nDialogId was previously a ResId without ResMgr; the ResourceId is now
     // an implementation detail of the factory
diff --git a/vcl/inc/vcl/accel.h b/vcl/inc/vcl/accel.h
index b63adeae9a37..e726d04e7c99 100644
--- a/vcl/inc/vcl/accel.h
+++ b/vcl/inc/vcl/accel.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: accel.h,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/vcl/inc/vcl/accel.hxx b/vcl/inc/vcl/accel.hxx
index 39a04aba4285..ad2f03dfd942 100644
--- a/vcl/inc/vcl/accel.hxx
+++ b/vcl/inc/vcl/accel.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: accel.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/vcl/inc/vcl/accmgr.hxx b/vcl/inc/vcl/accmgr.hxx
index 8320ea12121d..a60322eac403 100644
--- a/vcl/inc/vcl/accmgr.hxx
+++ b/vcl/inc/vcl/accmgr.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: accmgr.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/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx
index 5ea729ac2f88..ef48793cf8ce 100644
--- a/vcl/inc/vcl/alpha.hxx
+++ b/vcl/inc/vcl/alpha.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: alpha.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/vcl/inc/vcl/animate.hxx b/vcl/inc/vcl/animate.hxx
index d8149acf443a..fc793fc12714 100644
--- a/vcl/inc/vcl/animate.hxx
+++ b/vcl/inc/vcl/animate.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: animate.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/vcl/inc/vcl/apptypes.hxx b/vcl/inc/vcl/apptypes.hxx
index b5491d369a9a..a2d02dcbb066 100644
--- a/vcl/inc/vcl/apptypes.hxx
+++ b/vcl/inc/vcl/apptypes.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: apptypes.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/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx
new file mode 100644
index 000000000000..8846d9bbe948
--- /dev/null
+++ b/vcl/inc/vcl/arrange.hxx
@@ -0,0 +1,422 @@
+/*************************************************************************
+ *
+ * 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 _VCL_ARRANGE_HXX
+#define _VCL_ARRANGE_HXX
+
+#include "vcl/window.hxx"
+
+#include <vector>
+#include <map>
+#include <boost/shared_ptr.hpp>
+
+namespace vcl
+{
+    /* some helper classes for simple window layouting
+       guidelines:
+       - a WindowArranger is not a Window
+       - a WindowArranger hierarchy manages exactly one level of child windows inside a common parent
+         this is to keep the vcl Window hierarchy flat, as some code like accelerators depend on such behavior
+       - a WindowArranger never becomes owner of a Window, windows need to be destroyed separately
+       - a WindowArranger however always is owner of its child WindowArrangers, that is the
+         WindowArranger hierarchy will keep track of its objects and delete them
+       - a managed element of a WindowArranger can either be a Window (a leaf in the hierarchy)
+         or a child WindowArranger (a node in the hierarchy), but never both
+    */
+
+    class WindowArranger
+    {
+    protected:
+        struct Element
+        {
+            Window*                            m_pElement;
+            boost::shared_ptr<WindowArranger>  m_pChild;
+            sal_Int32                          m_nExpandPriority;
+            Size                               m_aMinSize;
+            bool                               m_bHidden;
+            long                               m_nLeftBorder;
+            long                               m_nTopBorder;
+            long                               m_nRightBorder;
+            long                               m_nBottomBorder;
+
+            Element()
+            : m_pElement( NULL )
+            , m_pChild()
+            , m_nExpandPriority( 0 )
+            , m_bHidden( false )
+            , m_nLeftBorder( 0 )
+            , m_nTopBorder( 0 )
+            , m_nRightBorder( 0 )
+            , m_nBottomBorder( 0 )
+            {}
+
+            Element( Window* i_pWin,
+                     boost::shared_ptr<WindowArranger> const & i_pChild = boost::shared_ptr<WindowArranger>(),
+                     sal_Int32 i_nExpandPriority = 0
+                   )
+            : m_pElement( i_pWin )
+            , m_pChild( i_pChild )
+            , m_nExpandPriority( i_nExpandPriority )
+            , m_bHidden( false )
+            , m_nLeftBorder( 0 )
+            , m_nTopBorder( 0 )
+            , m_nRightBorder( 0 )
+            , m_nBottomBorder( 0 )
+            {}
+
+            void deleteChild() { m_pChild.reset(); }
+
+            sal_Int32 getExpandPriority() const;
+            Size getOptimalSize( WindowSizeType ) const;
+            bool isVisible() const;
+            void setPosSize( const Point&, const Size& );
+        };
+
+        Window*                     m_pParentWindow;
+        WindowArranger*             m_pParentArranger;
+        Rectangle                   m_aManagedArea;
+        long                        m_nOuterBorder;
+
+        virtual Element* getElement( size_t i_nIndex ) = 0;
+        const Element* getConstElement( size_t i_nIndex ) const
+        { return const_cast<WindowArranger*>(this)->getElement( i_nIndex ); }
+
+
+    public:
+        WindowArranger( WindowArranger* i_pParent = NULL )
+        : m_pParentWindow( i_pParent ? i_pParent->m_pParentWindow : NULL )
+        , m_pParentArranger( i_pParent )
+        , m_nOuterBorder( 0 )
+        {}
+        virtual ~WindowArranger();
+
+        // ask what would be the optimal size
+        virtual Size getOptimalSize( WindowSizeType ) const = 0;
+        // call Resize to trigger layouting inside the managed area
+        // without function while parent window is unset
+        virtual void resize() = 0;
+        // avoid this if possible, using the constructor instead
+        // there can be only one parent window and all managed windows MUST
+        // be direct children of that window
+        // violating that condition will result in undefined behavior
+        virtual void setParentWindow( Window* );
+
+        virtual void setParent( WindowArranger* );
+
+        virtual size_t countElements() const = 0;
+        boost::shared_ptr<WindowArranger> getChild( size_t i_nIndex ) const
+        {
+            const Element* pEle = getConstElement( i_nIndex );
+            return pEle ? pEle->m_pChild : boost::shared_ptr<WindowArranger>();
+        }
+        Window* getWindow( size_t i_nIndex ) const
+        {
+            const Element* pEle = getConstElement( i_nIndex );
+            return pEle ? pEle->m_pElement : NULL;
+        }
+
+        virtual bool isVisible() const; // true if any element is visible
+
+        sal_Int32 getExpandPriority( size_t i_nIndex ) const
+        {
+            const Element* pEle = getConstElement( i_nIndex );
+            return pEle ? pEle->getExpandPriority() : 0;
+        }
+
+        Size getMinimumSize( size_t i_nIndex ) const
+        {
+            const Element* pEle = getConstElement( i_nIndex );
+            return pEle ? pEle->m_aMinSize : Size();
+        }
+
+        bool setMinimumSize( size_t i_nIndex, const Size& i_rMinSize )
+        {
+            Element* pEle = getElement( i_nIndex );
+            if( pEle )
+                pEle->m_aMinSize = i_rMinSize;
+            return pEle != NULL;
+        }
+
+        void setBorders( size_t i_nIndex, long i_nLeft, long i_nTop, long i_nRight, long i_nBottom  )
+        {
+            Element* pEle = getElement( i_nIndex );
+            if( pEle )
+            {
+                pEle->m_nLeftBorder   = i_nLeft;
+                pEle->m_nRightBorder  = i_nRight;
+                pEle->m_nTopBorder    = i_nTop;
+                pEle->m_nBottomBorder = i_nBottom;
+            }
+        }
+
+        void show( bool i_bShow = true, bool i_bImmediateUpdate = true );
+
+        void setManagedArea( const Rectangle& i_rArea )
+        {
+            m_aManagedArea = i_rArea;
+            resize();
+        }
+        const Rectangle& getManagedArea() const { return m_aManagedArea; }
+
+        void setOuterBorder( long i_nBorder )
+        {
+            m_nOuterBorder = i_nBorder;
+            resize();
+        }
+    };
+
+    class RowOrColumn : public WindowArranger
+    {
+        long    m_nBorderWidth;
+        bool    m_bColumn;
+
+        std::vector< WindowArranger::Element > m_aElements;
+
+        void distributeRowWidth( std::vector< Size >& io_rSizes, long i_nUsedWidth, long i_nExtraWidth );
+        void distributeColumnHeight( std::vector< Size >& io_rSizes, long i_nUsedHeight, long i_nExtraHeight );
+    protected:
+        virtual Element* getElement( size_t i_nIndex )
+        { return i_nIndex < m_aElements.size() ? &m_aElements[ i_nIndex ] : 0; }
+
+    public:
+        RowOrColumn( WindowArranger* i_pParent = NULL,
+                     bool bColumn = true, long i_nBorderWidth = 5 )
+        : WindowArranger( i_pParent )
+        , m_nBorderWidth( i_nBorderWidth )
+        , m_bColumn( bColumn )
+        {}
+
+        virtual ~RowOrColumn();
+
+        virtual Size getOptimalSize( WindowSizeType ) const;
+        virtual void resize();
+        virtual size_t countElements() const { return m_aElements.size(); }
+
+        // add a managed window at the given index
+        // an index smaller than zero means add the window at the end
+        size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 );
+        void remove( Window* );
+
+        size_t addChild( boost::shared_ptr<WindowArranger> const &, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 );
+        // convenience: use for addChild( new WindowArranger( ... ) ) constructs
+        size_t addChild( WindowArranger* i_pNewChild, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 )
+        { return addChild( boost::shared_ptr<WindowArranger>( i_pNewChild ), i_nExpandPrio, i_nIndex ); }
+        void remove( boost::shared_ptr<WindowArranger> const & );
+
+        long getBorderWidth() const { return m_nBorderWidth; }
+    };
+
+    class LabeledElement : public WindowArranger
+    {
+        WindowArranger::Element m_aLabel;
+        WindowArranger::Element m_aElement;
+        long                    m_nDistance;
+        long                    m_nLabelColumnWidth;
+        int                     m_nLabelStyle;
+    protected:
+        virtual Element* getElement( size_t i_nIndex )
+        {
+            if( i_nIndex == 0 )
+                return &m_aLabel;
+            else if( i_nIndex == 1 )
+                return &m_aElement;
+            return 0;
+        }
+
+    public:
+        LabeledElement( WindowArranger* i_pParent = NULL, int i_nLabelStyle = 0, long i_nDistance = 5 )
+        : WindowArranger( i_pParent )
+        , m_nDistance( i_nDistance )
+        , m_nLabelColumnWidth( 0 )
+        , m_nLabelStyle( i_nLabelStyle )
+        {}
+
+        virtual ~LabeledElement();
+
+        virtual Size getOptimalSize( WindowSizeType ) const;
+        virtual void resize();
+        virtual size_t countElements() const { return 2; }
+
+        void setLabel( Window* );
+        void setLabel( boost::shared_ptr<WindowArranger> const & );
+        void setElement( Window* );
+        void setElement( boost::shared_ptr<WindowArranger> const & );
+        void setLabelColumnWidth( long i_nWidth )
+        { m_nLabelColumnWidth = i_nWidth; }
+
+        Size getLabelSize( WindowSizeType i_eType ) const
+        { return m_aLabel.getOptimalSize( i_eType ); }
+        Size getElementSize( WindowSizeType i_eType ) const
+        { return m_aElement.getOptimalSize( i_eType ); }
+    };
+
+    class LabelColumn : public RowOrColumn
+    {
+        long getLabelWidth() const;
+    public:
+        LabelColumn( WindowArranger* i_pParent = NULL, long i_nBorderWidth = 5 )
+        : RowOrColumn( i_pParent, true, i_nBorderWidth )
+        {}
+        virtual ~LabelColumn();
+
+        virtual Size getOptimalSize( WindowSizeType ) const;
+        virtual void resize();
+
+        // returns the index of the added label
+        size_t addRow( Window* i_pLabel, boost::shared_ptr<WindowArranger> const& i_rElement, long i_nIndent = 0 );
+        size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0 );
+    };
+
+    class Indenter : public WindowArranger
+    {
+        long                        m_nIndent;
+        WindowArranger::Element     m_aElement;
+
+    protected:
+        virtual Element* getElement( size_t i_nIndex )
+        { return i_nIndex == 0 ? &m_aElement : NULL; }
+
+    public:
+        Indenter( WindowArranger* i_pParent = NULL, long i_nIndent = 15 )
+        : WindowArranger( i_pParent )
+        , m_nIndent( i_nIndent )
+        {}
+
+        virtual ~Indenter();
+
+        virtual Size getOptimalSize( WindowSizeType ) const;
+        virtual void resize();
+        virtual size_t countElements() const { return (m_aElement.m_pElement != 0 || m_aElement.m_pChild != 0) ? 1 : 0; }
+
+        void setIndent( long i_nIndent )
+        {
+            m_nIndent = i_nIndent;
+            resize();
+        }
+
+        void setWindow( Window*, sal_Int32 i_nExpandPrio = 0 );
+        void setChild( boost::shared_ptr<WindowArranger> const &, sal_Int32 i_nExpandPrio = 0 );
+        // convenience: use for setChild( new WindowArranger( ... ) ) constructs
+        void setChild( WindowArranger* i_pChild, sal_Int32 i_nExpandPrio = 0 )
+        { setChild( boost::shared_ptr<WindowArranger>( i_pChild ), i_nExpandPrio ); }
+    };
+
+    class Spacer : public WindowArranger
+    {
+        WindowArranger::Element     m_aElement;
+        Size                        m_aSize;
+
+    protected:
+        virtual Element* getElement( size_t i_nIndex )
+        { return i_nIndex == 0 ? &m_aElement : NULL; }
+
+    public:
+        Spacer( WindowArranger* i_pParent = NULL, sal_Int32 i_nPrio = 20, const Size& i_rSize = Size( 0, 0 ) )
+        : WindowArranger( i_pParent )
+        , m_aElement( NULL, boost::shared_ptr<WindowArranger>(), i_nPrio )
+        , m_aSize( i_rSize )
+        {}
+
+        virtual ~Spacer() {}
+
+        virtual Size getOptimalSize( WindowSizeType ) const
+        { return m_aSize; }
+        virtual void resize() {}
+        virtual void setParentWindow( Window* ) {}
+        virtual size_t countElements() const { return 1; }
+        virtual bool isVisible() const { return true; }
+    };
+
+    class MatrixArranger : public WindowArranger
+    {
+        long    m_nBorderX;
+        long    m_nBorderY;
+
+        struct MatrixElement : public WindowArranger::Element
+        {
+            sal_uInt32  m_nX;
+            sal_uInt32  m_nY;
+
+            MatrixElement()
+            : WindowArranger::Element()
+            , m_nX( 0 )
+            , m_nY( 0 )
+            {}
+
+            MatrixElement( Window* i_pWin,
+                           sal_uInt32 i_nX, sal_uInt32 i_nY,
+                           boost::shared_ptr<WindowArranger> const & i_pChild = boost::shared_ptr<WindowArranger>(),
+                           sal_Int32 i_nExpandPriority = 0
+                          )
+            : WindowArranger::Element( i_pWin, i_pChild, i_nExpandPriority )
+            , m_nX( i_nX )
+            , m_nY( i_nY )
+            {
+            }
+        };
+
+        std::vector< MatrixElement >            m_aElements;
+        std::map< sal_uInt64, size_t >          m_aMatrixMap;  // maps (x | (y << 32)) to index in m_aElements
+
+        sal_uInt64 getMap( sal_uInt32 i_nX, sal_uInt32 i_nY )
+        { return static_cast< sal_uInt64 >(i_nX) | (static_cast< sal_uInt64>(i_nY) << 32 ); }
+
+        Size getOptimalSize( WindowSizeType, std::vector<long>& o_rColumnWidths, std::vector<long>& o_rRowHeights ) const;
+    protected:
+        virtual Element* getElement( size_t i_nIndex )
+        { return i_nIndex < m_aElements.size() ? &m_aElements[ i_nIndex ] : 0; }
+
+    public:
+        MatrixArranger( WindowArranger* i_pParent = NULL,
+                        long i_nBorderX = 5,
+                        long i_nBorderY = 5 )
+        : WindowArranger( i_pParent )
+        , m_nBorderX( i_nBorderX )
+        , m_nBorderY( i_nBorderY )
+        {}
+
+        virtual ~MatrixArranger();
+
+        virtual Size getOptimalSize( WindowSizeType ) const;
+        virtual void resize();
+        virtual size_t countElements() const { return m_aElements.size(); }
+
+        // add a managed window at the given matrix position
+        size_t addWindow( Window*, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 );
+        void remove( Window* );
+
+        size_t addChild( boost::shared_ptr<WindowArranger> const &, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 );
+        // convenience: use for addChild( new WindowArranger( ... ) ) constructs
+        size_t addChild( WindowArranger* i_pNewChild, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 )
+        { return addChild( boost::shared_ptr<WindowArranger>( i_pNewChild ), i_nX, i_nY, i_nExpandPrio ); }
+        void remove( boost::shared_ptr<WindowArranger> const & );
+    };
+
+}
+
+#endif
+
diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx
index 5e09388e9921..7483f54014a4 100644
--- a/vcl/inc/vcl/bitmap.hxx
+++ b/vcl/inc/vcl/bitmap.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: bitmap.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/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx
index e5ddf50f1efa..c19e1a9cbc39 100644
--- a/vcl/inc/vcl/bitmapex.hxx
+++ b/vcl/inc/vcl/bitmapex.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: bitmapex.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/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx
index c104d95f4db0..f83b4c73a903 100644
--- a/vcl/inc/vcl/bmpacc.hxx
+++ b/vcl/inc/vcl/bmpacc.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: bmpacc.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/vcl/inc/vcl/bmpfast.hxx b/vcl/inc/vcl/bmpfast.hxx
index 3dbc8ec686b9..de330704b74f 100644
--- a/vcl/inc/vcl/bmpfast.hxx
+++ b/vcl/inc/vcl/bmpfast.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: bmpfast.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/vcl/inc/vcl/brdwin.hxx b/vcl/inc/vcl/brdwin.hxx
index b86ca269640e..bf76174150e2 100644
--- a/vcl/inc/vcl/brdwin.hxx
+++ b/vcl/inc/vcl/brdwin.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: brdwin.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/vcl/inc/vcl/btndlg.hxx b/vcl/inc/vcl/btndlg.hxx
index 13c4853536d5..dbeb8350a0d4 100644
--- a/vcl/inc/vcl/btndlg.hxx
+++ b/vcl/inc/vcl/btndlg.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: btndlg.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/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx
index b80edf6712cd..317a98026f45 100644
--- a/vcl/inc/vcl/button.hxx
+++ b/vcl/inc/vcl/button.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: button.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -425,7 +422,6 @@ private:
     SAL_DLLPRIVATE void         ImplInitCheckBoxData();
     SAL_DLLPRIVATE WinBits      ImplInitStyle( const Window* pPrevWindow, WinBits nStyle );
     SAL_DLLPRIVATE void         ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground );
-    SAL_DLLPRIVATE void         ImplDrawCheckBoxState();
     SAL_DLLPRIVATE void         ImplInvalidateOrDrawCheckBoxState();
     SAL_DLLPRIVATE void         ImplDraw( OutputDevice* pDev, ULONG nDrawFlags,
                                     const Point& rPos, const Size& rSize,
@@ -450,10 +446,12 @@ protected:
     SAL_DLLPRIVATE virtual const Color&
                                 GetCanonicalTextColor( const StyleSettings& _rStyle ) const;
 
+    SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState();
+    SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; }
+    SAL_DLLPRIVATE const Rectangle& GetMouseRect() const { return maMouseRect; }
 public:
     SAL_DLLPRIVATE void         ImplCheck();
     SAL_DLLPRIVATE void         ImplSetMinimumNWFSize();
-
 public:
                     CheckBox( Window* pParent, WinBits nStyle = 0 );
                     CheckBox( Window* pParent, const ResId& rResId );
@@ -552,4 +550,15 @@ public:
             ~TriStateBox();
 };
 
+class VCL_DLLPUBLIC DisclosureButton : public CheckBox
+{
+protected:
+    SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState();
+public:
+    DisclosureButton( Window* pParent, WinBits nStyle = 0 );
+    DisclosureButton( Window* pParent, const ResId& rResId );
+
+    virtual void    KeyInput( const KeyEvent& rKEvt );
+};
+
 #endif  // _SV_BUTTON_HXX
diff --git a/vcl/inc/vcl/canvasbitmap.hxx b/vcl/inc/vcl/canvasbitmap.hxx
index b96afd9084c0..85c0aa795c8c 100644
--- a/vcl/inc/vcl/canvasbitmap.hxx
+++ b/vcl/inc/vcl/canvasbitmap.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: canvasbitmap.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/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx
index 6c70752a5759..c6f1710cdae5 100644
--- a/vcl/inc/vcl/canvastools.hxx
+++ b/vcl/inc/vcl/canvastools.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: canvastools.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/vcl/inc/vcl/cmdevt.h b/vcl/inc/vcl/cmdevt.h
index cb336e25ab8f..4594da8b7d56 100644
--- a/vcl/inc/vcl/cmdevt.h
+++ b/vcl/inc/vcl/cmdevt.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: cmdevt.h,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/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx
index ac9f852cd54c..0faac8472253 100644
--- a/vcl/inc/vcl/cmdevt.hxx
+++ b/vcl/inc/vcl/cmdevt.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: cmdevt.hxx,v $
- * $Revision: 1.6.68.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/combobox.h b/vcl/inc/vcl/combobox.h
index 5e139d1faf7e..f4fc39f021b2 100644
--- a/vcl/inc/vcl/combobox.h
+++ b/vcl/inc/vcl/combobox.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: combobox.h,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/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx
index d57d4b8a7372..e35474a84d53 100644
--- a/vcl/inc/vcl/combobox.hxx
+++ b/vcl/inc/vcl/combobox.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: combobox.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -192,8 +189,12 @@ public:
     void*           GetEntryData( USHORT nPos ) const;
 
     void            SetTopEntry( USHORT nPos );
+    void            ShowProminentEntry( USHORT nPos );
     USHORT          GetTopEntry() const;
 
+    void            SetProminentEntryType( ProminentEntry eType );
+    ProminentEntry  GetProminentEntryType() const;
+
     USHORT          GetDisplayLineCount() const;
 
     USHORT          GetSelectEntryCount() const;
diff --git a/vcl/inc/vcl/configsettings.hxx b/vcl/inc/vcl/configsettings.hxx
index aee684a84ca4..779c6450e804 100644
--- a/vcl/inc/vcl/configsettings.hxx
+++ b/vcl/inc/vcl/configsettings.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: configsettings.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -54,7 +51,6 @@ namespace vcl
         std::hash_map< rtl::OUString, SmallOUStrMap, rtl::OUStringHash > m_aSettings;
 
         virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
-        virtual void Commit();
 
         void getValues();
         SettingsConfigItem();
@@ -65,6 +61,8 @@ namespace vcl
 
         const rtl::OUString& getValue( const rtl::OUString& rGroup, const rtl::OUString& rKey ) const;
         void setValue( const rtl::OUString& rGroup, const rtl::OUString& rKey, const rtl::OUString& rValue );
+
+        virtual void Commit();
     };
 
 //........................................................................
diff --git a/vcl/inc/vcl/controldata.hxx b/vcl/inc/vcl/controldata.hxx
index 9ea698e792bd..0be0f5bd402e 100644
--- a/vcl/inc/vcl/controldata.hxx
+++ b/vcl/inc/vcl/controldata.hxx
@@ -1,28 +1,30 @@
 /*************************************************************************
-* 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 VCL_CONTROLDATA_HXX
 #define VCL_CONTROLDATA_HXX
 
diff --git a/vcl/inc/vcl/controllayout.hxx b/vcl/inc/vcl/controllayout.hxx
index d14208abd317..574d80ea9e02 100644
--- a/vcl/inc/vcl/controllayout.hxx
+++ b/vcl/inc/vcl/controllayout.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: controllayout.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/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx
index 535f75549991..3838b29a6d0a 100644
--- a/vcl/inc/vcl/ctrl.hxx
+++ b/vcl/inc/vcl/ctrl.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: ctrl.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/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx
index 1cb8a297a224..db8f5efd0566 100644
--- a/vcl/inc/vcl/cursor.hxx
+++ b/vcl/inc/vcl/cursor.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: cursor.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/vcl/inc/vcl/cvtgrf.hxx b/vcl/inc/vcl/cvtgrf.hxx
index c9df670953e5..97541c1b8f9f 100644
--- a/vcl/inc/vcl/cvtgrf.hxx
+++ b/vcl/inc/vcl/cvtgrf.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: cvtgrf.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/vcl/inc/vcl/cvtsvm.hxx b/vcl/inc/vcl/cvtsvm.hxx
index c6f4f2c9a126..03948ac56690 100644
--- a/vcl/inc/vcl/cvtsvm.hxx
+++ b/vcl/inc/vcl/cvtsvm.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: cvtsvm.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/vcl/inc/vcl/dbggui.hxx b/vcl/inc/vcl/dbggui.hxx
index 160dfc5e0693..7ed23706e6f3 100644
--- a/vcl/inc/vcl/dbggui.hxx
+++ b/vcl/inc/vcl/dbggui.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: dbggui.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/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx
index 9a65931ed11d..a30f209c69fc 100644
--- a/vcl/inc/vcl/decoview.hxx
+++ b/vcl/inc/vcl/decoview.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: decoview.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/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx
index c5f032dfff82..60fe97225b4b 100644
--- a/vcl/inc/vcl/dialog.hxx
+++ b/vcl/inc/vcl/dialog.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: dialog.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/vcl/inc/vcl/dllapi.h b/vcl/inc/vcl/dllapi.h
index 9695254536f9..bcf4001aa671 100644
--- a/vcl/inc/vcl/dllapi.h
+++ b/vcl/inc/vcl/dllapi.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: dllapi.h,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/vcl/inc/vcl/dndhelp.hxx b/vcl/inc/vcl/dndhelp.hxx
index bc535b16b2a5..3929bc1ebafc 100644
--- a/vcl/inc/vcl/dndhelp.hxx
+++ b/vcl/inc/vcl/dndhelp.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: dndhelp.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/vcl/inc/vcl/dockingarea.hxx b/vcl/inc/vcl/dockingarea.hxx
index 9b020880d72c..848ecac72770 100644
--- a/vcl/inc/vcl/dockingarea.hxx
+++ b/vcl/inc/vcl/dockingarea.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: dockingarea.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/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx
index 376308a8b27b..3a1dca044bb7 100644
--- a/vcl/inc/vcl/dockwin.hxx
+++ b/vcl/inc/vcl/dockwin.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: dockwin.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/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx
index fb99bd028631..a40de9503367 100644
--- a/vcl/inc/vcl/edit.hxx
+++ b/vcl/inc/vcl/edit.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: edit.hxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -120,6 +117,7 @@ private:
     SAL_DLLPRIVATE void        ImplCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard );
     SAL_DLLPRIVATE void        ImplPaste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard );
     SAL_DLLPRIVATE long        ImplGetExtraOffset() const;
+    SAL_DLLPRIVATE long        ImplGetTextYPosition() const;
     SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XExtendedInputSequenceChecker > ImplGetInputSequenceChecker() const;
     SAL_DLLPRIVATE ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > ImplGetBreakIterator() const;
 
diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx
index 04ba5f7a0abf..9458a4298c33 100644
--- a/vcl/inc/vcl/event.hxx
+++ b/vcl/inc/vcl/event.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: event.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/vcl/inc/vcl/evntpost.hxx b/vcl/inc/vcl/evntpost.hxx
index 177ed3983c25..9e9badb7157b 100644
--- a/vcl/inc/vcl/evntpost.hxx
+++ b/vcl/inc/vcl/evntpost.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: evntpost.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/vcl/inc/vcl/extoutdevdata.hxx b/vcl/inc/vcl/extoutdevdata.hxx
index 91969551dc98..cfe7b74533d8 100644
--- a/vcl/inc/vcl/extoutdevdata.hxx
+++ b/vcl/inc/vcl/extoutdevdata.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: extoutdevdata.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/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx
index 1baf16a2fd77..e1f39cc78966 100644
--- a/vcl/inc/vcl/field.hxx
+++ b/vcl/inc/vcl/field.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: field.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/vcl/inc/vcl/fixbrd.hxx b/vcl/inc/vcl/fixbrd.hxx
index 68e1e69b9054..2bf0d8e1cb31 100644
--- a/vcl/inc/vcl/fixbrd.hxx
+++ b/vcl/inc/vcl/fixbrd.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: fixbrd.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/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx
index a5c834fce486..4460694420a0 100644
--- a/vcl/inc/vcl/fixed.hxx
+++ b/vcl/inc/vcl/fixed.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: fixed.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -187,6 +184,7 @@ public:
     virtual void    StateChanged( StateChangedType nType );
     virtual void    DataChanged( const DataChangedEvent& rDCEvt );
     virtual void    UserDraw( const UserDrawEvent& rUDEvt );
+    virtual Size    GetOptimalSize(WindowSizeType eType) const;
 
     void            SetImage( const Image& rImage );
     const Image&    GetImage() const { return maImage; }
diff --git a/vcl/inc/vcl/fldunit.hxx b/vcl/inc/vcl/fldunit.hxx
index 7417342d95be..aa76f34332d6 100644
--- a/vcl/inc/vcl/fldunit.hxx
+++ b/vcl/inc/vcl/fldunit.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: fldunit.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/vcl/inc/vcl/floatwin.hxx b/vcl/inc/vcl/floatwin.hxx
index 02ac18ac28f8..8b7c9be6499c 100644
--- a/vcl/inc/vcl/floatwin.hxx
+++ b/vcl/inc/vcl/floatwin.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: floatwin.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/vcl/inc/vcl/fntstyle.hxx b/vcl/inc/vcl/fntstyle.hxx
index 0ec3b5b42e78..4b4ccc9f6d02 100644
--- a/vcl/inc/vcl/fntstyle.hxx
+++ b/vcl/inc/vcl/fntstyle.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: fntstyle.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/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx
index 2dfdef148a1d..80fd31ebf6dc 100644
--- a/vcl/inc/vcl/font.hxx
+++ b/vcl/inc/vcl/font.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: font.hxx,v $
- * $Revision: 1.3.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/fontcache.hxx b/vcl/inc/vcl/fontcache.hxx
index acc2e1c10092..b18748ed5791 100644
--- a/vcl/inc/vcl/fontcache.hxx
+++ b/vcl/inc/vcl/fontcache.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: fontcache.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/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx
index edd7a787ae3d..7e1733b49bca 100644
--- a/vcl/inc/vcl/fontmanager.hxx
+++ b/vcl/inc/vcl/fontmanager.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/vcl/inc/vcl/fontsubset.hxx b/vcl/inc/vcl/fontsubset.hxx
index 3032490dcbab..a34212128741 100644
--- a/vcl/inc/vcl/fontsubset.hxx
+++ b/vcl/inc/vcl/fontsubset.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/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx
index c53460d35584..06f7a0d14a2e 100644
--- a/vcl/inc/vcl/gdimtf.hxx
+++ b/vcl/inc/vcl/gdimtf.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: gdimtf.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -164,6 +161,7 @@ public:
     void            Scale( double fScaleX, double fScaleY );
     void            Scale( const Fraction& rScaleX, const Fraction& rScaleY );
     void            Rotate( long nAngle10 );
+    void            Clip( const Rectangle& );
     /* get the bound rect of the contained actions
      * caveats:
      * - clip actions will limit the contained actions,
diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx
index 27024209c1e2..3b3938ec848b 100644
--- a/vcl/inc/vcl/gfxlink.hxx
+++ b/vcl/inc/vcl/gfxlink.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: gfxlink.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/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx
index 33a7c80b7746..8c7d6e41b168 100644
--- a/vcl/inc/vcl/glyphcache.hxx
+++ b/vcl/inc/vcl/glyphcache.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: glyphcache.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/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx
index 1b8a0b364aaf..8938627cf684 100644
--- a/vcl/inc/vcl/gradient.hxx
+++ b/vcl/inc/vcl/gradient.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: gradient.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/vcl/inc/vcl/graph.h b/vcl/inc/vcl/graph.h
index 1aaf142bf7b5..c50a54b8802d 100644
--- a/vcl/inc/vcl/graph.h
+++ b/vcl/inc/vcl/graph.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: graph.h,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/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx
index 5f5fa8eff6ce..aa860273fdb7 100644
--- a/vcl/inc/vcl/graph.hxx
+++ b/vcl/inc/vcl/graph.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: graph.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/vcl/inc/vcl/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx
index c489d237938e..3e3b9b3dc5b5 100644
--- a/vcl/inc/vcl/graphictools.hxx
+++ b/vcl/inc/vcl/graphictools.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: graphictools.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/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx
index 41ffa00b0f8f..0b5f88184ce4 100644
--- a/vcl/inc/vcl/graphite_adaptors.hxx
+++ b/vcl/inc/vcl/graphite_adaptors.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,10 +55,11 @@
 #include "vcl/dllapi.h"
 
 // Libraries
+#include "pregraphitestl.h"
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/ITextSource.h>
-
+#include "postgraphitestl.h"
 
 // Module type definitions and forward declarations.
 //
@@ -121,7 +119,7 @@ public:
     const grutils::GrFeatureParser * features() const { return mpFeatures; };
 
 private:
-    virtual void UniqueCacheInfo(std::wstring &, bool &, bool &);
+    virtual void UniqueCacheInfo(sil_std::wstring &, bool &, bool &);
 
     FreetypeServerFont& mrFont;
     FontProperties        maFontProperties;
diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx
index 5a537c5f1e48..eba5109c7446 100644
--- a/vcl/inc/vcl/graphite_cache.hxx
+++ b/vcl/inc/vcl/graphite_cache.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -58,10 +55,11 @@ public:
     void clear();
 #ifdef GRCACHE_REUSE_VECTORS
     void setGlyphVectors(long nWidth, GraphiteLayout::Glyphs & vGlyphs, std::vector<int> vCharDxs,
-                         std::vector<int> & vChar2Base, std::vector<int> & vGlyph2Char)
+                         std::vector<int> & vChar2Base, std::vector<int> & vGlyph2Char, float fScale)
     {
         clearVectors();
         mnWidth = nWidth;
+        m_fontScale = fScale;
         mvGlyphs.insert(mvGlyphs.begin(), vGlyphs.begin(), vGlyphs.end());
         mvCharDxs.insert(mvCharDxs.begin(),vCharDxs.begin(),vCharDxs.end());
         mvChar2BaseGlyph.insert(mvChar2BaseGlyph.begin(),vChar2Base.begin(),vChar2Base.end());
@@ -78,6 +76,7 @@ public:
     const std::vector<int> & charDxs() const { return mvCharDxs; }
     const std::vector<int> & char2BaseGlyph() const { return mvChar2BaseGlyph; }
     const std::vector<int> & glyph2Char() const { return mvGlyph2Char; }
+    float & fontScale() { return m_fontScale; }
 #endif
 private:
     rtl::OUString * m_rope;
diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/vcl/graphite_features.hxx
index 6cfe5dfca0fd..9f63a029eb5f 100644
--- a/vcl/inc/vcl/graphite_features.hxx
+++ b/vcl/inc/vcl/graphite_features.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,10 +29,11 @@
 // Parse a string of features specified as ; separated pairs.
 // e.g.
 // 1001=1&2002=2&fav1=0
-
+#include "pregraphitestl.h"
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/GrFeature.h>
+#include "postgraphitestl.h"
 
 namespace grutils
 {
diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx
index 2ec3bc4c2391..b3a3814e9ce6 100644
--- a/vcl/inc/vcl/graphite_layout.hxx
+++ b/vcl/inc/vcl/graphite_layout.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -43,11 +40,13 @@
 #include <vector>
 #include <utility>
 // Libraries
+#include "pregraphitestl.h"
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/GrConstants.h>
 #include <graphite/GrAppData.h>
 #include <graphite/SegmentAux.h>
+#include "postgraphitestl.h"
 // Platform
 #include <vcl/sallayout.hxx>
 #include <vcl/dllapi.h>
diff --git a/vcl/inc/vcl/graphite_serverfont.hxx b/vcl/inc/vcl/graphite_serverfont.hxx
index d9e6670df79b..19eb70b11908 100644
--- a/vcl/inc/vcl/graphite_serverfont.hxx
+++ b/vcl/inc/vcl/graphite_serverfont.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/group.hxx b/vcl/inc/vcl/group.hxx
index 7d5dd43fbee3..48461ec18ac0 100644
--- a/vcl/inc/vcl/group.hxx
+++ b/vcl/inc/vcl/group.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: group.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/vcl/inc/vcl/hatch.hxx b/vcl/inc/vcl/hatch.hxx
index 5953a7ab842a..5a8e36088f2e 100644
--- a/vcl/inc/vcl/hatch.hxx
+++ b/vcl/inc/vcl/hatch.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: hatch.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/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx
index 3c02616c89de..4bca986812ed 100644
--- a/vcl/inc/vcl/help.hxx
+++ b/vcl/inc/vcl/help.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: help.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -75,6 +72,7 @@ public:
 
     virtual BOOL        Start( ULONG nHelpId, const Window* pWindow  );
     virtual BOOL        Start( const XubString& rKeyWord, const Window* pWindow );
+    virtual void        OpenHelpAgent( ULONG nHelpId );
     virtual XubString   GetHelpText( ULONG nHelpId, const Window* pWindow );
     virtual XubString   GetHelpText( const String& aHelpURL, const Window* pWindow );
 
diff --git a/vcl/inc/vcl/helper.hxx b/vcl/inc/vcl/helper.hxx
index 04576e30b516..9047079f6be1 100644
--- a/vcl/inc/vcl/helper.hxx
+++ b/vcl/inc/vcl/helper.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: helper.hxx,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/vcl/inc/vcl/helpwin.hxx b/vcl/inc/vcl/helpwin.hxx
index dcda31f875a8..244ae1b7d846 100644
--- a/vcl/inc/vcl/helpwin.hxx
+++ b/vcl/inc/vcl/helpwin.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: helpwin.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/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx
index e50ddecaa947..8f6a12f95761 100644
--- a/vcl/inc/vcl/i18nhelp.hxx
+++ b/vcl/inc/vcl/i18nhelp.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: i18nhelp.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/vcl/inc/vcl/idlemgr.hxx b/vcl/inc/vcl/idlemgr.hxx
index e49179baa3b2..6d7d7c8e531f 100644
--- a/vcl/inc/vcl/idlemgr.hxx
+++ b/vcl/inc/vcl/idlemgr.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: idlemgr.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/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx
index 81dd32ef2705..33f60a1e8a2f 100644
--- a/vcl/inc/vcl/ilstbox.hxx
+++ b/vcl/inc/vcl/ilstbox.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: ilstbox.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -227,6 +224,7 @@ private:
     long            mnLeft;          // Ausgabe ab Spalte
     long            mnBorder;        // Abstand Rahmen - Text
     long            mnTextHeight;    // Texthoehe
+    ProminentEntry  meProminentType; // where is the "prominent" entry
 
     USHORT          mnSelectModifier;   // Modifiers
 
@@ -309,6 +307,11 @@ public:
 
     void            SetTopEntry( USHORT nTop );
     USHORT          GetTopEntry() const             { return mnTop; }
+    // ShowProminentEntry will set the entry correspoding to nEntryPos
+    // either at top or in the middle depending on the chosen style
+    void            ShowProminentEntry( USHORT nEntryPos );
+    void            SetProminentEntryType( ProminentEntry eType ) { meProminentType = eType; }
+    ProminentEntry  GetProminentEntryType() const { return meProminentType; }
     using Window::IsVisible;
     BOOL            IsVisible( USHORT nEntry ) const;
 
@@ -443,9 +446,13 @@ public:
 
     void            SetTopEntry( USHORT nTop )      { maLBWindow.SetTopEntry( nTop ); }
     USHORT          GetTopEntry() const             { return maLBWindow.GetTopEntry(); }
+    void            ShowProminentEntry( USHORT nPos ) { maLBWindow.ShowProminentEntry( nPos ); }
     using Window::IsVisible;
     BOOL            IsVisible( USHORT nEntry ) const { return maLBWindow.IsVisible( nEntry ); }
 
+    void            SetProminentEntryType( ProminentEntry eType ) { maLBWindow.SetProminentEntryType( eType ); }
+    ProminentEntry  GetProminentEntryType() const { return maLBWindow.GetProminentEntryType(); }
+
     long            GetLeftIndent() const           { return maLBWindow.GetLeftIndent(); }
     void            SetLeftIndent( USHORT n )       { maLBWindow.SetLeftIndent( n ); }
     void            ScrollHorz( short nDiff )       { maLBWindow.ScrollHorz( nDiff ); }
diff --git a/vcl/inc/vcl/image.h b/vcl/inc/vcl/image.h
index c1d708063d65..023b2c2d1a2c 100644
--- a/vcl/inc/vcl/image.h
+++ b/vcl/inc/vcl/image.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: image.h,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/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx
index 50bc97a593f0..f4f642656783 100644
--- a/vcl/inc/vcl/image.hxx
+++ b/vcl/inc/vcl/image.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: image.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/vcl/inc/vcl/imagerepository.hxx b/vcl/inc/vcl/imagerepository.hxx
index a4dbeae11e2d..f5809650fcf3 100644
--- a/vcl/inc/vcl/imagerepository.hxx
+++ b/vcl/inc/vcl/imagerepository.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: imagerepository.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/vcl/inc/vcl/imgcons.hxx b/vcl/inc/vcl/imgcons.hxx
index ab3038c25f90..2f582fec15c3 100644
--- a/vcl/inc/vcl/imgcons.hxx
+++ b/vcl/inc/vcl/imgcons.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: imgcons.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/vcl/inc/vcl/imgctrl.hxx b/vcl/inc/vcl/imgctrl.hxx
index 04d74799bdda..fa3b01463f34 100644
--- a/vcl/inc/vcl/imgctrl.hxx
+++ b/vcl/inc/vcl/imgctrl.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: imgctrl.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/vcl/inc/vcl/impbmp.hxx b/vcl/inc/vcl/impbmp.hxx
index c3d15e15a11b..dc40fdcd3181 100644
--- a/vcl/inc/vcl/impbmp.hxx
+++ b/vcl/inc/vcl/impbmp.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: impbmp.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/vcl/inc/vcl/impbmpconv.hxx b/vcl/inc/vcl/impbmpconv.hxx
index 7bea8df8d68d..d95da9a4093a 100644
--- a/vcl/inc/vcl/impbmpconv.hxx
+++ b/vcl/inc/vcl/impbmpconv.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: impbmpconv.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/vcl/inc/vcl/impdel.hxx b/vcl/inc/vcl/impdel.hxx
index e583d8046699..fc1796f0e402 100644
--- a/vcl/inc/vcl/impdel.hxx
+++ b/vcl/inc/vcl/impdel.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: impdel.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/vcl/inc/vcl/impfont.hxx b/vcl/inc/vcl/impfont.hxx
index e2b1889e8e0e..d53785bc691a 100644
--- a/vcl/inc/vcl/impfont.hxx
+++ b/vcl/inc/vcl/impfont.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/vcl/inc/vcl/impgraph.hxx b/vcl/inc/vcl/impgraph.hxx
index 3b36173891ae..bb28d801fe12 100644
--- a/vcl/inc/vcl/impgraph.hxx
+++ b/vcl/inc/vcl/impgraph.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: impgraph.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/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/vcl/impimagetree.hxx
index 92761eabdf3c..9649fe2f5ec8 100644
--- a/vcl/inc/vcl/impimagetree.hxx
+++ b/vcl/inc/vcl/impimagetree.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.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_VCL_IMPIMAGETREE_HXX
 #define INCLUDED_VCL_IMPIMAGETREE_HXX
diff --git a/vcl/inc/vcl/impoct.hxx b/vcl/inc/vcl/impoct.hxx
index 990f44dca47a..543ab19d6a57 100644
--- a/vcl/inc/vcl/impoct.hxx
+++ b/vcl/inc/vcl/impoct.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: impoct.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/vcl/inc/vcl/impprn.hxx b/vcl/inc/vcl/impprn.hxx
index c86090e8b49f..954b2340d0c7 100644
--- a/vcl/inc/vcl/impprn.hxx
+++ b/vcl/inc/vcl/impprn.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: impprn.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,7 +25,7 @@
  *
  ************************************************************************/
 
-#ifndef _SV_IMPPRN_HXX
+#if 0
 #define _SV_IMPPRN_HXX
 
 #include <vcl/print.hxx>
@@ -107,7 +104,6 @@ public:
     /**
     used by pull implementation to emit the next page
     */
-    using Printer::PrintPage;
     void        PrintPage( unsigned int nPage );
     /**
     used by pull implementation to get the number of physical pages
diff --git a/vcl/inc/vcl/inputctx.hxx b/vcl/inc/vcl/inputctx.hxx
index 41320806639a..5e7cffa29dc6 100644
--- a/vcl/inc/vcl/inputctx.hxx
+++ b/vcl/inc/vcl/inputctx.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: inputctx.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/vcl/inc/vcl/introwin.hxx b/vcl/inc/vcl/introwin.hxx
index c73f1e417503..5ffefe0950f8 100644
--- a/vcl/inc/vcl/introwin.hxx
+++ b/vcl/inc/vcl/introwin.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: introwin.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/vcl/inc/vcl/javachild.hxx b/vcl/inc/vcl/javachild.hxx
index fbe012b0ca6b..62b447f26571 100644
--- a/vcl/inc/vcl/javachild.hxx
+++ b/vcl/inc/vcl/javachild.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: javachild.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/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx
index 4451c566b5bf..f576b816dab0 100644
--- a/vcl/inc/vcl/jobdata.hxx
+++ b/vcl/inc/vcl/jobdata.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: jobdata.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -74,6 +71,8 @@ struct JobData
 
     JobData( const JobData& rData ) { *this = rData; }
 
+    void setCollate( bool bCollate );
+
     // creates a new buffer using new
     // it is up to the user to delete it again
     bool getStreamBuffer( void*& pData, int& bytes );
diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/vcl/jobset.h
index 9f3eefd507d5..2a8be4a6999e 100644
--- a/vcl/inc/vcl/jobset.h
+++ b/vcl/inc/vcl/jobset.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: jobset.h,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,12 +57,13 @@ struct ImplJobSetup
     String          maPrinterName;      // Printer-Name
     String          maDriver;           // Driver-Name
     Orientation     meOrientation;      // Orientation
-    USHORT          mnPaperBin;         // Papierschacht
-    Paper       mePaperFormat;      // Papierformat
-    long            mnPaperWidth;       // Papierbreite in 100tel mm
-    long            mnPaperHeight;      // Papierhoehe in 100tel mm
-    ULONG           mnDriverDataLen;    // Laenge der systemabhaengigen Daten
-    BYTE*           mpDriverData;       // Systemabhaengige Daten die als Byte-Block rausgeschrieben werden
+    DuplexMode      meDuplexMode;       // Duplex
+    USHORT          mnPaperBin;         // paper bin / in tray
+    Paper           mePaperFormat;      // paper format
+    long            mnPaperWidth;       // paper width (100th mm)
+    long            mnPaperHeight;      // paper height (100th mm)
+    ULONG           mnDriverDataLen;    // length of system specific data
+    BYTE*           mpDriverData;       // system specific data (will be streamed a byte block)
     ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash >            maValueMap;
 
                     ImplJobSetup();
diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx
index 1ace66ddfc12..4228fc8e90e1 100644
--- a/vcl/inc/vcl/jobset.hxx
+++ b/vcl/inc/vcl/jobset.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: jobset.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/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx
index cdd1ed35d80f..487dea1d7c2f 100644
--- a/vcl/inc/vcl/keycod.hxx
+++ b/vcl/inc/vcl/keycod.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: keycod.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/vcl/inc/vcl/keycodes.hxx b/vcl/inc/vcl/keycodes.hxx
index 66d8a87e27a2..cfd4d11c9a7c 100644
--- a/vcl/inc/vcl/keycodes.hxx
+++ b/vcl/inc/vcl/keycodes.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: keycodes.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/vcl/inc/vcl/lazydelete.hxx b/vcl/inc/vcl/lazydelete.hxx
index 4821492af1f8..4176d5b4454f 100644
--- a/vcl/inc/vcl/lazydelete.hxx
+++ b/vcl/inc/vcl/lazydelete.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: lazydelete.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/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx
index 33758046c41e..9b12966a52ff 100644
--- a/vcl/inc/vcl/lineinfo.hxx
+++ b/vcl/inc/vcl/lineinfo.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: lineinfo.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/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx
index f3ba8428ca52..39bd75439ad9 100644
--- a/vcl/inc/vcl/longcurr.hxx
+++ b/vcl/inc/vcl/longcurr.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: longcurr.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/vcl/inc/vcl/lstbox.h b/vcl/inc/vcl/lstbox.h
index 6097422b556b..db800229b2d2 100644
--- a/vcl/inc/vcl/lstbox.h
+++ b/vcl/inc/vcl/lstbox.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: lstbox.h,v $
- * $Revision: 1.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -60,4 +57,9 @@
 */
 #define LISTBOX_ENTRY_FLAG_MULTILINE                0x0000002
 
+/** this flags lets the item be drawn disabled (e.g. in grey text)
+    usage only guaranteed with LISTBOX_ENTRY_FLAG_DISABLE_SELECTION
+*/
+#define LISTBOX_ENTRY_FLAG_DRAW_DISABLED            0x0000004
+
 #endif  // _SV_LSTBOX_H
diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx
index 0bf281798674..98cd05d999dd 100644
--- a/vcl/inc/vcl/lstbox.hxx
+++ b/vcl/inc/vcl/lstbox.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: lstbox.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -168,9 +165,13 @@ public:
     long            GetEntryFlags( USHORT nPos ) const;
 
     void            SetTopEntry( USHORT nPos );
+    void            ShowProminentEntry( USHORT nPos );
     void            SetTopEntryStr( const XubString& rStr );
     USHORT          GetTopEntry() const;
 
+    void            SetProminentEntryType( ProminentEntry eType );
+    ProminentEntry  GetProminentEntryType() const;
+
     void            SaveValue() { mnSaveValue = GetSelectEntryPos(); }
     USHORT          GetSavedValue() const { return mnSaveValue; }
 
diff --git a/vcl/inc/vcl/mapmod.hxx b/vcl/inc/vcl/mapmod.hxx
index 6a7bbb196146..b2ea32958e90 100644
--- a/vcl/inc/vcl/mapmod.hxx
+++ b/vcl/inc/vcl/mapmod.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: mapmod.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/vcl/inc/vcl/mapunit.hxx b/vcl/inc/vcl/mapunit.hxx
index c50ba49c17bb..b4c757c538e6 100644
--- a/vcl/inc/vcl/mapunit.hxx
+++ b/vcl/inc/vcl/mapunit.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: mapunit.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/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index 8d3ac4e8b505..c0cc3b5b51d6 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.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: menu.hxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -93,6 +90,8 @@ typedef USHORT MenuItemBits;
 #define MIB_POPUPSELECT         ((MenuItemBits)0x0020)
 // not in rsc/vclsrc.hxx because only a prelimitary solution
 #define MIB_NOSELECT            ((MenuItemBits)0x0040)
+#define MIB_ICON            ((MenuItemBits)0x0080)
+#define MIB_TEXT            ((MenuItemBits)0x0100)
 
 #define MENU_FLAG_NOAUTOMNEMONICS       0x0001
 #define MENU_FLAG_HIDEDISABLEDENTRIES   0x0002
diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx
index 9031aff37f47..1c7122054a4f 100644
--- a/vcl/inc/vcl/menubtn.hxx
+++ b/vcl/inc/vcl/menubtn.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: menubtn.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/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx
index 5c502399d24b..38ceff6e0690 100644
--- a/vcl/inc/vcl/metaact.hxx
+++ b/vcl/inc/vcl/metaact.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: metaact.hxx,v $
- * $Revision: 1.3.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/metric.hxx b/vcl/inc/vcl/metric.hxx
index ef1a78ac0c4b..eae6b38c5f9d 100644
--- a/vcl/inc/vcl/metric.hxx
+++ b/vcl/inc/vcl/metric.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: metric.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/vcl/inc/vcl/mnemonic.hxx b/vcl/inc/vcl/mnemonic.hxx
index 36462694d78b..804b261b79b4 100644
--- a/vcl/inc/vcl/mnemonic.hxx
+++ b/vcl/inc/vcl/mnemonic.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: mnemonic.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/vcl/inc/vcl/mnemonicengine.hxx b/vcl/inc/vcl/mnemonicengine.hxx
index 8d66b554537e..d12b3db2417e 100644
--- a/vcl/inc/vcl/mnemonicengine.hxx
+++ b/vcl/inc/vcl/mnemonicengine.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: mnemonicengine.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/vcl/inc/vcl/morebtn.hxx b/vcl/inc/vcl/morebtn.hxx
index 22ff9e5e62cd..687ef7c40a01 100644
--- a/vcl/inc/vcl/morebtn.hxx
+++ b/vcl/inc/vcl/morebtn.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: morebtn.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/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx
index 1d31ab722f29..a6cd60a9d5e3 100644
--- a/vcl/inc/vcl/msgbox.hxx
+++ b/vcl/inc/vcl/msgbox.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: msgbox.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/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx
index a2ed220f1555..a7ce5e49c31d 100644
--- a/vcl/inc/vcl/octree.hxx
+++ b/vcl/inc/vcl/octree.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: octree.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/svl/inc/memberid.hrc b/vcl/inc/vcl/oldprintadaptor.hxx
index c917bd993e97..3d7ccedc2ca1 100644
--- a/svl/inc/memberid.hrc
+++ b/vcl/inc/vcl/oldprintadaptor.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: memberid.hrc,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,20 +25,28 @@
  *
  ************************************************************************/
 
-#ifndef _MEMBERID_HRC
-#define _MEMBERID_HRC
+#ifndef _VCL_OLDPRINTADAPTOR
+#define _VCL_OLDPRINTADAPTOR
 
-#define SFX_MEMBERID(nUserData) ( ( (nUserData) >> 20 ) & 0xFF )
-#define SFX_SLOTID(nUserData)   ( (nUserData) & 0xFFFF )
+#include "vcl/print.hxx"
 
-#define MID_X       1
-#define MID_Y       2
-#define MID_RECT_LEFT    3
-#define MID_RECT_TOP     4
-#define MID_WIDTH   5
-#define MID_HEIGHT  6
-#define MID_RECT_RIGHT   7
+namespace vcl
+{
+    struct ImplOldStyleAdaptorData;
+    class VCL_DLLPUBLIC OldStylePrintAdaptor : public PrinterController
+    {
+        ImplOldStyleAdaptorData*    mpData;
+    public:
+        OldStylePrintAdaptor( const boost::shared_ptr< Printer >& );
+        virtual ~OldStylePrintAdaptor();
 
+        void StartPage();
+        void EndPage();
 
-#endif
+        virtual int  getPageCount() const;
+        virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const;
+        virtual void printPage( int i_nPage ) const;
+    };
+}
 
+#endif
diff --git a/vcl/inc/vcl/opengl.hxx b/vcl/inc/vcl/opengl.hxx
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/vcl/inc/vcl/opengl.hxx
+++ /dev/null
diff --git a/vcl/inc/vcl/outdata.hxx b/vcl/inc/vcl/outdata.hxx
index 2c4367da3a69..5d2852444767 100644
--- a/vcl/inc/vcl/outdata.hxx
+++ b/vcl/inc/vcl/outdata.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: outdata.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/vcl/inc/vcl/outdev.h b/vcl/inc/vcl/outdev.h
index 67dc256ce11c..43a1e9cf2cea 100644
--- a/vcl/inc/vcl/outdev.h
+++ b/vcl/inc/vcl/outdev.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: outdev.h,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/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index 4a5b92444c21..101a368b0586 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.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: outdev.hxx,v $
- * $Revision: 1.7.20.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1131,12 +1128,15 @@ public:
         false: output metafile is unchanged input metafile
 
         @attention this is a member method, so current state can influence the result !
+        @attention the output metafile is prepared in pixel mode for the currentOutputDevice
+                   state. It can not be moved or rotated reliably anymore.
     */
     bool                RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, GDIMetaFile& rOutMtf,
                                                           long nMaxBmpDPIX, long nMaxBmpDPIY,
                                                           bool bReduceTransparency,
                                                           bool bTransparencyAutoMode,
-                                                          bool bDownsampleBitmaps
+                                                          bool bDownsampleBitmaps,
+                                                          const Color& rBackground = Color( COL_TRANSPARENT )
                                                           );
     /** Retrieve downsampled and cropped bitmap
 
diff --git a/vcl/inc/vcl/outdev3d.hxx b/vcl/inc/vcl/outdev3d.hxx
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/vcl/inc/vcl/outdev3d.hxx
+++ /dev/null
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx
index b72e78994a75..87c20ebfd7f9 100644
--- a/vcl/inc/vcl/outfont.hxx
+++ b/vcl/inc/vcl/outfont.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/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx
index 6fa3dd8ebae3..5dda4b0f79fa 100644
--- a/vcl/inc/vcl/pdfextoutdevdata.hxx
+++ b/vcl/inc/vcl/pdfextoutdevdata.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: pdfextoutdevdata.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/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx
index dbfaf9eda18d..b4bdcce5c1b8 100644
--- a/vcl/inc/vcl/pdfwriter.hxx
+++ b/vcl/inc/vcl/pdfwriter.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: pdfwriter.hxx,v $
- * $Revision: 1.8.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/pngread.hxx b/vcl/inc/vcl/pngread.hxx
index 285af1407c1c..d2879f8f182a 100644
--- a/vcl/inc/vcl/pngread.hxx
+++ b/vcl/inc/vcl/pngread.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: pngread.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/vcl/inc/vcl/pngwrite.hxx b/vcl/inc/vcl/pngwrite.hxx
index b6b1835be0b8..38ca97a8c931 100644
--- a/vcl/inc/vcl/pngwrite.hxx
+++ b/vcl/inc/vcl/pngwrite.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: pngwrite.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/vcl/inc/vcl/pointr.hxx b/vcl/inc/vcl/pointr.hxx
index c38279297bd8..b90b3b04d134 100644
--- a/vcl/inc/vcl/pointr.hxx
+++ b/vcl/inc/vcl/pointr.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: pointr.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/vcl/inc/vcl/polyscan.hxx b/vcl/inc/vcl/polyscan.hxx
index c26d70dded23..1c699e36623d 100644
--- a/vcl/inc/vcl/polyscan.hxx
+++ b/vcl/inc/vcl/polyscan.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: polyscan.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/goodies/inc/chresid.hxx b/vcl/inc/vcl/popupmenuwindow.hxx
index aff5898f8003..5ed794ff56ca 100644
--- a/goodies/inc/chresid.hxx
+++ b/vcl/inc/vcl/popupmenuwindow.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: chresid.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -27,18 +24,24 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _CHRESID_HXX
-#define _CHRESID_HXX
 
-///////////////////////////////////////////////////////////////////////////////
-// legt den ResourceManager fuer die ChannelList in den APPDaten ab.
-//
-class ChannelResDll
+#ifndef __POPUPMENUWINDOW_HXX__
+#define __POPUPMENUWINDOW_HXX__
+
+#include "vcl/floatwin.hxx"
+
+class VCL_DLLPUBLIC PopupMenuFloatingWindow : public FloatingWindow
 {
+private:
+    struct ImplData;
+    ImplData* mpImplData;
 public:
-    ChannelResDll();
-    ~ChannelResDll();
-};
+    PopupMenuFloatingWindow( Window* pParent, WinBits nStyle = (WB_SYSTEMFLOATWIN|WB_SYSTEMWINDOW|WB_NOBORDER) );
+    ~PopupMenuFloatingWindow();
 
-#endif //_CHRESID_HXX
+    sal_uInt16      GetMenuStackLevel() const;
+    void            SetMenuStackLevel( sal_uInt16 nLevel );
+    bool            IsPopupMenu() const;
+};
 
+#endif
diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx
index ed9f91b97d99..12e8a16f6264 100644
--- a/vcl/inc/vcl/ppdparser.hxx
+++ b/vcl/inc/vcl/ppdparser.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: ppdparser.hxx,v $
- * $Revision: 1.12.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -37,11 +34,14 @@
 #include "tools/string.hxx"
 #include "tools/stream.hxx"
 
+#include "com/sun/star/lang/Locale.hpp"
+
 #define PRINTER_PPDDIR "driver"
 
 namespace psp {
 
 class PPDParser;
+class PPDTranslator;
 
 enum PPDValueType { eInvocation, eQuoted, eSymbol, eString, eNo };
 
@@ -49,9 +49,7 @@ struct PPDValue
 {
     PPDValueType    m_eType;
     String          m_aOption;
-    String          m_aOptionTranslation;
     String          m_aValue;
-    String          m_aValueTranslation;
 };
 
 // ----------------------------------------------------------------------
@@ -80,7 +78,6 @@ public:
 private:
 
     bool                m_bUIOption;
-    String              m_aUITranslation;
     UIType              m_eUIType;
     int                 m_nOrderDependency;
     SetupType           m_eSetupType;
@@ -102,7 +99,6 @@ public:
 
     const String&       getKey() const { return m_aKey; }
     bool                isUIKey() const { return m_bUIOption; }
-    const String&       getUITranslation() const { return m_aUITranslation; }
     UIType              getUIType() const { return m_eUIType; }
     SetupType           getSetupType() const { return m_eSetupType; }
     int                 getOrderDependency() const { return m_nOrderDependency; }
@@ -185,6 +181,9 @@ private:
     // fonts
     const PPDKey*                               m_pFontList;
 
+    // translations
+    PPDTranslator*                              m_pTranslator;
+
     PPDParser( const String& rFile );
     ~PPDParser();
 
@@ -193,7 +192,7 @@ private:
     void parseConstraint( const ByteString& rLine );
     void parse( std::list< ByteString >& rLines );
 
-    String handleTranslation( const ByteString& rString );
+    String handleTranslation( const ByteString& i_rString, bool i_bIsGlobalized );
 
     static void scanPPDDir( const String& rDir );
     static void initPPDFiles();
@@ -277,6 +276,17 @@ public:
                                        String& rEncoding,
                                        String& rCharset ) const;
     const String&   getFont( int ) const;
+
+
+    rtl::OUString   translateKey( const rtl::OUString& i_rKey,
+                                  const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const;
+    rtl::OUString   translateOption( const rtl::OUString& i_rKey,
+                                     const rtl::OUString& i_rOption,
+                                     const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const;
+    rtl::OUString   translateValue( const rtl::OUString& i_rKey,
+                                    const rtl::OUString& i_rOption,
+                                    const rtl::OUString& i_rValue,
+                                    const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const;
 };
 
 // ----------------------------------------------------------------------
diff --git a/vcl/inc/vcl/print.h b/vcl/inc/vcl/print.h
index 51cbb5dee0cf..78c1bb647575 100644
--- a/vcl/inc/vcl/print.h
+++ b/vcl/inc/vcl/print.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: print.h,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,27 +28,18 @@
 #ifndef _SV_PRINT_H
 #define _SV_PRINT_H
 
-#include <tools/list.hxx>
-#include <vcl/sv.h>
-#include <vcl/dllapi.h>
+#include "vcl/sv.h"
+#include "vcl/dllapi.h"
 
 #include <vector>
 #include <hash_map>
 
 struct SalPrinterQueueInfo;
 class QueueInfo;
+class JobSetup;
 
-// ------------------------
-// - private printer data -
-// ------------------------
-struct ImplPrivatePrinterData
-{
-    bool        mbNextJobIsQuick;
-
-    ImplPrivatePrinterData() :
-        mbNextJobIsQuick( false )
-    {}
-};
+namespace vcl
+{ class PrinterListener; }
 
 // --------------------
 // - ImplPrnQueueData -
@@ -87,5 +75,7 @@ public:
 // --------------
 
 void ImplDeletePrnQueueList();
+void SAL_DLLPRIVATE ImplUpdateJobSetupPaper( JobSetup& rJobSetup );
+
 
 #endif // _SV_PRINT_H
diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx
index b9176f4106dc..96822d9bc756 100644
--- a/vcl/inc/vcl/print.hxx
+++ b/vcl/inc/vcl/print.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: print.hxx,v $
- * $Revision: 1.6.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,14 +28,22 @@
 #ifndef _SV_PRINT_HXX
 #define _SV_PRINT_HXX
 
-#include <tools/errcode.hxx>
-#include <vcl/sv.h>
-#include <vcl/dllapi.h>
-#include <vcl/outdev.hxx>
-#include <vcl/prntypes.hxx>
-#include <vcl/jobset.hxx>
-#include <vcl/gdimtf.hxx>
-#include <tools/stream.hxx>
+#include "tools/errcode.hxx"
+#include "vcl/sv.h"
+#include "vcl/dllapi.h"
+#include "vcl/outdev.hxx"
+#include "vcl/prntypes.hxx"
+#include "vcl/jobset.hxx"
+#include "vcl/gdimtf.hxx"
+#include "tools/stream.hxx"
+#include "tools/multisel.hxx"
+
+#include "com/sun/star/beans/PropertyValue.hpp"
+#include "com/sun/star/view/PrintableState.hpp"
+
+#include <boost/shared_ptr.hpp>
+#include <hash_map>
+#include <set>
 
 struct SalPrinterInfoQueue;
 class SalInfoPrinter;
@@ -46,12 +51,11 @@ struct SalPrinterQueueInfo;
 class SalPrinter;
 class VirtualDevice;
 class Window;
-class ImplQPrinter;
-struct ImplPrivatePrinterData;
 
-namespace com { namespace sun { namespace star { namespace uno {
-    class Any;
-} } } }
+namespace vcl {
+    class PrinterController;
+    class PrintDialog;
+}
 
 // -----------------
 // - Printer-Types -
@@ -216,16 +220,12 @@ class VCL_DLLPUBLIC Printer : public OutputDevice
     friend class ImplQPrinter;
 
 private:
-    ImplPrivatePrinterData*     mpPrinterData;
     SalInfoPrinter*             mpInfoPrinter;
     SalPrinter*                 mpPrinter;
-    Printer*                    mpJobPrinter;
     SalGraphics*                mpJobGraphics;
     Printer*                    mpPrev;
     Printer*                    mpNext;
     VirtualDevice*              mpDisplayDev;
-    ImplQPrinter*               mpQPrinter;
-    GDIMetaFile*                mpQMtf;
     PrinterOptions*             mpPrinterOptions;
     XubString                   maPrinterName;
     XubString                   maDriver;
@@ -250,9 +250,6 @@ private:
     BOOL                        mbUserSetupCompleted;
     BOOL                        mbUserSetupResult;
     Link                        maErrorHdl;
-    Link                        maStartPrintHdl;
-    Link                        maEndPrintHdl;
-    Link                        maPrintPageHdl;
 
     SAL_DLLPRIVATE void         ImplInitData();
     SAL_DLLPRIVATE void         ImplInit( SalPrinterQueueInfo* pInfo );
@@ -261,22 +258,25 @@ private:
                                                   const XubString* pDriver );
     SAL_DLLPRIVATE void         ImplUpdatePageData();
     SAL_DLLPRIVATE void         ImplUpdateFontList();
-    SAL_DLLPRIVATE void         ImplFindPaperFormatForUserSize( JobSetup& );
+    SAL_DLLPRIVATE void         ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest );
     DECL_DLLPRIVATE_LINK(       ImplDestroyPrinterAsync, void* );
-public:
-    SAL_DLLPRIVATE void         ImplEndPrint();
-    SAL_DLLPRIVATE void         ImplUpdateQuickStatus();
+
+    SAL_DLLPRIVATE bool StartJob( const rtl::OUString& rJobName, boost::shared_ptr<vcl::PrinterController>& );
+
+    static SAL_DLLPRIVATE ULONG ImplSalPrinterErrorCodeToVCL( ULONG nError );
+
 private:
+    SAL_DLLPRIVATE void         ImplEndPrint();
+    SAL_DLLPRIVATE BOOL         EndJob();
     SAL_DLLPRIVATE              Printer( const Printer& rPrinter );
     SAL_DLLPRIVATE Printer&     operator =( const Printer& rPrinter );
-
-#ifdef _SPOOLPRINTER_EXT
+public:
+    SAL_DLLPRIVATE void         ImplStartPage();
+    SAL_DLLPRIVATE void         ImplEndPage();
 public:
     void                        DrawGradientEx( OutputDevice* pOut, const Rectangle& rRect, const Gradient& rGradient );
     void                        DrawGradientEx( OutputDevice* pOut, const PolyPolygon& rPolyPoly, const Gradient& rGradient );
 
-#endif // _SPOOLPRINTER_EXT
-
 protected:
 
     void                        SetSelfAsQueuePrinter( BOOL bQueuePrinter ) { mbIsQueuePrinter = bQueuePrinter; }
@@ -295,9 +295,6 @@ public:
     static XubString            GetDefaultPrinterName();
 
     virtual void                Error();
-    virtual void                StartPrint();
-    virtual void                EndPrint();
-    virtual void                PrintPage();
 
     const XubString&            GetName() const             { return maPrinterName; }
     const XubString&            GetDriverName() const       { return maDriver; }
@@ -322,6 +319,7 @@ public:
     BOOL                        SetOrientation( Orientation eOrient );
     Orientation                 GetOrientation() const;
     DuplexMode                  GetDuplexMode() const;
+    BOOL                        SetDuplexMode( DuplexMode );
     // returns the angle that a landscape page will be turned counterclockwise
     // wrt to portrait. The return value may be only valid for
     // the current paper
@@ -330,6 +328,7 @@ public:
     USHORT                      GetPaperBin() const;
     BOOL                        SetPaper( Paper ePaper );
     BOOL                        SetPaperSizeUser( const Size& rSize );
+    BOOL                        SetPaperSizeUser( const Size& rSize, bool bMatchNearest );
     Paper                   GetPaper() const;
 
     // returns number of available paper formats
@@ -348,58 +347,333 @@ public:
     USHORT                      GetCopyCount() const { return mnCopyCount; }
     BOOL                        IsCollateCopy() const { return mbCollateCopy; }
 
-    USHORT                      GetCurPrintPage() const { return mnCurPrintPage; }
     BOOL                        IsPrinting() const { return mbPrinting; }
 
     void                        SetPrintFile( const XubString& rFileName ) { maPrintFile = rFileName; }
     const XubString&            GetPrintFile() const { return maPrintFile; }
     void                        EnablePrintFile( BOOL bEnable ) { mbPrintFile = bEnable; }
     BOOL                        IsPrintFileEnabled() const { return mbPrintFile; }
-    BOOL                        StartJob( const XubString& rJobName );
-    BOOL                        EndJob();
     BOOL                        AbortJob();
     const XubString&            GetCurJobName() const { return maJobName; }
     USHORT                      GetCurPage() const { return mnCurPage; }
     BOOL                        IsJobActive() const { return mbJobActive; }
-    BOOL                        StartPage();
-    BOOL                        EndPage();
-
-    void                        SetPageQueueSize( USHORT nPages ) { mnPageQueueSize = nPages; }
-    USHORT                      GetPageQueueSize() const { return mnPageQueueSize; }
 
     ULONG                       GetError() const { return ERRCODE_TOERROR(mnError); }
     ULONG                       GetErrorCode() const { return mnError; }
 
     void                        SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; }
     const Link&                 GetErrorHdl() const { return maErrorHdl; }
-    void                        SetStartPrintHdl( const Link& rLink ) { maStartPrintHdl = rLink; }
-    const Link&                 GetStartPrintHdl() const { return maStartPrintHdl; }
-    void                        SetEndPrintHdl( const Link& rLink ) { maEndPrintHdl = rLink; }
-    const Link&                 GetEndPrintHdl() const   { return maEndPrintHdl;   }
-    void                        SetPrintPageHdl( const Link& rLink ) { maPrintPageHdl = rLink; }
-    const Link&                 GetPrintPageHdl() const  { return maPrintPageHdl;  }
 
     void                        Compat_OldPrinterMetrics( bool bSet );
 
-    /** Notify that the next StartJob belongs to a UI less "direct print" job
-    *
-    *   deprecated: the canonical way to notify a UI less job is to set the
-    *   JobSetup value "IsQuickJob" to "true". If set at all, the "IsQuickJob" value
-    *   on JobSetup will be preferred. However if no "IsQuickJob" value is set,
-    *   setting SetNextJobIsQuick will cause the following StartJob to set this value
-    *   to "true" in the current JobSetup.
-    *
-    *   the paramter can be set to "false" again in case a job was not started and the
-    *   printer is to be reused.
-    */
-    void                        SetNextJobIsQuick( bool bQuick = true );
-
     /** checks the printer list and updates it necessary
     *
     *   sends a DataChanged event of type DATACHANGED_PRINTER
     *   if the printer list changed
     */
     static void updatePrinters();
+
+    /** execute a print job
+
+        starts a print job asynchronously (that is will return
+
+    */
+    static void PrintJob( const boost::shared_ptr<vcl::PrinterController>& i_pController,
+                          const JobSetup& i_rInitSetup
+                          );
+
+    // implementation detail of PrintJob being asynchronous
+    // not exported, not usable outside vcl
+    static void SAL_DLLPRIVATE ImplPrintJob( const boost::shared_ptr<vcl::PrinterController>& i_pController,
+                                             const JobSetup& i_rInitSetup
+                                             );
 };
 
+namespace vcl
+{
+class ImplPrinterControllerData;
+
+class VCL_DLLPUBLIC PrinterController
+{
+    ImplPrinterControllerData* mpImplData;
+protected:
+    PrinterController( const boost::shared_ptr<Printer>& );
+public:
+    enum NupOrderType
+    { LRTB, TBLR };
+    struct MultiPageSetup
+    {
+        // all metrics in 100th mm
+        int                                    nRows;
+        int                                    nColumns;
+        int                                    nRepeat;
+        Size                                   aPaperSize;
+        long                                   nLeftMargin;
+        long                                   nTopMargin;
+        long                                   nRightMargin;
+        long                                   nBottomMargin;
+        long                                   nHorizontalSpacing;
+        long                                   nVerticalSpacing;
+        bool                                   bDrawBorder;
+        PrinterController::NupOrderType        nOrder;
+
+        MultiPageSetup()
+        : nRows( 1 ), nColumns( 1 ), nRepeat( 1 ), aPaperSize( 21000, 29700 )
+        , nLeftMargin( 0 ), nTopMargin( 0 )
+        , nRightMargin( 0 ), nBottomMargin( 0 )
+        , nHorizontalSpacing( 0 ), nVerticalSpacing( 0 )
+        , bDrawBorder( false )
+        , nOrder( LRTB )
+        {
+        }
+    };
+
+    struct PageSize
+    {
+        Size        aSize;          // in 100th mm
+        bool        bFullPaper;     // full paper, not only imageable area is printed
+
+        PageSize( const Size& i_rSize = Size( 21000, 29700 ),
+                  bool i_bFullPaper = false
+                  ) : aSize( i_rSize ), bFullPaper( i_bFullPaper ) {}
+    };
+
+    PrinterController();
+    virtual ~PrinterController();
+
+    const boost::shared_ptr<Printer>& getPrinter() const;
+    /* for implementations: get current job properties as changed by e.g. print dialog
+       this gets the current set of properties initially told to Printer::PrintJob
+
+       For convenience a second sequence will be merged in to get a combined sequence.
+       In case of duplicate property names, the value of i_MergeList wins.
+    */
+    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >
+        getJobProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rMergeList ) const;
+
+    /* get the PropertyValue of a Property
+    */
+    com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName );
+    const com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName ) const;
+    // get a sequence of properties
+    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getValues( const com::sun::star::uno::Sequence< rtl::OUString >& ) const;
+    /* get a bool property
+       in case the property is unknown or not convertible to bool, i_bFallback is returned
+    */
+    sal_Bool getBoolProperty( const rtl::OUString& i_rPropertyName, sal_Bool i_bFallback ) const;
+
+    /* set a property value - can also be used to add another UI property
+    */
+    void setValue( const rtl::OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue );
+    void setValue( const com::sun::star::beans::PropertyValue& i_rValue );
+
+    /* return the currently active UI options. These are the same that were passed to setUIOptions.
+    */
+    const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& getUIOptions() const;
+    /* set possible UI options. should only be done once before passing the PrinterListener
+       to Printer::PrintJob
+    */
+    void setUIOptions( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& );
+    /* enable/disable an option; this can be used to implement dialog logic.
+    */
+    void enableUIOption( const rtl::OUString& rPropName, bool bEnable );
+    bool isUIOptionEnabled( const rtl::OUString& rPropName ) const;
+    /* returns the property name rPropName depends on or an empty string
+       if no dependency exists.
+    */
+    rtl::OUString getDependency( const rtl::OUString& rPropName ) const;
+    /* makeEnabled will chage the property rPropName depends on to the value
+       that makes rPropName enabled. If the dependency itself is also disabled,
+       no action will be performed.
+
+       returns the property name rPropName depends on or an empty string
+       if no change was made.
+    */
+    rtl::OUString makeEnabled( const rtl::OUString& rPropName );
+
+    virtual int  getPageCount() const = 0; // must be overloaded by the app
+    /* get the page parameters, namely the jobsetup that should be active for the page
+       (describing among others the physical page size) and the "page size". In writer
+       case this would probably be the same as the JobSetup since writer sets the page size
+       draw/impress for example print their page on the paper set on the printer,
+       possibly adjusting the page size to fit. That means the page size can be different from
+       the paper size.
+    */
+    // must be overloaded by the app, return page size in 1/100th mm
+    virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const = 0;
+    virtual void printPage( int i_nPage ) const = 0; // must be overloaded by the app
+    virtual void jobStarted(); // will be called after a possible dialog has been shown and the real printjob starts
+    virtual void jobFinished( com::sun::star::view::PrintableState );
+
+    com::sun::star::view::PrintableState getJobState() const;
+
+    void abortJob();
+
+    bool isShowDialogs() const;
+    bool isDirectPrint() const;
+
+    // implementation details, not usable outside vcl
+    SAL_DLLPRIVATE int getFilteredPageCount();
+    SAL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf, bool i_bMayUseCache = false );
+    SAL_DLLPRIVATE PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false );
+    SAL_DLLPRIVATE void printFilteredPage( int i_nPage );
+    SAL_DLLPRIVATE void setPrinter( const boost::shared_ptr<Printer>& );
+    SAL_DLLPRIVATE void setOptionChangeHdl( const Link& );
+    SAL_DLLPRIVATE void createProgressDialog();
+    SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& );
+    SAL_DLLPRIVATE const MultiPageSetup& getMultipage() const;
+    SAL_DLLPRIVATE void setLastPage( sal_Bool i_bLastPage );
+    SAL_DLLPRIVATE void setReversePrint( sal_Bool i_bReverse );
+    SAL_DLLPRIVATE bool getReversePrint() const;
+    SAL_DLLPRIVATE void pushPropertiesToPrinter();
+    SAL_DLLPRIVATE void setJobState( com::sun::star::view::PrintableState );
+    SAL_DLLPRIVATE bool setupPrinter( Window* i_pDlgParent );
+
+    SAL_DLLPRIVATE int getPageCountProtected() const;
+    SAL_DLLPRIVATE com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParametersProtected( int i_nPage ) const;
+
+    SAL_DLLPRIVATE ULONG removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut );
+};
+
+class VCL_DLLPUBLIC PrinterOptionsHelper
+{
+    protected:
+    std::hash_map< rtl::OUString, com::sun::star::uno::Any, rtl::OUStringHash >        m_aPropertyMap;
+    com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >              m_aUIProperties;
+
+    public:
+    PrinterOptionsHelper() {} // create without ui properties
+    PrinterOptionsHelper( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rUIProperties )
+    : m_aUIProperties( i_rUIProperties )
+    {}
+    ~PrinterOptionsHelper()
+    {}
+
+    /* process a new set of properties
+     * merges changed properties and returns "true" if any occured
+     * if the optional output set is not NULL then the names of the changed properties are returned
+    **/
+    bool processProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp,
+                            std::set< rtl::OUString >* o_pChangeProp = NULL );
+    /* append  to a sequence of property values the ui property sequence passed at creation
+     * as the "ExtraPrintUIOptions" property. if that sequence was empty, no "ExtraPrintUIOptions" property
+     * will be appended.
+    **/
+    void appendPrintUIOptions( com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& io_rProps ) const;
+
+    // check if a property exists
+    bool hasProperty( const rtl::OUString& i_rPropertyName ) const;
+    bool hasProperty( const char* i_pPropertyName ) const
+    { return hasProperty( rtl::OUString::createFromAscii( i_pPropertyName ) ); }
+
+    // returns an empty Any for not existing properties
+    com::sun::star::uno::Any getValue( const rtl::OUString& i_rPropertyName ) const;
+    // change a value in the property set; this will not have an effect to an eventual PrinterController
+    // the user of setValue must decide whether it is necessary to set the value there also
+    void setValue( const rtl::OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue );
+    void setValue( const char* i_pPropertyName, const com::sun::star::uno::Any& i_rValue )
+    { setValue( rtl::OUString::createFromAscii( i_pPropertyName ), i_rValue ); }
+
+    sal_Bool getBoolValue( const rtl::OUString& i_rPropertyName, sal_Bool i_bDefault = sal_False ) const;
+    // convenience for fixed strings
+    sal_Bool getBoolValue( const char* i_pPropName, sal_Bool i_bDefault = sal_False ) const
+    { return getBoolValue( rtl::OUString::createFromAscii( i_pPropName ), i_bDefault ); }
+
+    sal_Int64 getIntValue( const rtl::OUString& i_rPropertyName, sal_Int64 i_nDefault = 0 ) const;
+    // convenience for fixed strings
+    sal_Int64 getIntValue( const char* i_pPropName, sal_Int64 i_nDefault = 0 ) const
+    { return getIntValue( rtl::OUString::createFromAscii( i_pPropName ), i_nDefault ); }
+
+    rtl::OUString getStringValue( const rtl::OUString& i_rPropertyName, const rtl::OUString& i_rDefault = rtl::OUString() ) const;
+    // convenience for fixed strings
+    rtl::OUString getStringValue( const char* i_pPropName, const rtl::OUString& i_rDefault = rtl::OUString() ) const
+    { return getStringValue( rtl::OUString::createFromAscii( i_pPropName ), i_rDefault ); }
+
+    // helper functions for user to create a single control
+    struct UIControlOptions
+    {
+        rtl::OUString   maDependsOnName;
+        sal_Int32       mnDependsOnEntry;
+        sal_Bool        mbAttachToDependency;
+        rtl::OUString   maGroupHint;
+        sal_Bool        mbInternalOnly;
+        sal_Bool        mbEnabled;
+        com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maAddProps;
+
+        UIControlOptions( const rtl::OUString& i_rDependsOnName = rtl::OUString(),
+                          sal_Int32 i_nDependsOnEntry = -1,
+                          sal_Bool i_bAttachToDependency = sal_False,
+                          const rtl::OUString& i_rGroupHint = rtl::OUString(),
+                          sal_Bool i_bInternalOnly = sal_False,
+                          sal_Bool i_bEnabled = sal_True
+                         )
+        : maDependsOnName( i_rDependsOnName )
+        , mnDependsOnEntry( i_nDependsOnEntry )
+        , mbAttachToDependency( i_bAttachToDependency )
+        , maGroupHint( i_rGroupHint )
+        , mbInternalOnly( i_bInternalOnly )
+        , mbEnabled( i_bEnabled ) {}
+    };
+
+    // general control
+    static com::sun::star::uno::Any getUIControlOpt( const rtl::OUString& i_rTitle,
+                                                     const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpText,
+                                                     const rtl::OUString& i_rType,
+                                                     const com::sun::star::beans::PropertyValue* i_pValue = NULL,
+                                                     const UIControlOptions& i_rControlOptions = UIControlOptions()
+                                                     );
+    // create a group (e.g. a TabPage); following controls will be grouped in it until the next
+    // group begins
+    static com::sun::star::uno::Any getGroupControlOpt( const rtl::OUString& i_rTitle, const rtl::OUString& i_rHelpText );
+
+    // create a subgroup (e.g. a FixedLine); following controls will be grouped in it until the next
+    // subgroup or group begins
+    // setting bJobPage = true will make the subgroup appear on the first page of the print dialog
+    static com::sun::star::uno::Any getSubgroupControlOpt( const rtl::OUString& i_rTitle,
+                                                           const rtl::OUString& i_rHelpText,
+                                                           const UIControlOptions& i_rControlOptions = UIControlOptions()
+                                                           );
+
+    // create a bool option (usually a checkbox)
+    static com::sun::star::uno::Any getBoolControlOpt( const rtl::OUString& i_rTitle,
+                                                       const rtl::OUString& i_rHelpText,
+                                                       const rtl::OUString& i_rProperty,
+                                                       sal_Bool i_bValue,
+                                                       const UIControlOptions& i_rControlOptions = UIControlOptions()
+                                                       );
+
+    // create a set of choices (either a radio button group or a list box)
+    static com::sun::star::uno::Any getChoiceControlOpt( const rtl::OUString& i_rTitle,
+                                                         const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpText,
+                                                         const rtl::OUString& i_rProperty,
+                                                         const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices,
+                                                         sal_Int32 i_nValue,
+                                                         const rtl::OUString& i_rType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Radio" ) ),
+                                                         const UIControlOptions& i_rControlOptions = UIControlOptions()
+                                                         );
+
+    // create an integer range (e.g. a spin field)
+    // note: max value < min value means do not apply min/max values
+    static com::sun::star::uno::Any getRangeControlOpt( const rtl::OUString& i_rTitle,
+                                                        const rtl::OUString& i_rHelpText,
+                                                        const rtl::OUString& i_rProperty,
+                                                        sal_Int32 i_nValue,
+                                                        sal_Int32 i_nMinValue = -1,
+                                                        sal_Int32 i_nMaxValue = -2,
+                                                        const UIControlOptions& i_rControlOptions = UIControlOptions()
+                                                        );
+
+    // create a string field
+    // note: max value < min value means do not apply min/max values
+    static com::sun::star::uno::Any getEditControlOpt( const rtl::OUString& i_rTitle,
+                                                       const rtl::OUString& i_rHelpText,
+                                                       const rtl::OUString& i_rProperty,
+                                                       const rtl::OUString& i_rValue,
+                                                       const UIControlOptions& i_rControlOptions = UIControlOptions()
+                                                       );
+};
+
+}
+
+
 #endif  // _SV_PRINT_HXX
diff --git a/vcl/inc/vcl/printergfx.hxx b/vcl/inc/vcl/printergfx.hxx
index e34a1ce78001..790021ae3adc 100644
--- a/vcl/inc/vcl/printergfx.hxx
+++ b/vcl/inc/vcl/printergfx.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/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx
index 810ad428c9db..f2e0aad538c8 100644
--- a/vcl/inc/vcl/printerinfomanager.hxx
+++ b/vcl/inc/vcl/printerinfomanager.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: printerinfomanager.hxx,v $
- * $Revision: 1.20 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -136,6 +133,7 @@ protected:
 
     Type                              m_eType;
     bool                              m_bUseIncludeFeature;
+    bool                              m_bUseJobPatch;
     rtl::OUString                     m_aSystemDefaultPaper;
 
     bool                              m_bDisableCUPS;
@@ -226,6 +224,7 @@ public:
     virtual bool addOrRemovePossible() const;
 
     bool getUseIncludeFeature() const { return m_bUseIncludeFeature; }
+    bool getUseJobPatch() const { return m_bUseJobPatch; }
 
     // check whether a printer's feature string contains a subfeature
     bool checkFeatureToken( const rtl::OUString& rPrinterName, const char* pToken ) const;
diff --git a/vcl/inc/vcl/printerjob.hxx b/vcl/inc/vcl/printerjob.hxx
index 9880700d4008..cdf8745febcc 100644
--- a/vcl/inc/vcl/printerjob.hxx
+++ b/vcl/inc/vcl/printerjob.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: printerjob.hxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -91,7 +88,7 @@ private:            // private methods
 
     bool            writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup );
     bool            writeSetup( osl::File* pFile, const JobData& );
-    bool            writePageSetup( osl::File* pFile, const JobData& );
+    bool            writePageSetup( osl::File* pFile, const JobData&, bool bWriteFeatures = true );
     void            writeJobPatch( osl::File* File, const JobData& );
     bool            writeProlog (osl::File* pFile, const JobData& );
 
diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/vcl/prndlg.hxx
index 4fd6eaa999da..bec612b65593 100644
--- a/vcl/inc/vcl/prndlg.hxx
+++ b/vcl/inc/vcl/prndlg.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: prndlg.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,19 +30,301 @@
 
 #include <vcl/dllapi.h>
 
-#include <vcl/dialog.hxx>
+#include "vcl/print.hxx"
+#include "vcl/print.h"
+
+#include "vcl/dialog.hxx"
+#include "vcl/fixed.hxx"
+#include "vcl/button.hxx"
+#include "vcl/gdimtf.hxx"
+#include "vcl/lstbox.hxx"
+#include "vcl/field.hxx"
+#include "vcl/tabctrl.hxx"
+#include "vcl/tabpage.hxx"
+#include "vcl/arrange.hxx"
+#include "vcl/virdev.hxx"
 
-class Printer;
+#include <boost/shared_ptr.hpp>
+#include <map>
 
-class VCL_DLLPUBLIC SystemDialog : public ModalDialog
+namespace vcl
 {
-public:
-                        SystemDialog( Window* pParent, WinBits nWinStyle ) :
-                            ModalDialog( pParent, nWinStyle ) {}
-                        SystemDialog( Window* pParent, const ResId& rResId ) :
-                            ModalDialog( pParent, rResId ) {}
-
-    virtual short       Execute() { return 0; }
-};
+    class PrintDialog : public ModalDialog
+    {
+        class PrintPreviewWindow : public Window
+        {
+            GDIMetaFile         maMtf;
+            Size                maOrigSize;
+            VirtualDevice       maPageVDev;
+            rtl::OUString       maReplacementString;
+            rtl::OUString       maToolTipString;
+        public:
+            PrintPreviewWindow( Window* pParent, const ResId& );
+            virtual ~PrintPreviewWindow();
+
+            virtual void Paint( const Rectangle& rRect );
+            virtual void Command( const CommandEvent& );
+            virtual void Resize();
+            virtual void DataChanged( const DataChangedEvent& );
+
+            void setPreview( const GDIMetaFile&, const Size&, const rtl::OUString&,
+                             sal_Int32 i_nDPIX, sal_Int32 i_nDPIY
+                            );
+        };
+
+        class ShowNupOrderWindow : public Window
+        {
+            int mnOrderMode;
+            int mnRows;
+            int mnColumns;
+            void ImplInitSettings();
+        public:
+            ShowNupOrderWindow( Window* pParent );
+            virtual ~ShowNupOrderWindow();
+
+            virtual void Paint( const Rectangle& );
+
+            void setValues( int i_nOrderMode, int i_nColumns, int i_nRows )
+            {
+                mnOrderMode = i_nOrderMode;
+                mnRows = i_nRows;
+                mnColumns = i_nColumns;
+                Invalidate();
+            }
+        };
+
+        class NUpTabPage : public TabPage
+        {
+        public:
+            FixedLine                               maNupLine;
+            RadioButton                             maPagesBtn;
+            RadioButton                             maBrochureBtn;
+            FixedText                               maPagesBoxTitleTxt;
+            ListBox                                 maNupPagesBox;
+
+            // controls for "Custom" page mode
+            FixedText                               maNupNumPagesTxt;
+            NumericField                            maNupColEdt;
+            FixedText                               maNupTimesTxt;
+            NumericField                            maNupRowsEdt;
+            FixedText                               maPageMarginTxt1;
+            MetricField                             maPageMarginEdt;
+            FixedText                               maPageMarginTxt2;
+            FixedText                               maSheetMarginTxt1;
+            MetricField                             maSheetMarginEdt;
+            FixedText                               maSheetMarginTxt2;
+            FixedText                               maNupOrientationTxt;
+            ListBox                                 maNupOrientationBox;
+
+            // page order ("left to right, then down")
+            FixedText                               maNupOrderTxt;
+            ListBox                                 maNupOrderBox;
+            ShowNupOrderWindow                      maNupOrderWin;
+            // border around each page
+            CheckBox                                maBorderCB;
+
+            vcl::RowOrColumn                        maLayout;
+            boost::shared_ptr< vcl::RowOrColumn >   mxBrochureDep;
+            boost::shared_ptr< vcl::LabeledElement >mxPagesBtnLabel;
+
+            void setupLayout();
+
+            NUpTabPage( Window*, const ResId& );
+            virtual ~NUpTabPage();
+
+            void readFromSettings();
+            void storeToSettings();
+            void initFromMultiPageSetup( const vcl::PrinterController::MultiPageSetup& );
+            void enableNupControls( bool bEnable );
+
+            void showAdvancedControls( bool );
+
+            virtual void Resize();
+        };
+
+        class JobTabPage : public TabPage
+        {
+        public:
+            FixedLine                               maPrinterFL;
+            ListBox                                 maPrinters;
+            DisclosureButton                        maDetailsBtn;
+            FixedText                               maStatusLabel;
+            FixedText                               maStatusTxt;
+            FixedText                               maLocationLabel;
+            FixedText                               maLocationTxt;
+            FixedText                               maCommentLabel;
+            FixedText                               maCommentTxt;
+
+            PushButton                              maSetupButton;
+
+            FixedLine                               maCopies;
+            FixedLine                               maCopySpacer;
+            FixedText                               maCopyCount;
+            NumericField                            maCopyCountField;
+            CheckBox                                maCollateBox;
+            FixedImage                              maCollateImage;
+
+            Image                                   maCollateImg;
+            Image                                   maCollateHCImg;
+            Image                                   maNoCollateImg;
+            Image                                   maNoCollateHCImg;
+
+            long                                    mnCollateUIMode;
+
+            vcl::RowOrColumn                        maLayout;
+            boost::shared_ptr<vcl::RowOrColumn>     mxPrintRange;
+            boost::shared_ptr<vcl::WindowArranger>  mxDetails;
+
+            JobTabPage( Window*, const ResId& );
+            virtual ~JobTabPage();
+
+            void readFromSettings();
+            void storeToSettings();
+
+            virtual void Resize();
+
+            void setupLayout();
+        };
+
+        class OutputOptPage : public TabPage
+        {
+        public:
+            FixedLine                           maOptionsLine;
+            CheckBox                            maToFileBox;
+            CheckBox                            maCollateSingleJobsBox;
+            CheckBox                            maReverseOrderBox;
+
+            vcl::RowOrColumn                    maLayout;
+            boost::shared_ptr<vcl::RowOrColumn> mxOptGroup;
+
+            OutputOptPage( Window*, const ResId& );
+            virtual ~OutputOptPage();
+
+            void readFromSettings();
+            void storeToSettings();
+
+            virtual void Resize();
+
+            void setupLayout();
+        };
+
+        OKButton                                maOKButton;
+        CancelButton                            maCancelButton;
+        HelpButton                              maHelpButton;
+        PrintPreviewWindow                      maPreviewWindow;
+        NumericField                            maPageEdit;
+        FixedText                               maNumPagesText;
+        PushButton                              maBackwardBtn;
+        PushButton                              maForwardBtn;
+
+        TabControl                              maTabCtrl;
+        NUpTabPage                              maNUpPage;
+        JobTabPage                              maJobPage;
+        OutputOptPage                           maOptionsPage;
+
+        FixedLine                               maButtonLine;
+
+        boost::shared_ptr< PrinterController >  maPController;
+
+        rtl::OUString                           maPageStr;
+        rtl::OUString                           maNoPageStr;
+        sal_Int32                               mnCurPage;
+        sal_Int32                               mnCachedPages;
+
+        std::list< Window* >                    maControls;
+        std::map< Window*, rtl::OUString >      maControlToPropertyMap;
+        std::map< rtl::OUString, std::vector< Window* > >
+                                                maPropertyToWindowMap;
+        std::map< Window*, sal_Int32 >          maControlToNumValMap;
+        std::set< rtl::OUString >               maReverseDependencySet;
+
+        Size                                    maNupPortraitSize;
+        Size                                    maNupLandscapeSize;
+
+        // internal, used for automatic Nup-Portrait/landscape
+        Size                                    maFirstPageSize;
+
+        rtl::OUString                           maPrintToFileText;
+        rtl::OUString                           maPrintText;
+        rtl::OUString                           maDefPrtText;
+
+        vcl::RowOrColumn                        maLayout;
+        boost::shared_ptr<vcl::RowOrColumn>     mxPreviewCtrls;
+
+        Size                                    maDetailsCollapsedSize;
+        Size                                    maDetailsExpandedSize;
+
+        sal_Bool                                mbShowLayoutPage;
+
+        Size getJobPageSize();
+        void updateNup();
+        void updateNupFromPages();
+        void preparePreview( bool i_bPrintChanged = true, bool i_bMayUseCache = false );
+        void setPreviewText( sal_Int32 );
+        void updatePrinterText();
+        void checkControlDependencies();
+        void checkOptionalControlDependencies();
+        void makeEnabled( Window* );
+        void updateWindowFromProperty( const rtl::OUString& );
+        void setupOptionalUI();
+        void readFromSettings();
+        void storeToSettings();
+        com::sun::star::beans::PropertyValue* getValueForWindow( Window* ) const;
+
+        virtual void Resize();
+        virtual void Command( const CommandEvent& );
+        virtual void DataChanged( const DataChangedEvent& );
+
+        DECL_LINK( SelectHdl, ListBox* );
+        DECL_LINK( ClickHdl, Button* );
+        DECL_LINK( ModifyHdl, Edit* );
+        DECL_LINK( UIOptionsChanged, void* );
+
+        DECL_LINK( UIOption_CheckHdl, CheckBox* );
+        DECL_LINK( UIOption_RadioHdl, RadioButton* );
+        DECL_LINK( UIOption_SelectHdl, ListBox* );
+        DECL_LINK( UIOption_ModifyHdl, Edit* );
+
+        void setupLayout();
+    public:
+        PrintDialog( Window*, const boost::shared_ptr< PrinterController >& );
+        virtual ~PrintDialog();
+
+        bool isPrintToFile();
+        int getCopyCount();
+        bool isCollate();
+
+        void previewForward();
+        void previewBackward();
+    };
+
+    class PrintProgressDialog : public ModelessDialog
+    {
+        String              maStr;
+        FixedText           maText;
+        CancelButton        maButton;
+
+        bool                mbCanceled;
+        sal_Int32           mnCur;
+        sal_Int32           mnMax;
+        long                mnProgressHeight;
+        Rectangle           maProgressRect;
+        bool                mbNativeProgress;
+
+        DECL_LINK( ClickHdl, Button* );
+
+        void implCalcProgressRect();
+    public:
+        PrintProgressDialog( Window* i_pParent, int i_nMax );
+        ~PrintProgressDialog();
+
+        bool isCanceled() const { return mbCanceled; }
+        void setProgress( int i_nCurrent, int i_nMax = -1 );
+        void tick();
+
+        virtual void Paint( const Rectangle& );
+    };
+}
+
 
 #endif // _SV_PRNDLG_HXX
diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx
index 681f4f972a7c..6b2af991f2dd 100644
--- a/vcl/inc/vcl/prntypes.hxx
+++ b/vcl/inc/vcl/prntypes.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: prntypes.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,7 +36,7 @@
 // - Duplex Mode -
 // ---------------
 
-enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_ON };
+enum DuplexMode { DUPLEX_UNKNOWN, DUPLEX_OFF, DUPLEX_LONGEDGE, DUPLEX_SHORTEDGE };
 
 // ---------------
 // - Orientation -
@@ -93,5 +90,6 @@ enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE };
 #define PRINTER_CAPABILITIES_FAX                ((USHORT)8)
 #define PRINTER_CAPABILITIES_PDF                ((USHORT)9)
 #define PRINTER_CAPABILITIES_EXTERNALDIALOG     ((USHORT)10)
+#define PRINTER_CAPABILITIES_SETDUPLEX          ((USHORT)11)
 
 #endif  // _SV_PRNTYPES_HXX
diff --git a/vcl/inc/vcl/ptrstyle.hxx b/vcl/inc/vcl/ptrstyle.hxx
index e3d1f3fd6af2..796613bd5726 100644
--- a/vcl/inc/vcl/ptrstyle.hxx
+++ b/vcl/inc/vcl/ptrstyle.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: ptrstyle.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/vcl/inc/vcl/regband.hxx b/vcl/inc/vcl/regband.hxx
index 418fe46e1cc4..2e34fdcd5677 100644
--- a/vcl/inc/vcl/regband.hxx
+++ b/vcl/inc/vcl/regband.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: regband.hxx,v $
- * $Revision: 1.3.158.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/region.h b/vcl/inc/vcl/region.h
index 10331e0f1527..b10f0eaf0f0f 100644
--- a/vcl/inc/vcl/region.h
+++ b/vcl/inc/vcl/region.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: region.h,v $
- * $Revision: 1.4.128.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/region.hxx b/vcl/inc/vcl/region.hxx
index 8c1ed78b154f..d4fe05ebe8a3 100644
--- a/vcl/inc/vcl/region.hxx
+++ b/vcl/inc/vcl/region.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: region.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/vcl/inc/vcl/salatype.hxx b/vcl/inc/vcl/salatype.hxx
index d750ac52494f..d9e25c0cada9 100644
--- a/vcl/inc/vcl/salatype.hxx
+++ b/vcl/inc/vcl/salatype.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: salatype.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/vcl/inc/vcl/salbmp.hxx b/vcl/inc/vcl/salbmp.hxx
index b72e923c8452..4aca4a9277e9 100644
--- a/vcl/inc/vcl/salbmp.hxx
+++ b/vcl/inc/vcl/salbmp.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: salbmp.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/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx
index d9be75369a5d..bbb70efcdf22 100644
--- a/vcl/inc/vcl/salbtype.hxx
+++ b/vcl/inc/vcl/salbtype.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: salbtype.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/vcl/inc/vcl/salctrlhandle.hxx b/vcl/inc/vcl/salctrlhandle.hxx
index eca7ab8deeea..4a0a3a0f5b0a 100644
--- a/vcl/inc/vcl/salctrlhandle.hxx
+++ b/vcl/inc/vcl/salctrlhandle.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: salctrlhandle.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/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx
index d8239d1a1545..1566f02a1299 100644
--- a/vcl/inc/vcl/salctype.hxx
+++ b/vcl/inc/vcl/salctype.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: salctype.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/vcl/inc/vcl/saldatabasic.hxx b/vcl/inc/vcl/saldatabasic.hxx
index 5b04a61b585d..1df2a701fd1a 100644
--- a/vcl/inc/vcl/saldatabasic.hxx
+++ b/vcl/inc/vcl/saldatabasic.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: saldatabasic.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/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx
index b95f7036ad19..08548d7dda40 100644
--- a/vcl/inc/vcl/salframe.hxx
+++ b/vcl/inc/vcl/salframe.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: salframe.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/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx
index 55f8a0d03deb..f72c4df57481 100644
--- a/vcl/inc/vcl/salgdi.hxx
+++ b/vcl/inc/vcl/salgdi.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: salgdi.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/vcl/inc/vcl/salgeom.hxx b/vcl/inc/vcl/salgeom.hxx
index aa1b4f4ba92e..3d59e6199fa7 100644
--- a/vcl/inc/vcl/salgeom.hxx
+++ b/vcl/inc/vcl/salgeom.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: salgeom.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/vcl/inc/vcl/salgtype.hxx b/vcl/inc/vcl/salgtype.hxx
index 8782e748a9d2..f70a5c532f73 100644
--- a/vcl/inc/vcl/salgtype.hxx
+++ b/vcl/inc/vcl/salgtype.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: salgtype.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/vcl/inc/vcl/salimestatus.hxx b/vcl/inc/vcl/salimestatus.hxx
index 659d3ba827a8..779a75c9afaa 100644
--- a/vcl/inc/vcl/salimestatus.hxx
+++ b/vcl/inc/vcl/salimestatus.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: salimestatus.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/vcl/inc/vcl/salinst.hxx b/vcl/inc/vcl/salinst.hxx
index f8c148859516..9b92bf95e3fe 100644
--- a/vcl/inc/vcl/salinst.hxx
+++ b/vcl/inc/vcl/salinst.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: salinst.hxx,v $
- * $Revision: 1.5.154.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/vcl/sallayout.hxx
index 6934cdc182b6..e23090c42392 100755
--- a/vcl/inc/vcl/sallayout.hxx
+++ b/vcl/inc/vcl/sallayout.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/vcl/inc/vcl/salmenu.hxx b/vcl/inc/vcl/salmenu.hxx
index d924af6ee24c..cc0438c4e177 100644
--- a/vcl/inc/vcl/salmenu.hxx
+++ b/vcl/inc/vcl/salmenu.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: salmenu.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/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx
index c8fb0cb40d21..8ce4c5c20615 100644
--- a/vcl/inc/vcl/salnativewidgets.hxx
+++ b/vcl/inc/vcl/salnativewidgets.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: salnativewidgets.hxx,v $
- * $Revision: 1.10.108.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/vcl/salobj.hxx
index af2019650d37..e453bf5c6f87 100644
--- a/vcl/inc/vcl/salobj.hxx
+++ b/vcl/inc/vcl/salobj.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: salobj.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/vcl/inc/vcl/salogl.hxx b/vcl/inc/vcl/salogl.hxx
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/vcl/inc/vcl/salogl.hxx
+++ /dev/null
diff --git a/vcl/inc/vcl/salotype.hxx b/vcl/inc/vcl/salotype.hxx
deleted file mode 100644
index e69de29bb2d1..000000000000
--- a/vcl/inc/vcl/salotype.hxx
+++ /dev/null
diff --git a/vcl/inc/vcl/salprn.hxx b/vcl/inc/vcl/salprn.hxx
index 2927215034b5..19f023108349 100644
--- a/vcl/inc/vcl/salprn.hxx
+++ b/vcl/inc/vcl/salprn.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: salprn.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -41,7 +38,7 @@
 class SalGraphics;
 class SalFrame;
 struct ImplJobSetup;
-class ImplQPrinter;
+namespace vcl { class PrinterController; }
 
 // -----------------------
 // - SalPrinterQueueInfo -
@@ -101,7 +98,6 @@ public:
     virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData ) = 0;
     // returns angle that a landscape page will be turned counterclockwise wrt to portrait
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData ) = 0;
-    virtual DuplexMode          GetDuplexMode( const ImplJobSetup* pSetupData ) = 0;
 };
 
 // --------------
@@ -114,18 +110,21 @@ public:                     // public for Sal Implementation
     SalPrinter() {}
     virtual ~SalPrinter();
 
-    virtual BOOL                    StartJob( const XubString* pFileName,
-                                              const XubString& rJobName,
-                                              const XubString& rAppName,
-                                              ULONG nCopies, BOOL bCollate,
+    virtual BOOL                    StartJob( const String* pFileName,
+                                              const String& rJobName,
+                                              const String& rAppName,
+                                              ULONG nCopies,
+                                              bool bCollate,
+                                              bool bDirect,
                                               ImplJobSetup* pSetupData ) = 0;
 
     // implement for pull model print systems only,
     // default implementations (see salvtables.cxx) just returns FALSE
     virtual BOOL                    StartJob( const String* pFileName,
+                                              const String& rJobName,
                                               const String& rAppName,
                                               ImplJobSetup* pSetupData,
-                                              ImplQPrinter* pQPrinter );
+                                              vcl::PrinterController& rController );
 
     virtual BOOL                    EndJob() = 0;
     virtual BOOL                    AbortJob() = 0;
diff --git a/vcl/inc/vcl/salptype.hxx b/vcl/inc/vcl/salptype.hxx
index 7f1c82079f38..8613ead5301a 100644
--- a/vcl/inc/vcl/salptype.hxx
+++ b/vcl/inc/vcl/salptype.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: salptype.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -40,7 +37,11 @@
 #define SAL_JOBSET_ORIENTATION                  ((ULONG)0x00000001)
 #define SAL_JOBSET_PAPERBIN                     ((ULONG)0x00000002)
 #define SAL_JOBSET_PAPERSIZE                    ((ULONG)0x00000004)
-#define SAL_JOBSET_ALL                          (SAL_JOBSET_ORIENTATION | SAL_JOBSET_PAPERBIN | SAL_JOBSET_PAPERSIZE)
+#define SAL_JOBSET_DUPLEXMODE                   ((ULONG)0x00000008)
+#define SAL_JOBSET_ALL                          (SAL_JOBSET_ORIENTATION |\
+                                                 SAL_JOBSET_PAPERBIN    |\
+                                                 SAL_JOBSET_PAPERSIZE   |\
+                                                 SAL_JOBSET_DUPLEXMODE)
 
 // -------------------
 // - SalPrinterError -
diff --git a/vcl/inc/vcl/salsession.hxx b/vcl/inc/vcl/salsession.hxx
index bdc698fc63fd..2da1ae551074 100644
--- a/vcl/inc/vcl/salsession.hxx
+++ b/vcl/inc/vcl/salsession.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: salsession.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/vcl/inc/vcl/salsys.hxx b/vcl/inc/vcl/salsys.hxx
index 4f0832e7af09..310b0a27e30f 100644
--- a/vcl/inc/vcl/salsys.hxx
+++ b/vcl/inc/vcl/salsys.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: salsys.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/vcl/inc/vcl/saltimer.hxx b/vcl/inc/vcl/saltimer.hxx
index c73b093f7f3d..d693070138d2 100644
--- a/vcl/inc/vcl/saltimer.hxx
+++ b/vcl/inc/vcl/saltimer.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: saltimer.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/vcl/inc/vcl/salvd.hxx b/vcl/inc/vcl/salvd.hxx
index 1ba59f31b6f2..fcbe1fb35383 100644
--- a/vcl/inc/vcl/salvd.hxx
+++ b/vcl/inc/vcl/salvd.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: salvd.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/vcl/inc/vcl/salwtype.hxx b/vcl/inc/vcl/salwtype.hxx
index 0d5f23e28d2f..c67d36ac4ea9 100644
--- a/vcl/inc/vcl/salwtype.hxx
+++ b/vcl/inc/vcl/salwtype.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: salwtype.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/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx
index 35107fbe20d9..f993cb7304e4 100644
--- a/vcl/inc/vcl/scrbar.hxx
+++ b/vcl/inc/vcl/scrbar.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: scrbar.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/vcl/inc/vcl/seleng.hxx b/vcl/inc/vcl/seleng.hxx
index 6a37f710e3a3..65539c947778 100644
--- a/vcl/inc/vcl/seleng.hxx
+++ b/vcl/inc/vcl/seleng.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: seleng.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/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 61a970b738e0..e55c2a53345b 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.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: settings.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/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx
index c3dfcfd42608..52af7a8bf343 100644
--- a/vcl/inc/vcl/slider.hxx
+++ b/vcl/inc/vcl/slider.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: slider.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/vcl/inc/vcl/smartid.hxx b/vcl/inc/vcl/smartid.hxx
index 4208030a6927..2cc5f347b2cb 100755
--- a/vcl/inc/vcl/smartid.hxx
+++ b/vcl/inc/vcl/smartid.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: smartid.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/vcl/inc/vcl/sndstyle.hxx b/vcl/inc/vcl/sndstyle.hxx
index 55255171ad9f..6e1401986b36 100644
--- a/vcl/inc/vcl/sndstyle.hxx
+++ b/vcl/inc/vcl/sndstyle.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: sndstyle.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/vcl/inc/vcl/sound.hxx b/vcl/inc/vcl/sound.hxx
index f870d35b7074..edab9d7d8655 100644
--- a/vcl/inc/vcl/sound.hxx
+++ b/vcl/inc/vcl/sound.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: sound.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/vcl/inc/vcl/spin.h b/vcl/inc/vcl/spin.h
index 3253bacb7ebc..b600c18f0f9f 100644
--- a/vcl/inc/vcl/spin.h
+++ b/vcl/inc/vcl/spin.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: spin.h,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/vcl/inc/vcl/spin.hxx b/vcl/inc/vcl/spin.hxx
index 96a4b8cefcfd..2ca4709de4c5 100644
--- a/vcl/inc/vcl/spin.hxx
+++ b/vcl/inc/vcl/spin.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: spin.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/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx
index 6fbdd52d0402..7df0b6d95bfc 100644
--- a/vcl/inc/vcl/spinfld.hxx
+++ b/vcl/inc/vcl/spinfld.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: spinfld.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/vcl/inc/vcl/split.hxx b/vcl/inc/vcl/split.hxx
index f50975135f5f..890ef5365fbc 100644
--- a/vcl/inc/vcl/split.hxx
+++ b/vcl/inc/vcl/split.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: split.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/vcl/inc/vcl/splitwin.hxx b/vcl/inc/vcl/splitwin.hxx
index dbc90538eaaf..4aa1ca16785c 100644
--- a/vcl/inc/vcl/splitwin.hxx
+++ b/vcl/inc/vcl/splitwin.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: splitwin.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/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx
index e5ff3c5ee2da..4d41ee450dd7 100644
--- a/vcl/inc/vcl/status.hxx
+++ b/vcl/inc/vcl/status.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: status.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/vcl/inc/vcl/stdtext.hxx b/vcl/inc/vcl/stdtext.hxx
index 7c540a4479b6..111e58aca5bf 100644
--- a/vcl/inc/vcl/stdtext.hxx
+++ b/vcl/inc/vcl/stdtext.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: stdtext.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/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx
index b3548a07680b..8df83d6f33f4 100644
--- a/vcl/inc/vcl/strhelper.hxx
+++ b/vcl/inc/vcl/strhelper.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: strhelper.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/vcl/inc/vcl/subedit.hxx b/vcl/inc/vcl/subedit.hxx
index f2bf2f24181e..3ea1eaffa864 100644
--- a/vcl/inc/vcl/subedit.hxx
+++ b/vcl/inc/vcl/subedit.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: subedit.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/vcl/inc/vcl/sv.h b/vcl/inc/vcl/sv.h
index bb8c339f7b30..9296570a71bb 100644
--- a/vcl/inc/vcl/sv.h
+++ b/vcl/inc/vcl/sv.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: sv.h,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/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx
index 3e9a1cc55019..f90326ce50eb 100644
--- a/vcl/inc/vcl/svapp.hxx
+++ b/vcl/inc/vcl/svapp.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: svapp.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/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svcompat.hxx
index 29dea51539de..9e461da4e54b 100644
--- a/vcl/inc/vcl/svcompat.hxx
+++ b/vcl/inc/vcl/svcompat.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: svcompat.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/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx
index 17ad1aa28c1a..5cc8f32d7ac9 100644
--- a/vcl/inc/vcl/svdata.hxx
+++ b/vcl/inc/vcl/svdata.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: svdata.hxx,v $
- * $Revision: 1.13 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -87,6 +84,7 @@ class Timer;
 class AutoTimer;
 class Help;
 class ImageList;
+class Image;
 class PopupMenu;
 class Application;
 class OutputDevice;
@@ -259,6 +257,10 @@ struct ImplSVCtrlData
     ImageList*              mpSplitVPinImgList; // ImageList for Vertikale SplitWindows (PIN's)
     ImageList*              mpSplitHArwImgList; // ImageList for Horizontale SplitWindows (Arrows)
     ImageList*              mpSplitVArwImgList; // ImageList for Vertikale SplitWindows (Arrows)
+    Image*                  mpDisclosurePlus;
+    Image*                  mpDisclosurePlusHC;
+    Image*                  mpDisclosureMinus;
+    Image*                  mpDisclosureMinusHC;
     ImplTBDragMgr*          mpTBDragMgr;        // DragMgr for ToolBox
     USHORT                  mnCheckStyle;       // CheckBox-Style for ImageList-Update
     USHORT                  mnRadioStyle;       // Radio-Style for ImageList-Update
@@ -367,6 +369,7 @@ void        ImplDeInitSVData();
 void        ImplDestroySVData();
 Window*     ImplGetDefaultWindow();
 VCL_DLLPUBLIC ResMgr*     ImplGetResMgr();
+VCL_DLLPUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr
 DockingManager*     ImplGetDockingManager();
 void        ImplWindowAutoMnemonic( Window* pWindow );
 
diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc
index 48297a04ea0e..059ed1524b7c 100644
--- a/vcl/inc/vcl/svids.hrc
+++ b/vcl/inc/vcl/svids.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: svids.hrc,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,6 +28,8 @@
 #ifndef _SV_SVIDS_HRC
 #define _SV_SVIDS_HRC
 
+#include "svl/solar.hrc"
+
 #define SV_RESID_STDOFFSET                  0
 #define SV_RESID_WINOFFSET                  1
 #define SV_RESID_OS2OFFSET                  2
@@ -58,6 +57,11 @@
 #define SV_RESID_BITMAP_CLOSEDOC            1052
 #define SV_RESID_BITMAP_CLOSEDOCHC          1053
 
+#define SV_DISCLOSURE_PLUS                  1060
+#define SV_DISCLOSURE_MINUS                 1061
+#define SV_DISCLOSURE_PLUS_HC               1062
+#define SV_DISCLOSURE_MINUS_HC              1063
+
 #define SV_RESID_MENU_EDIT                  2000
 #define SV_MENU_EDIT_UNDO                   1
 #define SV_MENU_EDIT_CUT                    2
@@ -74,6 +78,92 @@
 #define SV_MENU_MAC_SHOWALL                 2005
 #define SV_MENU_MAC_QUITAPP                 2006
 
+#define SV_DLG_PRINT                        2048
+#define SV_PRINT_OK                         1
+#define SV_PRINT_CANCEL                     2
+#define SV_PRINT_HELP                       3
+#define SV_PRINT_PAGE_PREVIEW               4
+#define SV_PRINT_PAGE_TXT                   5
+#define SV_PRINT_PAGE_FORWARD               6
+#define SV_PRINT_PAGE_BACKWARD              7
+#define SV_PRINT_PAGE_EDIT                  8
+#define SV_PRINT_TABCTRL                    9
+#define SV_PRINT_PRT_TYPE                   10
+#define SV_PRINT_PRT_STATUS                 11
+#define SV_PRINT_PRT_LOCATION               12
+#define SV_PRINT_PRT_COMMENT                13
+#define SV_PRINT_TOFILE_TXT                 14
+#define SV_PRINT_DEFPRT_TXT                 15
+#define SV_PRINT_PRINTPREVIEW_TXT           16
+
+#define SV_PRINT_TAB_NUP                       1
+#define SV_PRINT_PRT_NUP_LAYOUT_FL             1
+#define SV_PRINT_PRT_NUP_DEFAULT_BTN           2
+#define SV_PRINT_PRT_NUP_BROCHURE_BTN          3
+#define SV_PRINT_PRT_NUP_PAGES_BTN             4
+#define SV_PRINT_PRT_NUP_PAGES_BOX             5
+#define SV_PRINT_PRT_NUP_NUM_PAGES_TXT         6
+#define SV_PRINT_PRT_NUP_COLS_EDT              7
+#define SV_PRINT_PRT_NUP_TIMES_TXT             8
+#define SV_PRINT_PRT_NUP_ROWS_EDT              9
+#define SV_PRINT_PRT_NUP_MARGINS_PAGES_1_TXT  10
+#define SV_PRINT_PRT_NUP_MARGINS_PAGES_EDT    11
+#define SV_PRINT_PRT_NUP_MARGINS_PAGES_2_TXT  12
+#define SV_PRINT_PRT_NUP_MARGINS_SHEET_1_TXT  13
+#define SV_PRINT_PRT_NUP_MARGINS_SHEET_EDT    14
+#define SV_PRINT_PRT_NUP_MARGINS_SHEET_2_TXT  15
+#define SV_PRINT_PRT_NUP_ORIENTATION_TXT      16
+#define SV_PRINT_PRT_NUP_ORIENTATION_BOX      17
+#define SV_PRINT_PRT_NUP_ORDER_TXT            18
+#define SV_PRINT_PRT_NUP_ORDER_BOX            19
+#define SV_PRINT_PRT_NUP_BORDER_CB            20
+
+#define SV_PRINT_PRT_NUP_ORIENTATION_AUTOMATIC    0
+#define SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT     1
+#define SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE    2
+
+#define SV_PRINT_PRT_NUP_ORDER_LRTD               0
+#define SV_PRINT_PRT_NUP_ORDER_TDLR               1
+
+#define SV_PRINT_TAB_JOB                    2
+#define SV_PRINT_PRINTERS_FL                1
+#define SV_PRINT_PRINTERS                   2
+#define SV_PRINT_PRT_SETUP                  3
+#define SV_PRINT_RANGE                      4
+#define SV_PRINT_ALL                        5
+#define SV_PRINT_PAGERANGE                  6
+#define SV_PRINT_SELECTION                  7
+#define SV_PRINT_PAGERANGE_EDIT             8
+#define SV_PRINT_COPIES                     9
+#define SV_PRINT_COPYCOUNT                  10
+#define SV_PRINT_COPYCOUNT_FIELD            11
+#define SV_PRINT_COLLATE                    12
+#define SV_PRINT_COLLATE_IMAGE              13
+#define SV_PRINT_BUTTONLINE                 14
+#define SV_PRINT_COLLATE_IMG                15
+#define SV_PRINT_NOCOLLATE_IMG              16
+#define SV_PRINT_COLLATE_HC_IMG             17
+#define SV_PRINT_NOCOLLATE_HC_IMG           18
+#define SV_PRINT_NOPAGES                    19
+#define SV_PRINT_STATUS_TXT                 20
+#define SV_PRINT_LOCATION_TXT               21
+#define SV_PRINT_COMMENT_TXT                22
+#define SV_PRINT_DETAILS_BTN                23
+
+#define SV_PRINT_TAB_OPT                    3
+#define SV_PRINT_OPT_PRINT_FL               1
+#define SV_PRINT_OPT_TOFILE                 2
+#define SV_PRINT_OPT_SINGLEJOBS             3
+#define SV_PRINT_OPT_REVERSE                4
+
+#define SV_DLG_PRINT_PROGRESS             2049
+#define SV_PRINT_PROGRESS_CANCEL            1
+#define SV_PRINT_PROGRESS_TEXT              2
+
+#define SV_PRINT_NATIVE_STRINGS           2050
+#define SV_PRINT_NOPRINTERWARNING         2051
+#define SV_PRINT_NOCONTENT                2052
+
 #define SV_HELPTEXT_CLOSE                   10000
 #define SV_HELPTEXT_MINIMIZE                10001
 #define SV_HELPTEXT_MAXIMIZE                10002
@@ -108,7 +198,8 @@
 #define SV_STDTEXT_ABOUT                    10204
 #define SV_STDTEXT_PREFERENCES              10205
 #define SV_MAC_SCREENNNAME                  10206
-#define SV_STDTEXT_LAST                     SV_MAC_SCREENNNAME
+#define SV_STDTEXT_ALLFILETYPES             10207
+#define SV_STDTEXT_LAST                     SV_STDTEXT_ALLFILETYPES
 
 #define SV_ACCESSERROR_FIRST                SV_ACCESSERROR_WRONG_VERSION
 #define SV_ACCESSERROR_WRONG_VERSION        10500
@@ -165,4 +256,6 @@
 #define SV_ICON_ID_MACRO                       17
 #define SV_ICON_ID_PRINTERADMIN               501
 
+#define HID_PRINTDLG                        HID_VCL_START
+
 #endif  // _SV_SVIDS_HRC
diff --git a/vcl/inc/vcl/symbol.hxx b/vcl/inc/vcl/symbol.hxx
index efc37c458981..c7a745516856 100644
--- a/vcl/inc/vcl/symbol.hxx
+++ b/vcl/inc/vcl/symbol.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: symbol.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/vcl/inc/vcl/syschild.hxx b/vcl/inc/vcl/syschild.hxx
index 29610e653b9d..da4ffcd51a22 100644
--- a/vcl/inc/vcl/syschild.hxx
+++ b/vcl/inc/vcl/syschild.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: syschild.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/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx
index 2e2a5e80e761..1146f1b3b842 100644
--- a/vcl/inc/vcl/sysdata.hxx
+++ b/vcl/inc/vcl/sysdata.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: sysdata.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/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx
index d590cfe0a37e..b0e74df9a767 100644
--- a/vcl/inc/vcl/syswin.hxx
+++ b/vcl/inc/vcl/syswin.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: syswin.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/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx
index 30edf6227a60..e7b87ff448d1 100644
--- a/vcl/inc/vcl/tabctrl.hxx
+++ b/vcl/inc/vcl/tabctrl.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: tabctrl.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,15 +28,16 @@
 #ifndef _SV_TABCTRL_HXX
 #define _SV_TABCTRL_HXX
 
-#include <vcl/sv.h>
-#include <vcl/dllapi.h>
-#include <vcl/ctrl.hxx>
+#include "vcl/sv.h"
+#include "vcl/dllapi.h"
+#include "vcl/ctrl.hxx"
 
 struct ImplTabItem;
 struct ImplTabCtrlData;
 class ImplTabItemList;
 class TabPage;
 class PushButton;
+class ListBox;
 
 // --------------------
 // - TabControl-Types -
@@ -72,7 +70,7 @@ private:
     BOOL                mbRestoreUnqId;
     BOOL                mbSingleLine;
     BOOL                mbScroll;
-    BOOL                mbColored;
+    BOOL                mbRestoreSmartId;
     BOOL                mbSmallInvalidate;
     BOOL                mbExtraSpace;
     Link                maActivateHdl;
@@ -95,6 +93,11 @@ private:
     SAL_DLLPRIVATE void         ImplPaint( const Rectangle& rRect, bool bLayout = false );
     SAL_DLLPRIVATE void         ImplFreeLayoutData();
     DECL_DLLPRIVATE_LINK(       ImplScrollBtnHdl, PushButton* pBtn );
+    DECL_DLLPRIVATE_LINK(       ImplListBoxSelectHdl, ListBox* );
+
+public:
+    // just for dialog control
+    SAL_DLLPRIVATE bool         ImplHandleNotifyEvent( NotifyEvent& rEvt );
 
 protected:
     using Window::ImplInit;
@@ -128,6 +131,9 @@ public:
     virtual void        ActivatePage();
     virtual long        DeactivatePage();
 
+    virtual Size GetOptimalSize(WindowSizeType eType) const;
+    void                SetMinimumSizePixel( const Size& );
+
     void                SetTabPageSizePixel( const Size& rSize );
     Size                GetTabPageSizePixel() const;
 
diff --git a/vcl/inc/vcl/tabdlg.hxx b/vcl/inc/vcl/tabdlg.hxx
index 5ec2bcad5225..b5f1dc14de5d 100644
--- a/vcl/inc/vcl/tabdlg.hxx
+++ b/vcl/inc/vcl/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.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,6 +33,7 @@
 #include <vcl/dialog.hxx>
 
 class FixedLine;
+class TabControl;
 
 // ----------------------
 // - TabDialog -
@@ -61,6 +59,8 @@ public:
     virtual void        Resize();
     virtual void        StateChanged( StateChangedType nStateChange );
 
+    SAL_DLLPRIVATE TabControl* ImplGetFirstTabControl() const;
+
     void                AdjustLayout();
 
     void                SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; }
diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx
index a3c3a0b8ca92..c653ccca5a30 100644
--- a/vcl/inc/vcl/tabpage.hxx
+++ b/vcl/inc/vcl/tabpage.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: tabpage.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/vcl/inc/vcl/taskpanelist.hxx b/vcl/inc/vcl/taskpanelist.hxx
index 8e60ef7eb818..33d75d7e31bd 100644
--- a/vcl/inc/vcl/taskpanelist.hxx
+++ b/vcl/inc/vcl/taskpanelist.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: taskpanelist.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/vcl/inc/vcl/textlayout.hxx b/vcl/inc/vcl/textlayout.hxx
index 4c290452e2ad..418e1aa8bf64 100755..100644
--- a/vcl/inc/vcl/textlayout.hxx
+++ b/vcl/inc/vcl/textlayout.hxx
@@ -1,28 +1,30 @@
 /*************************************************************************
-* 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 VCL_TEXTLAYOUT_HXX
 #define VCL_TEXTLAYOUT_HXX
 
diff --git a/vcl/inc/vcl/threadex.hxx b/vcl/inc/vcl/threadex.hxx
index f376a8f83964..1b48b5d63c9c 100644
--- a/vcl/inc/vcl/threadex.hxx
+++ b/vcl/inc/vcl/threadex.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: threadex.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/vcl/inc/vcl/timer.hxx b/vcl/inc/vcl/timer.hxx
index 9e881e681817..bb325c118844 100644
--- a/vcl/inc/vcl/timer.hxx
+++ b/vcl/inc/vcl/timer.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: timer.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/vcl/inc/vcl/toolbox.h b/vcl/inc/vcl/toolbox.h
index 2dee85ab6b82..33e4e8d2e013 100644
--- a/vcl/inc/vcl/toolbox.h
+++ b/vcl/inc/vcl/toolbox.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: toolbox.h,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/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx
index 6e4c300ccc40..5cc102842dc3 100644
--- a/vcl/inc/vcl/toolbox.hxx
+++ b/vcl/inc/vcl/toolbox.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: toolbox.hxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -124,6 +121,9 @@ typedef USHORT ToolBoxItemBits;
 #define TIB_DROPDOWN            ((ToolBoxItemBits)0x0020)
 #define TIB_REPEAT              ((ToolBoxItemBits)0x0040)
 #define TIB_DROPDOWNONLY        ((ToolBoxItemBits)0x0080 | TIB_DROPDOWN)    // this button has only drop down functionality
+#define TIB_TEXT_ONLY           ((ToolBoxItemBits)0x0100)
+#define TIB_ICON_ONLY           ((ToolBoxItemBits)0x0200)
+#define TIB_TEXTICON            ((ToolBoxItemBits) TIB_TEXT_ONLY | TIB_ICON_ONLY )
 
 // -----------------
 // - ToolBox-Types -
diff --git a/vcl/inc/vcl/unobrok.hxx b/vcl/inc/vcl/unobrok.hxx
index e58071fb9685..af616e80351a 100644
--- a/vcl/inc/vcl/unobrok.hxx
+++ b/vcl/inc/vcl/unobrok.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: unobrok.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/vcl/inc/vcl/unohelp.hxx b/vcl/inc/vcl/unohelp.hxx
index a53c19904f0f..5d98b6872a26 100644
--- a/vcl/inc/vcl/unohelp.hxx
+++ b/vcl/inc/vcl/unohelp.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: unohelp.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/vcl/inc/vcl/unohelp2.hxx b/vcl/inc/vcl/unohelp2.hxx
index 8e00f9858c49..e7d8d34e0595 100644
--- a/vcl/inc/vcl/unohelp2.hxx
+++ b/vcl/inc/vcl/unohelp2.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: unohelp2.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/vcl/inc/vcl/unowrap.hxx b/vcl/inc/vcl/unowrap.hxx
index 79524737705a..b11842aa0c6b 100644
--- a/vcl/inc/vcl/unowrap.hxx
+++ b/vcl/inc/vcl/unowrap.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: unowrap.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/vcl/inc/vcl/vclenum.hxx b/vcl/inc/vcl/vclenum.hxx
index c19226488095..ded36cc163f0 100644
--- a/vcl/inc/vcl/vclenum.hxx
+++ b/vcl/inc/vcl/vclenum.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: vclenum.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/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx
index 74971f62c5a6..048eb1d5a670 100644
--- a/vcl/inc/vcl/vclevent.hxx
+++ b/vcl/inc/vcl/vclevent.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: vclevent.hxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,12 +33,20 @@
 #include "vcl/dllapi.h"
 #include "vcl/impdel.hxx"
 
+#include <com/sun/star/uno/Reference.hxx>
+
 #include <list>
 #include <vector>
 
 class Window;
 class Menu;
 
+namespace com { namespace sun { namespace star {
+    namespace accessibility {
+        class XAccessible;
+    }
+}}}
+
 #define VCLEVENT_OBJECT_DYING                  1
 
 // VclWindowEvent:
@@ -242,6 +247,17 @@ public:
     USHORT GetItemPos() const { return mnPos; }
 };
 
+class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent
+{
+public:
+    VclAccessibleEvent( ULONG n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible );
+    virtual ~VclAccessibleEvent();
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const;
+
+private:
+    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible;
+};
+
 class VCL_DLLPUBLIC VclEventListeners : public std::list<Link>
 {
 public:
@@ -262,7 +278,10 @@ class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier
         std::list< Link >::iterator     m_aIt;
         bool                            m_bWasInvalidated;
 
-        ListenerIt() : m_bWasInvalidated( false ) {}
+        ListenerIt(const std::list<Link>::iterator& rIt)
+            : m_aIt(rIt)
+            , m_bWasInvalidated( false )
+        {}
     };
 
     std::vector< ListenerIt >      m_aIterators;
diff --git a/vcl/inc/vcl/virdev.hxx b/vcl/inc/vcl/virdev.hxx
index bc21dde6f4ac..26270ec7703f 100644
--- a/vcl/inc/vcl/virdev.hxx
+++ b/vcl/inc/vcl/virdev.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: virdev.hxx,v $
- * $Revision: 1.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -74,7 +71,6 @@ private:
     #define REFDEV_FORCE_ZERO_EXTLEAD 0x80
     SAL_DLLPRIVATE bool ForceZeroExtleadBug() const
         { return ((meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD) != 0); }
-
 public:
                         VirtualDevice( USHORT nBitCount = 0 );
                         VirtualDevice( const OutputDevice& rCompDev,
@@ -115,11 +111,19 @@ public:
                         REFDEV_MODE06 = 1,      // 600 dpi
                         REFDEV_MODE48 = 2,      // 4800 dpi
                         REFDEV_MODE_MSO1 = 3,
-                        REFDEV_MODE_PDF1 = 4 };
+                        REFDEV_MODE_PDF1 = 4,
+                        REFDEV_CUSTOM = 5
+                    };
 
     void                SetReferenceDevice( RefDevMode );
 
     void                Compat_ZeroExtleadBug(); // enable workaround for #i60495#
+
+    void                SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY );
+
+private:
+    SAL_DLLPRIVATE void ImplSetReferenceDevice( RefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY );
+
 };
 
 #endif // _SV_VIRDEV_HXX
diff --git a/vcl/inc/vcl/waitobj.hxx b/vcl/inc/vcl/waitobj.hxx
index 971cdf518eda..1dcd42d8bcf9 100644
--- a/vcl/inc/vcl/waitobj.hxx
+++ b/vcl/inc/vcl/waitobj.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: waitobj.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/vcl/inc/vcl/wall.hxx b/vcl/inc/vcl/wall.hxx
index a2d80b504bab..07611aaf5edc 100644
--- a/vcl/inc/vcl/wall.hxx
+++ b/vcl/inc/vcl/wall.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: wall.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/vcl/inc/vcl/wall2.hxx b/vcl/inc/vcl/wall2.hxx
index b3750d14daae..e93a8370ee7d 100644
--- a/vcl/inc/vcl/wall2.hxx
+++ b/vcl/inc/vcl/wall2.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: wall2.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/vcl/inc/vcl/windata.hxx b/vcl/inc/vcl/windata.hxx
index e69be178df6c..9436352e4927 100644
--- a/vcl/inc/vcl/windata.hxx
+++ b/vcl/inc/vcl/windata.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: windata.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/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h
index d745f3dcf081..9d917a09b6de 100644
--- a/vcl/inc/vcl/window.h
+++ b/vcl/inc/vcl/window.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: window.h,v $
- * $Revision: 1.6.86.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -358,7 +355,9 @@ public:
                         mbToolbarFloatingWindow:1,
                         mbCallHandlersDuringInputDisabled:1,
                         mbDisableAccessibleLabelForRelation:1,
-                        mbDisableAccessibleLabeledByRelation:1;
+                        mbDisableAccessibleLabeledByRelation:1,
+                        mbHelpTextDynamic:1,
+                        mbFakeFocusSet:1;
 
     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer;
 };
diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 56fdb22ddc57..3d1cc91ee468 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.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: window.hxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -582,7 +579,7 @@ protected:
 
             void        ImplCallEventListeners( ULONG nEvent, void* pData = NULL );
             void        CallEventListeners( ULONG nEvent, void* pData = NULL );
-
+            void        FireVclEvent( VclSimpleEvent* pEvent );
 
     // FIXME: this is a hack to workaround missing layout functionality
     SAL_DLLPRIVATE void ImplAdjustNWFSizes();
@@ -899,6 +896,13 @@ public:
     USHORT              GetGetFocusFlags() const;
     void                GrabFocusToDocument();
 
+    /**
+     * Set this when you need to act as if the window has focus even if it
+     * doesn't.  This is necessary for implementing tab stops inside floating
+     * windows, but floating windows don't get focus from the system.
+     */
+    void                SetFakeFocus( bool bFocus );
+
     BOOL                IsCompoundControl() const;
     BOOL                HasCompoundControlFocus() const;
 
diff --git a/vcl/inc/vcl/wintypes.hxx b/vcl/inc/vcl/wintypes.hxx
index 9e84648fb6a8..6da4e4e3d988 100644
--- a/vcl/inc/vcl/wintypes.hxx
+++ b/vcl/inc/vcl/wintypes.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: wintypes.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/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx
index 1dd46d8debe5..c710434c79a4 100644
--- a/vcl/inc/vcl/wrkwin.hxx
+++ b/vcl/inc/vcl/wrkwin.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: wrkwin.hxx,v $
- * $Revision: 1.3.138.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/inc/vcl/xconnection.hxx b/vcl/inc/vcl/xconnection.hxx
index 8cfbfdcac15c..aa9d37430ea6 100644
--- a/vcl/inc/vcl/xconnection.hxx
+++ b/vcl/inc/vcl/xconnection.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: xconnection.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/vcl/os2/inc/salbmp.h b/vcl/os2/inc/salbmp.h
index ab372b486ae2..14e51ffae8da 100644
--- a/vcl/os2/inc/salbmp.h
+++ b/vcl/os2/inc/salbmp.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: salbmp.h,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/vcl/os2/inc/saldata.hxx b/vcl/os2/inc/saldata.hxx
index 3ea194330672..cf536a58d8dd 100644
--- a/vcl/os2/inc/saldata.hxx
+++ b/vcl/os2/inc/saldata.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: saldata.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/vcl/os2/inc/salframe.h b/vcl/os2/inc/salframe.h
index dd8c441ca255..f02a39f80955 100644
--- a/vcl/os2/inc/salframe.h
+++ b/vcl/os2/inc/salframe.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: salframe.h,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/vcl/os2/inc/salgdi.h b/vcl/os2/inc/salgdi.h
index 1fb51f089100..ce486084a5b1 100644
--- a/vcl/os2/inc/salgdi.h
+++ b/vcl/os2/inc/salgdi.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: salgdi.h,v $
- * $Revision: 1.9.6.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/os2/inc/salids.hrc b/vcl/os2/inc/salids.hrc
index 3f7c343231d4..b5f2260d307f 100644
--- a/vcl/os2/inc/salids.hrc
+++ b/vcl/os2/inc/salids.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: salids.hrc,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/vcl/os2/inc/salinst.h b/vcl/os2/inc/salinst.h
index ba8dc7ddc43f..0948f605c286 100644
--- a/vcl/os2/inc/salinst.h
+++ b/vcl/os2/inc/salinst.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: salinst.h,v $
- * $Revision: 1.7.74.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/os2/inc/sallang.hxx b/vcl/os2/inc/sallang.hxx
index b93989190c0e..72d2566571a6 100644
--- a/vcl/os2/inc/sallang.hxx
+++ b/vcl/os2/inc/sallang.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: sallang.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/vcl/os2/inc/sallayout.h b/vcl/os2/inc/sallayout.h
index 43d516f2b30b..8444b5e758a9 100644
--- a/vcl/os2/inc/sallayout.h
+++ b/vcl/os2/inc/sallayout.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: sallayout.h,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/vcl/os2/inc/salmenu.h b/vcl/os2/inc/salmenu.h
index cdb731ebd034..081158bf81f7 100644
--- a/vcl/os2/inc/salmenu.h
+++ b/vcl/os2/inc/salmenu.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: salmenu.h,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/vcl/os2/inc/salobj.h b/vcl/os2/inc/salobj.h
index aa566808a41f..5b4ac21ccdd6 100644
--- a/vcl/os2/inc/salobj.h
+++ b/vcl/os2/inc/salobj.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: salobj.h,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/vcl/os2/inc/salprn.h b/vcl/os2/inc/salprn.h
index 25ecfe87ed89..4cb7700ffaae 100644
--- a/vcl/os2/inc/salprn.h
+++ b/vcl/os2/inc/salprn.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: salprn.h,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -83,7 +80,6 @@ public:
     virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
     virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
-    virtual DuplexMode          GetDuplexMode( const ImplJobSetup* pSetupData );
 };
 
 // ------------------
@@ -136,7 +132,9 @@ public:
     virtual BOOL                    StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
-                                              ULONG nCopies, BOOL bCollate,
+                                              ULONG nCopies,
+                                              bool bCollate,
+                                              bool bDirect,
                                               ImplJobSetup* pSetupData );
     virtual BOOL                    EndJob();
     virtual BOOL                    AbortJob();
diff --git a/vcl/os2/inc/salsound.h b/vcl/os2/inc/salsound.h
index 7ee3ac1e8d35..62536678625d 100644
--- a/vcl/os2/inc/salsound.h
+++ b/vcl/os2/inc/salsound.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: salsound.h,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/vcl/os2/inc/salsound.hxx b/vcl/os2/inc/salsound.hxx
index 49d0d2a88194..7ec2aeed1720 100644
--- a/vcl/os2/inc/salsound.hxx
+++ b/vcl/os2/inc/salsound.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: salsound.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/vcl/os2/inc/salsys.h b/vcl/os2/inc/salsys.h
index 6424aeccaa3c..fa76ac349cc9 100644
--- a/vcl/os2/inc/salsys.h
+++ b/vcl/os2/inc/salsys.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: salsys.h,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/vcl/os2/inc/saltimer.h b/vcl/os2/inc/saltimer.h
index 9b411a34fd06..069e97755d05 100644
--- a/vcl/os2/inc/saltimer.h
+++ b/vcl/os2/inc/saltimer.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: saltimer.h,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/vcl/os2/inc/salvd.h b/vcl/os2/inc/salvd.h
index 26dc631e1529..8f841f941430 100644
--- a/vcl/os2/inc/salvd.h
+++ b/vcl/os2/inc/salvd.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: salvd.h,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/vcl/os2/inc/svsys.h b/vcl/os2/inc/svsys.h
index a322d6d22cfb..39544b83d875 100644
--- a/vcl/os2/inc/svsys.h
+++ b/vcl/os2/inc/svsys.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: svsys.h,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/vcl/os2/source/app/makefile.mk b/vcl/os2/source/app/makefile.mk
index e2c14fb1744a..80aeb7f568fb 100644
--- a/vcl/os2/source/app/makefile.mk
+++ b/vcl/os2/source/app/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/os2/source/app/salinfo.cxx b/vcl/os2/source/app/salinfo.cxx
index 39700fc26a75..e48aacd4c521 100644
--- a/vcl/os2/source/app/salinfo.cxx
+++ b/vcl/os2/source/app/salinfo.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: salinfo.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/vcl/os2/source/app/salinst.cxx b/vcl/os2/source/app/salinst.cxx
index 633ad4137aff..b08a9769ccf4 100644
--- a/vcl/os2/source/app/salinst.cxx
+++ b/vcl/os2/source/app/salinst.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: salinst.cxx,v $
- * $Revision: 1.8.74.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/os2/source/app/sallang.cxx b/vcl/os2/source/app/sallang.cxx
index fab9328464f2..f23705077ac3 100644
--- a/vcl/os2/source/app/sallang.cxx
+++ b/vcl/os2/source/app/sallang.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: sallang.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/vcl/os2/source/app/salshl.cxx b/vcl/os2/source/app/salshl.cxx
index 54957efa58bf..637ddd748f33 100644
--- a/vcl/os2/source/app/salshl.cxx
+++ b/vcl/os2/source/app/salshl.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: salshl.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/vcl/os2/source/app/saltimer.cxx b/vcl/os2/source/app/saltimer.cxx
index 56552ed59379..bcdeec94ef25 100644
--- a/vcl/os2/source/app/saltimer.cxx
+++ b/vcl/os2/source/app/saltimer.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: saltimer.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/vcl/os2/source/gdi/makefile.mk b/vcl/os2/source/gdi/makefile.mk
index 0f740490898f..b411c1eb2ce2 100644
--- a/vcl/os2/source/gdi/makefile.mk
+++ b/vcl/os2/source/gdi/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.154.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/os2/source/gdi/os2layout.cxx b/vcl/os2/source/gdi/os2layout.cxx
index dffb6a412f9b..924770c86869 100644
--- a/vcl/os2/source/gdi/os2layout.cxx
+++ b/vcl/os2/source/gdi/os2layout.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: os2layout.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/vcl/os2/source/gdi/salbmp.cxx b/vcl/os2/source/gdi/salbmp.cxx
index a281f615be55..3d8f86ddcd1e 100644
--- a/vcl/os2/source/gdi/salbmp.cxx
+++ b/vcl/os2/source/gdi/salbmp.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: salbmp.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/vcl/os2/source/gdi/salgdi.cxx b/vcl/os2/source/gdi/salgdi.cxx
index 082e690c09e7..5be40355f731 100644
--- a/vcl/os2/source/gdi/salgdi.cxx
+++ b/vcl/os2/source/gdi/salgdi.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: salgdi.cxx,v $
- * $Revision: 1.8.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/os2/source/gdi/salgdi2.cxx b/vcl/os2/source/gdi/salgdi2.cxx
index 733517ffa9b4..37621ee1f6a8 100644
--- a/vcl/os2/source/gdi/salgdi2.cxx
+++ b/vcl/os2/source/gdi/salgdi2.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: salgdi2.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/vcl/os2/source/gdi/salgdi3.cxx b/vcl/os2/source/gdi/salgdi3.cxx
index b25feee266e4..e25e68ee5a4c 100644
--- a/vcl/os2/source/gdi/salgdi3.cxx
+++ b/vcl/os2/source/gdi/salgdi3.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: salgdi3.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/vcl/os2/source/gdi/salprn.cxx b/vcl/os2/source/gdi/salprn.cxx
index 0c254e2f6e62..1aef34631f2e 100644
--- a/vcl/os2/source/gdi/salprn.cxx
+++ b/vcl/os2/source/gdi/salprn.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: salprn.cxx,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1559,7 +1556,9 @@ Os2SalPrinter::~Os2SalPrinter()
 BOOL Os2SalPrinter::StartJob( const XubString* pFileName,
                            const XubString& rJobName,
                            const XubString& rAppName,
-                           ULONG nCopies, BOOL bCollate,
+                           ULONG nCopies,
+                           bool bCollate,
+                           bool bDirect,
                            ImplJobSetup* pSetupData )
 {
     DEVOPENSTRUC    aDevOpenStruc;
@@ -1831,9 +1830,4 @@ int Os2SalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* pSetupData )
     printf("Os2SalInfoPrinter::GetLandscapeAngle\n");
     return 0;
 }
-DuplexMode Os2SalInfoPrinter::GetDuplexMode( const ImplJobSetup* pSetupData )
-{
-    DuplexMode nRet = DUPLEX_UNKNOWN;
-    printf("Os2SalInfoPrinter::GetDuplexMode\n");
-    return nRet;
-}
+
diff --git a/vcl/os2/source/gdi/salvd.cxx b/vcl/os2/source/gdi/salvd.cxx
index d497128a8069..4e53782be8ea 100644
--- a/vcl/os2/source/gdi/salvd.cxx
+++ b/vcl/os2/source/gdi/salvd.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: salvd.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/vcl/os2/source/src/makefile.mk b/vcl/os2/source/src/makefile.mk
index 60aa376a19fe..1dba7496be65 100644
--- a/vcl/os2/source/src/makefile.mk
+++ b/vcl/os2/source/src/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/vcl/os2/source/src/salsrc.rc b/vcl/os2/source/src/salsrc.rc
index 2654dcc7f2f9..6e3b40c76da0 100644
--- a/vcl/os2/source/src/salsrc.rc
+++ b/vcl/os2/source/src/salsrc.rc
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: salsrc.rc,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/vcl/os2/source/window/makefile b/vcl/os2/source/window/makefile
index 8fcf3e11eafb..e9aba563d9e8 100644
--- a/vcl/os2/source/window/makefile
+++ b/vcl/os2/source/window/makefile
@@ -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,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/vcl/os2/source/window/makefile.mk b/vcl/os2/source/window/makefile.mk
index 59d2d8a58916..f4a6ad0cb870 100644
--- a/vcl/os2/source/window/makefile.mk
+++ b/vcl/os2/source/window/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/vcl/os2/source/window/salframe.cxx b/vcl/os2/source/window/salframe.cxx
index 5e4b843c7cff..7ecc27ff9754 100644
--- a/vcl/os2/source/window/salframe.cxx
+++ b/vcl/os2/source/window/salframe.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: salframe.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/vcl/os2/source/window/salmenu.cxx b/vcl/os2/source/window/salmenu.cxx
index 2f61cd7cb2b9..339ab5dbfadb 100644
--- a/vcl/os2/source/window/salmenu.cxx
+++ b/vcl/os2/source/window/salmenu.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: salmenu.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/vcl/os2/source/window/salobj.cxx b/vcl/os2/source/window/salobj.cxx
index 9f665506c5d3..85ed1a606d08 100644
--- a/vcl/os2/source/window/salobj.cxx
+++ b/vcl/os2/source/window/salobj.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: salobj.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/vcl/prj/build.lst b/vcl/prj/build.lst
index 5d2aaf90c6f7..e6f636522acb 100644
--- a/vcl/prj/build.lst
+++ b/vcl/prj/build.lst
@@ -1,4 +1,4 @@
-vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools transex3 icc SO:print_header cpputools shell NULL
+vc	vcl	:	l10n apple_remote BOOST:boost rsc sot ucbhelper unotools ICU:icu GRAPHITE:graphite i18npool i18nutil unoil ridljar X11_EXTENSIONS:x11_extensions offuh basegfx basebmp tools l10ntools icc SO:print_header cpputools shell svl NULL
 vc	vcl										usr1	-	all	vc_mkout NULL
 vc	vcl\inc									nmake	-	all	vc_inc NULL
 vc	vcl\source\glyphs						nmake	-	all	vc_glyphs vc_inc NULL
diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst
index 54af0d2e289d..8345b155ce58 100644
--- a/vcl/prj/d.lst
+++ b/vcl/prj/d.lst
@@ -81,10 +81,11 @@ mkdir: %_DEST%\inc%_EXT%\vcl
 ..\inc\vcl\morebtn.hxx %_DEST%\inc%_EXT%\vcl\morebtn.hxx
 ..\inc\vcl\msgbox.hxx %_DEST%\inc%_EXT%\vcl\msgbox.hxx
 ..\inc\vcl\octree.hxx %_DEST%\inc%_EXT%\vcl\octree.hxx
+..\inc\vcl\oldprintadaptor.hxx %_DEST%\inc%_EXT%\vcl\oldprintadaptor.hxx
 ..\inc\vcl\outdev.hxx %_DEST%\inc%_EXT%\vcl\outdev.hxx
 ..\inc\vcl\pointr.hxx %_DEST%\inc%_EXT%\vcl\pointr.hxx
+..\inc\vcl\popupmenuwindow.hxx %_DEST%\inc%_EXT%\vcl\popupmenuwindow.hxx
 ..\inc\vcl\print.hxx %_DEST%\inc%_EXT%\vcl\print.hxx
-..\inc\vcl\prndlg.hxx %_DEST%\inc%_EXT%\vcl\prndlg.hxx
 ..\inc\vcl\prntypes.hxx %_DEST%\inc%_EXT%\vcl\prntypes.hxx
 ..\inc\vcl\ptrstyle.hxx %_DEST%\inc%_EXT%\vcl\ptrstyle.hxx
 ..\inc\vcl\regband.hxx %_DEST%\inc%_EXT%\vcl\regband.hxx
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index c374c7d4229a..9f8272240403 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.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: CheckMemoryUsage.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/vcl/qa/complex/memCheck/makefile.mk b/vcl/qa/complex/memCheck/makefile.mk
index 5b1837540c51..d1d4b5c08c98 100755
--- a/vcl/qa/complex/memCheck/makefile.mk
+++ b/vcl/qa/complex/memCheck/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.5.124.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/qa/complex/persistent_window_states/DocumentHandle.java b/vcl/qa/complex/persistent_window_states/DocumentHandle.java
index 38b8f75f0cfe..0b32eaaeff51 100644
--- a/vcl/qa/complex/persistent_window_states/DocumentHandle.java
+++ b/vcl/qa/complex/persistent_window_states/DocumentHandle.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: DocumentHandle.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/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
index 6b7804697e2f..edceeeafd883 100644
--- a/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
+++ b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.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: PersistentWindowTest.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/vcl/qa/complex/persistent_window_states/makefile.mk b/vcl/qa/complex/persistent_window_states/makefile.mk
index 1be4474651e9..4c61d8969b8d 100644
--- a/vcl/qa/complex/persistent_window_states/makefile.mk
+++ b/vcl/qa/complex/persistent_window_states/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.5.124.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index 36d0991c7640..b22a7d21f357 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.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: dbggui.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/vcl/source/app/dndhelp.cxx b/vcl/source/app/dndhelp.cxx
index 787bfc350048..d1eb2014b4df 100644
--- a/vcl/source/app/dndhelp.cxx
+++ b/vcl/source/app/dndhelp.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: dndhelp.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/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 51f07b060c76..b4ab10887fcd 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.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: help.cxx,v $
- * $Revision: 1.40 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -70,6 +67,10 @@ BOOL Help::Start( ULONG, const Window* )
     return FALSE;
 }
 
+void Help::OpenHelpAgent( ULONG )
+{
+}
+
 // -----------------------------------------------------------------------
 
 BOOL Help::Start( const XubString&, const Window* )
diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx
index 1622fe3e5bea..17bc760ff5fc 100644
--- a/vcl/source/app/i18nhelp.cxx
+++ b/vcl/source/app/i18nhelp.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: i18nhelp.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/vcl/source/app/idlemgr.cxx b/vcl/source/app/idlemgr.cxx
index d4c3aa8054e4..0318bc5d6f2d 100644
--- a/vcl/source/app/idlemgr.cxx
+++ b/vcl/source/app/idlemgr.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: idlemgr.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/vcl/source/app/makefile.mk b/vcl/source/app/makefile.mk
index 712f00470ca6..5d14f0032b4a 100644
--- a/vcl/source/app/makefile.mk
+++ b/vcl/source/app/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.23 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 516b23dd76be..9a2404d36740 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.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: salvtables.cxx,v $
- * $Revision: 1.14.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -97,8 +94,8 @@ SalPrinter::~SalPrinter()
 {
 }
 
-BOOL SalPrinter::StartJob( const String*, const String&,
-                           ImplJobSetup*, ImplQPrinter* )
+BOOL SalPrinter::StartJob( const String*, const String&, const String&,
+                           ImplJobSetup*, vcl::PrinterController& )
 {
     return FALSE;
 }
diff --git a/vcl/source/app/session.cxx b/vcl/source/app/session.cxx
index e82e93a9ccca..c65eb13224e1 100644
--- a/vcl/source/app/session.cxx
+++ b/vcl/source/app/session.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: session.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/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index bd90d8824d91..1aebe5913959 100755..100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.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: settings.cxx,v $
- * $Revision: 1.77 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/app/sound.cxx b/vcl/source/app/sound.cxx
index f77da869fdd6..bac9d50dc5da 100644
--- a/vcl/source/app/sound.cxx
+++ b/vcl/source/app/sound.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: sound.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/vcl/source/app/stdtext.cxx b/vcl/source/app/stdtext.cxx
index 68b2275c43e8..176ec5a1b4c6 100644
--- a/vcl/source/app/stdtext.cxx
+++ b/vcl/source/app/stdtext.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: stdtext.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/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index 7f329f2d24d5..7cec6867e0a3 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.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: svapp.cxx,v $
- * $Revision: 1.84 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx
index 6a61d15db4c0..f8b0d1d3379f 100644
--- a/vcl/source/app/svdata.cxx
+++ b/vcl/source/app/svdata.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: svdata.cxx,v $
- * $Revision: 1.56 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -234,6 +231,15 @@ ResMgr* ImplGetResMgr()
     return pSVData->mpResMgr;
 }
 
+ResId VclResId( sal_Int32 nId )
+{
+    ResMgr* pMgr = ImplGetResMgr();
+    if( ! pMgr )
+        throw std::bad_alloc();
+
+    return ResId( nId, *pMgr );
+}
+
 DockingManager* ImplGetDockingManager()
 {
     ImplSVData* pSVData = ImplGetSVData();
diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx
index 310c01a40673..4efa2b659e7c 100644
--- a/vcl/source/app/svmain.cxx
+++ b/vcl/source/app/svmain.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: svmain.cxx,v $
- * $Revision: 1.73.92.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -444,6 +441,26 @@ void DeInitVCL()
         delete pSVData->maCtrlData.mpSplitVArwImgList;
         pSVData->maCtrlData.mpSplitVArwImgList = NULL;
     }
+    if ( pSVData->maCtrlData.mpDisclosurePlus )
+    {
+        delete pSVData->maCtrlData.mpDisclosurePlus;
+        pSVData->maCtrlData.mpDisclosurePlus = NULL;
+    }
+    if ( pSVData->maCtrlData.mpDisclosurePlusHC )
+    {
+        delete pSVData->maCtrlData.mpDisclosurePlusHC;
+        pSVData->maCtrlData.mpDisclosurePlusHC = NULL;
+    }
+    if ( pSVData->maCtrlData.mpDisclosureMinus )
+    {
+        delete pSVData->maCtrlData.mpDisclosureMinus;
+        pSVData->maCtrlData.mpDisclosureMinus = NULL;
+    }
+    if ( pSVData->maCtrlData.mpDisclosureMinusHC )
+    {
+        delete pSVData->maCtrlData.mpDisclosureMinusHC;
+        pSVData->maCtrlData.mpDisclosureMinusHC = NULL;
+    }
     if ( pSVData->mpDefaultWin )
     {
         delete pSVData->mpDefaultWin;
diff --git a/vcl/source/app/svmainhook.cxx b/vcl/source/app/svmainhook.cxx
index c88680888c07..413b28b3affb 100644
--- a/vcl/source/app/svmainhook.cxx
+++ b/vcl/source/app/svmainhook.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: svmainhook.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/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 75ce25779c5d..356608e7fbfc 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.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: timer.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/vcl/source/app/unohelp.cxx b/vcl/source/app/unohelp.cxx
index d8401b3a0f55..237156a5f9f7 100644
--- a/vcl/source/app/unohelp.cxx
+++ b/vcl/source/app/unohelp.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: unohelp.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/vcl/source/app/unohelp2.cxx b/vcl/source/app/unohelp2.cxx
index 4e08c592668b..5b6d7c73416a 100644
--- a/vcl/source/app/unohelp2.cxx
+++ b/vcl/source/app/unohelp2.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: unohelp2.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/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx
index 704d68c5bc7f..0c98da48e6d0 100644
--- a/vcl/source/app/vclevent.cxx
+++ b/vcl/source/app/vclevent.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: vclevent.cxx,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -34,10 +31,30 @@
 #include "vcl/vclevent.hxx"
 #include "vcl/svdata.hxx"
 
+#include <com/sun/star/accessibility/XAccessible.hpp>
+
+using ::com::sun::star::uno::Reference;
+using ::com::sun::star::accessibility::XAccessible;
+
 TYPEINIT0(VclSimpleEvent);
 TYPEINIT1(VclWindowEvent, VclSimpleEvent);
 TYPEINIT1(VclMenuEvent, VclSimpleEvent);
 
+VclAccessibleEvent::VclAccessibleEvent( ULONG n, const Reference<XAccessible>& rxAccessible ) :
+    VclSimpleEvent(n),
+    mxAccessible(rxAccessible)
+{
+}
+
+VclAccessibleEvent::~VclAccessibleEvent()
+{
+}
+
+Reference<XAccessible> VclAccessibleEvent::GetAccessible() const
+{
+    return mxAccessible;
+}
+
 void VclEventListeners::Call( VclSimpleEvent* pEvent ) const
 {
     // Copy the list, because this can be destroyed when calling a Link...
@@ -118,9 +135,8 @@ void VclEventListeners2::callListeners( VclSimpleEvent* i_pEvent )
 {
     vcl::DeletionListener aDel( this );
 
-    m_aIterators.push_back( ListenerIt() );
+    m_aIterators.push_back(ListenerIt(m_aListeners.begin()));
     size_t nIndex = m_aIterators.size() - 1;
-    m_aIterators[ nIndex ].m_aIt = m_aListeners.begin();
     while( ! aDel.isDeleted() && m_aIterators[ nIndex ].m_aIt != m_aListeners.end() )
     {
         m_aIterators[ nIndex ].m_aIt->Call( i_pEvent );
diff --git a/vcl/source/components/display.cxx b/vcl/source/components/display.cxx
index f5fb29aaed80..6d7653968229 100644
--- a/vcl/source/components/display.cxx
+++ b/vcl/source/components/display.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: display.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/vcl/source/components/dtranscomp.cxx b/vcl/source/components/dtranscomp.cxx
index 58792cd4fbdb..9c88deccec23 100644
--- a/vcl/source/components/dtranscomp.cxx
+++ b/vcl/source/components/dtranscomp.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: fontident.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/vcl/source/components/factory.cxx b/vcl/source/components/factory.cxx
index e816c31c613a..6bed493cacde 100644
--- a/vcl/source/components/factory.cxx
+++ b/vcl/source/components/factory.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: factory.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/vcl/source/components/fontident.cxx b/vcl/source/components/fontident.cxx
index c1792952826e..ad309e4f2560 100644
--- a/vcl/source/components/fontident.cxx
+++ b/vcl/source/components/fontident.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: fontident.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/vcl/source/components/makefile.mk b/vcl/source/components/makefile.mk
index 8cc836fe5424..e30975dbc099 100644
--- a/vcl/source/components/makefile.mk
+++ b/vcl/source/components/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.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 53a060af6bd6..1cda2308aa9c 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.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: button.cxx,v $
- * $Revision: 1.63 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1983,8 +1980,11 @@ Size PushButton::CalcMinimumSize( long nMaxWidth ) const
     }
 
     // cf. ImplDrawPushButton ...
-    aSize.Width() += 8;
-    aSize.Height() += 8;
+    if( (GetStyle() & WB_SMALLSTYLE) == 0 )
+    {
+        aSize.Width() += 8;
+        aSize.Height() += 8;
+    }
 
     return CalcWindowSize( aSize );
 }
@@ -4376,3 +4376,95 @@ TriStateBox::TriStateBox( Window* pParent, const ResId& rResId ) :
 TriStateBox::~TriStateBox()
 {
 }
+
+// =======================================================================
+
+DisclosureButton::DisclosureButton( Window* pParent, WinBits ) :
+    CheckBox( pParent, WB_NOBORDER )
+{
+}
+
+// -----------------------------------------------------------------------
+
+DisclosureButton::DisclosureButton( Window* pParent, const ResId& rResId ) :
+    CheckBox( pParent, rResId.SetRT( RSC_CHECKBOX ) )
+{
+}
+
+// -----------------------------------------------------------------------
+
+void DisclosureButton::ImplDrawCheckBoxState()
+{
+    /* HACK: DisclosureButton is currently assuming, that the disclosure sign
+       will fit into the rectangle occupied by a normal checkbox on all themes.
+       If this does not hold true for some theme, ImplGetCheckImageSize
+       would have to be overloaded for DisclosureButton; also GetNativeControlRegion
+       for CTRL_LISTNODE would have to be implemented and taken into account
+    */
+
+    Rectangle aStateRect( GetStateRect() );
+
+    ImplControlValue    aControlValue( GetState() == STATE_CHECK ? BUTTONVALUE_ON : BUTTONVALUE_OFF, rtl::OUString(), 0 );
+    Region              aCtrlRegion( aStateRect );
+    ControlState        nState = 0;
+
+    if ( HasFocus() )                       nState |= CTRL_STATE_FOCUSED;
+    if ( ImplGetButtonState() & BUTTON_DRAW_DEFAULT )   nState |= CTRL_STATE_DEFAULT;
+    if ( Window::IsEnabled() )              nState |= CTRL_STATE_ENABLED;
+    if ( IsMouseOver() && GetMouseRect().IsInside( GetPointerPosPixel() ) )
+        nState |= CTRL_STATE_ROLLOVER;
+
+    if( ! DrawNativeControl( CTRL_LISTNODE, PART_ENTIRE_CONTROL, aCtrlRegion, nState,
+                           aControlValue, rtl::OUString() ) )
+    {
+        ImplSVCtrlData& rCtrlData( ImplGetSVData()->maCtrlData );
+        if( ! rCtrlData.mpDisclosurePlus )
+            rCtrlData.mpDisclosurePlus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS ) ) );
+        if( ! rCtrlData.mpDisclosurePlusHC )
+            rCtrlData.mpDisclosurePlusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_PLUS_HC ) ) );
+        if( ! rCtrlData.mpDisclosureMinus )
+            rCtrlData.mpDisclosureMinus = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS ) ) );
+        if( ! rCtrlData.mpDisclosureMinusHC )
+            rCtrlData.mpDisclosureMinusHC = new Image( BitmapEx( VclResId( SV_DISCLOSURE_MINUS_HC ) ) );
+
+        Image* pImg = NULL;
+        if( GetSettings().GetStyleSettings().GetHighContrastMode() )
+            pImg = IsChecked() ? rCtrlData.mpDisclosureMinusHC : rCtrlData.mpDisclosurePlusHC;
+        else
+            pImg = IsChecked() ? rCtrlData.mpDisclosureMinus : rCtrlData.mpDisclosurePlus;
+
+        DBG_ASSERT( pImg, "no disclosure image" );
+        if( ! pImg )
+            return;
+
+        USHORT nStyle = 0;
+        if( ! IsEnabled() )
+            nStyle |= IMAGE_DRAW_DISABLE;
+
+        Size aSize( aStateRect.GetSize() );
+        Size aImgSize( pImg->GetSizePixel() );
+        Point aOff( (aSize.Width() - aImgSize.Width())/2,
+                    (aSize.Height() - aImgSize.Height())/2 );
+        aOff += aStateRect.TopLeft();
+        DrawImage( aOff, *pImg, nStyle );
+    }
+}
+
+// -----------------------------------------------------------------------
+
+void DisclosureButton::KeyInput( const KeyEvent& rKEvt )
+{
+    KeyCode aKeyCode = rKEvt.GetKeyCode();
+
+    if( !aKeyCode.GetModifier()  &&
+        ( ( aKeyCode.GetCode() == KEY_ADD ) ||
+          ( aKeyCode.GetCode() == KEY_SUBTRACT ) )
+        )
+    {
+        Check( aKeyCode.GetCode() == KEY_ADD );
+    }
+    else
+        Button::KeyInput( rKEvt );
+}
+
+
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 21707d0182f5..f5c04b7c3cfa 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.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: combobox.cxx,v $
- * $Revision: 1.50 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -951,7 +948,7 @@ void ComboBox::ImplUpdateFloatSelection()
         if( nSelect != LISTBOX_ENTRY_NOTFOUND )
         {
             if ( !mpImplLB->IsVisible( nSelect ) )
-                mpImplLB->SetTopEntry( nSelect );
+                mpImplLB->ShowProminentEntry( nSelect );
             mpImplLB->SelectEntry( nSelect, bSelect );
         }
         else
@@ -959,7 +956,6 @@ void ComboBox::ImplUpdateFloatSelection()
             nSelect = mpImplLB->GetEntryList()->GetSelectEntryPos( 0 );
             if( nSelect != LISTBOX_ENTRY_NOTFOUND )
                 mpImplLB->SelectEntry( nSelect, FALSE );
-            // mpImplLB->SetTopEntry( 0 ); #92555# Ugly....
             mpImplLB->ResetCurrentPos();
         }
     }
@@ -1440,6 +1436,13 @@ void ComboBox::SetTopEntry( USHORT nPos )
 
 // -----------------------------------------------------------------------
 
+void ComboBox::ShowProminentEntry( USHORT nPos )
+{
+    mpImplLB->ShowProminentEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount() );
+}
+
+// -----------------------------------------------------------------------
+
 USHORT ComboBox::GetTopEntry() const
 {
     USHORT nPos = GetEntryCount() ? mpImplLB->GetTopEntry() : LISTBOX_ENTRY_NOTFOUND;
@@ -1450,6 +1453,20 @@ USHORT ComboBox::GetTopEntry() const
 
 // -----------------------------------------------------------------------
 
+void ComboBox::SetProminentEntryType( ProminentEntry eType )
+{
+    mpImplLB->SetProminentEntryType( eType );
+}
+
+// -----------------------------------------------------------------------
+
+ProminentEntry ComboBox::GetProminentEntryType() const
+{
+    return mpImplLB->GetProminentEntryType();
+}
+
+// -----------------------------------------------------------------------
+
 Rectangle ComboBox::GetDropDownPosSizePixel() const
 {
     return mpFloatWin ? mpFloatWin->GetWindowExtentsRelative( const_cast<ComboBox*>(this) ) : Rectangle();
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 1800327df33c..918675cc0783 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.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: ctrl.cxx,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/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index b654e034470f..0a29a627b8e3 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.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: edit.cxx,v $
- * $Revision: 1.101 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -492,6 +489,17 @@ void Edit::ImplInvalidateOrRepaint( xub_StrLen nStart, xub_StrLen nEnd )
 
 // -----------------------------------------------------------------------
 
+long Edit::ImplGetTextYPosition() const
+{
+    if ( GetStyle() & WB_TOP )
+        return ImplGetExtraOffset();
+    else if ( GetStyle() & WB_BOTTOM )
+        return GetOutputSizePixel().Height() - GetTextHeight() - ImplGetExtraOffset();
+    return ( GetOutputSizePixel().Height() - GetTextHeight() ) / 2;
+}
+
+// -----------------------------------------------------------------------
+
 void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout )
 {
     if ( !IsReallyVisible() )
@@ -516,10 +524,8 @@ void Edit::ImplRepaint( xub_StrLen nStart, xub_StrLen nEnd, bool bLayout )
         GetCaretPositions( aText, pDX, nStart, nEnd );
     }
 
-    // center vertically
-    long    nH = GetOutputSize().Height();
     long    nTH = GetTextHeight();
-    Point   aPos( mnXOffset, (nH-nTH)/2 );
+    Point   aPos( mnXOffset, ImplGetTextYPosition() );
 
     if( bLayout )
     {
@@ -1193,7 +1199,7 @@ void Edit::ImplShowCursor( BOOL bOnlyIfVisible )
     long nCursorPosX = nTextPos + mnXOffset + ImplGetExtraOffset();
 
     // Cursor muss im sichtbaren Bereich landen:
-    Size aOutSize = GetOutputSizePixel();
+    const Size aOutSize = GetOutputSizePixel();
     if ( (nCursorPosX < 0) || (nCursorPosX >= aOutSize.Width()) )
     {
         long nOldXOffset = mnXOffset;
@@ -1227,8 +1233,8 @@ void Edit::ImplShowCursor( BOOL bOnlyIfVisible )
             ImplInvalidateOrRepaint();
     }
 
-    long nTextHeight = GetTextHeight();
-    long nCursorPosY = (aOutSize.Height()-nTextHeight) / 2;
+    const long nTextHeight = GetTextHeight();
+    const long nCursorPosY = ImplGetTextYPosition();
     pCursor->SetPos( Point( nCursorPosX, nCursorPosY ) );
     pCursor->SetSize( Size( nCursorWidth, nTextHeight ) );
     pCursor->Show();
@@ -2831,7 +2837,29 @@ void Edit::SetSubEdit( Edit* pEdit )
 Size Edit::CalcMinimumSize() const
 {
     Size aSize ( GetTextWidth( GetText() ), GetTextHeight() );
-    return CalcWindowSize( aSize );
+    // do not create edit fields in which one cannot enter anything
+    // a default minimum width should exist for at least 3 characters
+    Size aMinSize ( CalcSize( 3 ) );
+    if( aSize.Width() < aMinSize.Width() )
+        aSize.Width() = aMinSize.Width();
+    // add some space between text entry an border
+    aSize.Height() += 4;
+
+    aSize = CalcWindowSize( aSize );
+
+    // ask NWF what if it has an opinion, too
+    ImplControlValue aControlValue;
+    Rectangle aRect( Point( 0, 0 ), aSize );
+    Region aContent, aBound;
+    if( const_cast<Edit*>(this)->GetNativeControlRegion(
+                   CTRL_EDITBOX, PART_ENTIRE_CONTROL,
+                   aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+    {
+        Rectangle aBoundRect( aContent.GetBoundRect() );
+        if( aBoundRect.GetHeight() > aSize.Height() )
+            aSize.Height() = aBoundRect.GetHeight();
+    }
+    return aSize;
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 3cb6e45f0400..090aa2a84163 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.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: field.cxx,v $
- * $Revision: 1.26.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index a7729f4ace24..8ae2ecff41b9 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.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: field2.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/vcl/source/control/fixbrd.cxx b/vcl/source/control/fixbrd.cxx
index 58649a179fae..b519174f95d1 100644
--- a/vcl/source/control/fixbrd.cxx
+++ b/vcl/source/control/fixbrd.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: fixbrd.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/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 3d19e288a1ce..4b83540c1aa1 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.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: fixed.cxx,v $
- * $Revision: 1.25 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1062,6 +1059,14 @@ void FixedImage::Paint( const Rectangle& )
 
 // -----------------------------------------------------------------------
 
+Size FixedImage::GetOptimalSize( WindowSizeType ) const
+{
+    const Image* pImage = GetSettings().GetStyleSettings().GetHighContrastMode() ? &maImageHC : &maImage;
+    return pImage->GetSizePixel();
+}
+
+// -----------------------------------------------------------------------
+
 void FixedImage::UserDraw( const UserDrawEvent& )
 {
 }
diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx
index 4adc91f88d84..ecf00568e11f 100644
--- a/vcl/source/control/group.cxx
+++ b/vcl/source/control/group.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: group.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/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index a915d8e6b9e8..cd74a4cd88ce 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.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: ilstbox.cxx,v $
- * $Revision: 1.67 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -565,6 +562,7 @@ ImplListBoxWindow::ImplListBoxWindow( Window* pParent, WinBits nWinStyle ) :
     mnCurrentPos            = LISTBOX_ENTRY_NOTFOUND;
     mnTrackingSaveSelection = LISTBOX_ENTRY_NOTFOUND;
     mnSeparatorPos          = LISTBOX_ENTRY_NOTFOUND;
+    meProminentType         = PROMINENT_TOP;
 
     SetLineColor();
     SetTextFillColor();
@@ -1067,11 +1065,11 @@ void ImplListBoxWindow::SelectEntry( USHORT nPos, BOOL bSelect )
                     if ( !nVisibleEntries || !IsReallyVisible() || ( nPos < GetTopEntry() ) )
                     {
                         Resize();
-                        SetTopEntry( nPos );
+                        ShowProminentEntry( nPos );
                     }
                     else
                     {
-                        SetTopEntry( nPos-nVisibleEntries+1 );
+                        ShowProminentEntry( nPos );
                     }
                 }
             }
@@ -1702,11 +1700,7 @@ BOOL ImplListBoxWindow::ProcessKeyInput( const KeyEvent& rKEvt )
 
                 if ( nSelect != LISTBOX_ENTRY_NOTFOUND )
                 {
-                    USHORT nCurVis = GetLastVisibleEntry() - mnTop + 1;
-                    if( nSelect < mnTop )
-                        SetTopEntry( nSelect );
-                    else if( nSelect >= (mnTop + nCurVis) )
-                        SetTopEntry( nSelect - nCurVis + 1 );
+                    ShowProminentEntry( nSelect );
 
                     if ( mpEntryList->IsEntryPosSelected( nSelect ) )
                         nSelect = LISTBOX_ENTRY_NOTFOUND;
@@ -1873,6 +1867,8 @@ void ImplListBoxWindow::DrawEntry( USHORT nPos, BOOL bDrawImage, BOOL bDrawText,
             USHORT nDrawStyle = ImplGetTextStyle();
             if( (pEntry->mnFlags & LISTBOX_ENTRY_FLAG_MULTILINE) )
                 nDrawStyle |= MULTILINE_ENTRY_DRAW_FLAGS;
+            if( (pEntry->mnFlags & LISTBOX_ENTRY_FLAG_DRAW_DISABLED) )
+                nDrawStyle |= TEXT_DRAW_DISABLE;
 
             DrawText( aTextRect, aStr, nDrawStyle, pVector, pDisplayText );
         }
@@ -2051,6 +2047,20 @@ void ImplListBoxWindow::SetTopEntry( USHORT nTop )
 
 // -----------------------------------------------------------------------
 
+void ImplListBoxWindow::ShowProminentEntry( USHORT nEntryPos )
+{
+    if( meProminentType == PROMINENT_MIDDLE )
+    {
+        USHORT nPos = nEntryPos;
+        long nWHeight = PixelToLogic( GetSizePixel() ).Height();
+        while( nEntryPos > 0 && mpEntryList->GetAddedHeight( nPos+1, nEntryPos ) < nWHeight/2 )
+            nEntryPos--;
+    }
+    SetTopEntry( nEntryPos );
+}
+
+// -----------------------------------------------------------------------
+
 void ImplListBoxWindow::SetLeftIndent( long n )
 {
     ScrollHorz( n - mnLeft );
@@ -3204,7 +3214,7 @@ void ImplListBoxFloatingWindow::StartFloat( BOOL bStartTracking )
         StartPopupMode( aRect, FLOATWIN_POPUPMODE_DOWN );
 
         if( nPos != LISTBOX_ENTRY_NOTFOUND )
-            mpImplLB->SetTopEntry( nPos );
+            mpImplLB->ShowProminentEntry( nPos );
 
         if( bStartTracking )
             mpImplLB->GetMainWindow()->EnableMouseMoveSelect( TRUE );
diff --git a/vcl/source/control/imgctrl.cxx b/vcl/source/control/imgctrl.cxx
index 73b5154d32ac..075a8b1b95e2 100644
--- a/vcl/source/control/imgctrl.cxx
+++ b/vcl/source/control/imgctrl.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: imgctrl.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/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 3386dddc1599..65fe11929d1e 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.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: longcurr.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/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index ceabbe4ab166..70b67c0a3d57 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.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: lstbox.cxx,v $
- * $Revision: 1.43 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -108,6 +105,7 @@ void ListBox::ImplInitListBoxData()
     mnDDHeight      = 0;
     mbDDAutoSize    = TRUE;
     mnSaveValue     = LISTBOX_ENTRY_NOTFOUND;
+    mnLineCount     = 0;
 }
 
 // -----------------------------------------------------------------------
@@ -1209,6 +1207,13 @@ void ListBox::SetTopEntry( USHORT nPos )
 
 // -----------------------------------------------------------------------
 
+void ListBox::ShowProminentEntry( USHORT nPos )
+{
+    mpImplLB->ShowProminentEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount() );
+}
+
+// -----------------------------------------------------------------------
+
 USHORT ListBox::GetTopEntry() const
 {
     USHORT nPos = GetEntryCount() ? mpImplLB->GetTopEntry() : LISTBOX_ENTRY_NOTFOUND;
@@ -1219,6 +1224,20 @@ USHORT ListBox::GetTopEntry() const
 
 // -----------------------------------------------------------------------
 
+void ListBox::SetProminentEntryType( ProminentEntry eType )
+{
+    mpImplLB->SetProminentEntryType( eType );
+}
+
+// -----------------------------------------------------------------------
+
+ProminentEntry ListBox::GetProminentEntryType() const
+{
+    return mpImplLB->GetProminentEntryType();
+}
+
+// -----------------------------------------------------------------------
+
 BOOL ListBox::IsTravelSelect() const
 {
     return mpImplLB->IsTravelSelect();
@@ -1286,31 +1305,47 @@ Size ListBox::CalcMinimumSize() const
     else
     {
         aSz.Height() = mpImplLB->CalcSize( 1 ).Height();
-        if( aSz.Height() < mnDDHeight )
+        aSz.Height() += 4; // add a space between entry and border
+        // size to maxmimum entry width and add a little breathing space
+        aSz.Width() = mpImplLB->GetMaxEntryWidth() + 4;
+        // do not create ultrathin ListBoxes, it doesn't look good
+        if( aSz.Width() < GetSettings().GetStyleSettings().GetScrollBarSize() )
+            aSz.Width() = GetSettings().GetStyleSettings().GetScrollBarSize();
+
+        // try native borders; scrollbar size may not be a good indicator
+        // see how large the edit area inside is to estimate what is needed for the dropdown
+        ImplControlValue aControlValue;
+        Point aPoint;
+        Region aContent, aBound;
+        Size aTestSize( 100, 20 );
+        Region aArea( Rectangle( aPoint, aTestSize ) );
+        if( const_cast<ListBox*>(this)->GetNativeControlRegion(
+                       CTRL_LISTBOX, PART_SUB_EDIT, aArea, 0, aControlValue, rtl::OUString(), aBound, aContent) )
         {
-            aSz.Height() = mnDDHeight;
-            // FIXME: this is currently only on mac/aqua
-            if( ImplGetSVData()->maNWFData.mbNoFocusRects &&
-                IsNativeWidgetEnabled() &&
-                const_cast<ListBox*>(this)->IsNativeControlSupported( CTRL_LISTBOX, PART_ENTIRE_CONTROL ) )
-            {
-                ImplControlValue aControlValue;
-                Region aCtrlRegion( Rectangle( (const Point&)Point(), Size( 20, mnDDHeight ) ) );
-                Region aBoundingRgn( aCtrlRegion );
-                Region aContentRgn( aCtrlRegion );
-                // adjust the size of the edit field
-                if( const_cast<ListBox*>(this)->GetNativeControlRegion( CTRL_LISTBOX, PART_ENTIRE_CONTROL,
-                                   aCtrlRegion, 0, aControlValue, rtl::OUString(), aBoundingRgn, aContentRgn) )
-                {
-                    aSz.Height() = aContentRgn.GetBoundRect().GetHeight();
-                }
-            }
+            // use the themes drop down size
+            Rectangle aContentRect = aContent.GetBoundRect();
+            aSz.Width() += aTestSize.Width() - aContentRect.GetWidth();
         }
-        aSz.Width() = mpImplLB->GetMaxEntryWidth();
-        aSz.Width() += GetSettings().GetStyleSettings().GetScrollBarSize();
+        else
+            aSz.Width() += GetSettings().GetStyleSettings().GetScrollBarSize();
     }
 
     aSz = CalcWindowSize( aSz );
+
+    if ( IsDropDownBox() ) // check minimum height of dropdown box
+    {
+        ImplControlValue aControlValue;
+        Rectangle aRect( Point( 0, 0 ), aSz );
+        Region aContent, aBound;
+        if( const_cast<ListBox*>(this)->GetNativeControlRegion(
+                       CTRL_LISTBOX, PART_ENTIRE_CONTROL, aRect, 0, aControlValue, rtl::OUString(), aBound, aContent) )
+        {
+            Rectangle aBoundRect( aBound.GetBoundRect() );
+            if( aBoundRect.GetHeight() > aSz.Height() )
+                aSz.Height() = aBoundRect.GetHeight();
+        }
+    }
+
     return aSz;
 }
 
diff --git a/vcl/source/control/makefile.mk b/vcl/source/control/makefile.mk
index d148fcb26328..a2553333246d 100644
--- a/vcl/source/control/makefile.mk
+++ b/vcl/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.12 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 518f13fa3331..94f61818ac92 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.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: menubtn.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/vcl/source/control/morebtn.cxx b/vcl/source/control/morebtn.cxx
index 7ba766292c5f..921a25756d32 100644
--- a/vcl/source/control/morebtn.cxx
+++ b/vcl/source/control/morebtn.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: morebtn.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/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 51451598a942..54a1e0a97eab 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.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: scrbar.cxx,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/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index 2923c382bbdd..5e7e9709607f 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.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: slider.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/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 46c5134326fe..921ba2a24e5a 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.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: spinbtn.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/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 1cdaa39298df..d18a412e31cc 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.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: spinfld.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/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 9a34629ddf8e..5c08cdb8a36b 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.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: tabctrl.cxx,v $
- * $Revision: 1.38 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,25 +27,24 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <tools/debug.hxx>
-
-#ifndef _SV_RC_H
-#include <tools/rc.h>
-#endif
-#include <vcl/svdata.hxx>
-#ifndef _SV_APP_HXX
-#include <vcl/svapp.hxx>
-#endif
-#include <vcl/help.hxx>
-#include <vcl/event.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/button.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/tabctrl.hxx>
-#include <vcl/controldata.hxx>
-#include <vcl/sound.hxx>
-
-#include <vcl/window.h>
+#include "tools/debug.hxx"
+
+#include "tools/rc.h"
+#include "vcl/svdata.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/help.hxx"
+#include "vcl/event.hxx"
+#include "vcl/menu.hxx"
+#include "vcl/button.hxx"
+#include "vcl/tabpage.hxx"
+#include "vcl/tabctrl.hxx"
+#include "vcl/controllayout.hxx"
+#include "vcl/controldata.hxx"
+#include "vcl/sound.hxx"
+#include "vcl/lstbox.hxx"
+#include "vcl/smartid.hxx"
+
+#include "vcl/window.h"
 
 #include <hash_map>
 #include <vector>
@@ -87,6 +83,8 @@ struct ImplTabCtrlData
     std::vector< Rectangle >        maTabRectangles;
     Point                           maItemsOffset;       // offset of the tabitems
     std::vector< ImplTabItem >      maItemList;
+    ListBox*                        mpListBox;
+    Size                            maMinSize;
 };
 
 // -----------------------------------------------------------------------
@@ -153,16 +151,25 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle )
     mbRestoreUnqId              = FALSE;
     mbSingleLine                = FALSE;
     mbScroll                    = FALSE;
-    mbColored                   = FALSE;
+    mbRestoreSmartId            = FALSE;
     mbSmallInvalidate           = FALSE;
     mbExtraSpace                = FALSE;
     mpTabCtrlData               = new ImplTabCtrlData;
     mpTabCtrlData->mpLeftBtn    = NULL;
     mpTabCtrlData->mpRightBtn   = NULL;
+    mpTabCtrlData->mpListBox    = NULL;
 
 
     ImplInitSettings( TRUE, TRUE, TRUE );
 
+    if( (nStyle & WB_DROPDOWN) )
+    {
+        mpTabCtrlData->mpListBox = new ListBox( this, WB_DROPDOWN );
+        mpTabCtrlData->mpListBox->SetPosSizePixel( Point( 0, 0 ), Size( 200, 20 ) );
+        mpTabCtrlData->mpListBox->SetSelectHdl( LINK( this, TabControl, ImplListBoxSelectHdl ) );
+        mpTabCtrlData->mpListBox->Show();
+    }
+
     // if the tabcontrol is drawn (ie filled) by a native widget, make sure all contols will have transparent background
     // otherwise they will paint with a wrong background
     if( IsNativeControlSupported(CTRL_TAB_PANE, PART_ENTIRE_CONTROL) )
@@ -286,6 +293,8 @@ TabControl::~TabControl()
     // TabCtrl-Daten loeschen
     if ( mpTabCtrlData )
     {
+        if( mpTabCtrlData->mpListBox )
+            delete mpTabCtrlData->mpListBox;
         if ( mpTabCtrlData->mpLeftBtn )
             delete mpTabCtrlData->mpLeftBtn;
         if ( mpTabCtrlData->mpRightBtn )
@@ -693,6 +702,8 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId )
             pCtrlParent->SetHelpId( 0 );
         if ( mbRestoreUnqId )
             pCtrlParent->SetUniqueId( 0 );
+        if( mbRestoreSmartId )
+            pCtrlParent->SetSmartHelpId( SmartId() );
         pOldPage->DeactivatePage();
     }
 
@@ -700,8 +711,8 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId )
     {
         pPage->SetPosSizePixel( aRect.TopLeft(), aRect.GetSize() );
 
-        // Hier Page aktivieren, damit die Controls entsprechend umgeschaltet
-        // werden koennen und HilfeId gegebenenfalls beim Parent umsetzen
+        // activate page here so the conbtrols can be switched
+        // also set the help id of the parent window to that of the tab page
         if ( !GetHelpId() )
         {
             mbRestoreHelpId = TRUE;
@@ -712,6 +723,11 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId )
             mbRestoreUnqId = TRUE;
             pCtrlParent->SetUniqueId( pPage->GetUniqueId() );
         }
+        if( ! GetSmartHelpId().HasAny() )
+        {
+            mbRestoreSmartId = TRUE;
+            pCtrlParent->SetSmartHelpId( pPage->GetSmartHelpId() );
+        }
 
         pPage->ActivatePage();
 
@@ -791,7 +807,7 @@ void TabControl::ImplSetFirstPagePos( USHORT )
 
 void TabControl::ImplShowFocus()
 {
-    if ( !GetPageCount() )
+    if ( !GetPageCount() || mpTabCtrlData->mpListBox )
         return;
 
     // make sure the focussed item rect is computed using a bold font
@@ -1062,16 +1078,27 @@ IMPL_LINK( TabControl, ImplScrollBtnHdl, PushButton*, EMPTYARG )
 
 // -----------------------------------------------------------------------
 
+IMPL_LINK( TabControl, ImplListBoxSelectHdl, ListBox*, EMPTYARG )
+{
+    SelectTabPage( GetPageId( mpTabCtrlData->mpListBox->GetSelectEntryPos() ) );
+    return 0;
+}
+
+// -----------------------------------------------------------------------
+
 void TabControl::MouseButtonDown( const MouseEvent& rMEvt )
 {
-    if ( rMEvt.IsLeft() )
+    if( mpTabCtrlData->mpListBox == NULL )
     {
-        USHORT nPageId = GetPageId( rMEvt.GetPosPixel() );
-        ImplTabItem* pItem = ImplGetItem( nPageId );
-        if( pItem && pItem->mbEnabled )
-            SelectTabPage( nPageId );
-        else
-            Sound::Beep( SOUND_ERROR, this );
+        if( rMEvt.IsLeft() )
+        {
+            USHORT nPageId = GetPageId( rMEvt.GetPosPixel() );
+            ImplTabItem* pItem = ImplGetItem( nPageId );
+            if( pItem && pItem->mbEnabled )
+                SelectTabPage( nPageId );
+            else
+                Sound::Beep( SOUND_ERROR, this );
+        }
     }
 }
 
@@ -1079,7 +1106,9 @@ void TabControl::MouseButtonDown( const MouseEvent& rMEvt )
 
 void TabControl::KeyInput( const KeyEvent& rKEvt )
 {
-    if ( GetPageCount() > 1 )
+    if( mpTabCtrlData->mpListBox )
+        mpTabCtrlData->mpListBox->KeyInput( rKEvt );
+    else if ( GetPageCount() > 1 )
     {
         KeyCode aKeyCode = rKEvt.GetKeyCode();
         USHORT  nKeyCode = aKeyCode.GetCode();
@@ -1224,7 +1253,7 @@ void TabControl::ImplPaint( const Rectangle& rRect, bool bLayout )
         }
     }
 
-    if ( !mpTabCtrlData->maItemList.empty() )
+    if ( !mpTabCtrlData->maItemList.empty() && mpTabCtrlData->mpListBox == NULL )
     {
         // Some native toolkits (GTK+) draw tabs right-to-left, with an
         // overlap between adjacent tabs
@@ -1294,6 +1323,18 @@ void TabControl::Resize()
     if ( !IsReallyShown() )
         return;
 
+    if( mpTabCtrlData->mpListBox )
+    {
+        // get the listbox' preferred size
+        Size aTabCtrlSize( GetSizePixel() );
+        long nPrefWidth = mpTabCtrlData->mpListBox->GetOptimalSize( WINDOWSIZE_PREFERRED ).Width();
+        if( nPrefWidth > aTabCtrlSize.Width() )
+            nPrefWidth = aTabCtrlSize.Width();
+        Size aNewSize( nPrefWidth, LogicToPixel( Size( 12, 12 ), MapMode( MAP_APPFONT ) ).Height() );
+        Point aNewPos( (aTabCtrlSize.Width() - nPrefWidth) / 2, 0 );
+        mpTabCtrlData->mpListBox->SetPosSizePixel( aNewPos, aNewSize );
+    }
+
     mbFormat = TRUE;
 
     // Aktuelle TabPage resizen/positionieren
@@ -1343,8 +1384,16 @@ void TabControl::Resize()
 
 void TabControl::GetFocus()
 {
-    ImplShowFocus();
-    SetInputContext( InputContext( GetFont() ) );
+    if( ! mpTabCtrlData->mpListBox )
+    {
+        ImplShowFocus();
+        SetInputContext( InputContext( GetFont() ) );
+    }
+    else
+    {
+        if( mpTabCtrlData->mpListBox->IsReallyVisible() )
+            mpTabCtrlData->mpListBox->GrabFocus();
+    }
     Control::GetFocus();
 }
 
@@ -1352,7 +1401,8 @@ void TabControl::GetFocus()
 
 void TabControl::LoseFocus()
 {
-    HideFocus();
+    if( ! mpTabCtrlData->mpListBox )
+        HideFocus();
     Control::LoseFocus();
 }
 
@@ -1446,7 +1496,7 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt )
 
 void TabControl::Command( const CommandEvent& rCEvt )
 {
-    if ( (rCEvt.GetCommand() == COMMAND_CONTEXTMENU) && (GetPageCount() > 1) )
+    if( (mpTabCtrlData->mpListBox == NULL) && (rCEvt.GetCommand() == COMMAND_CONTEXTMENU) && (GetPageCount() > 1) )
     {
         Point   aMenuPos;
         BOOL    bMenu;
@@ -1490,7 +1540,11 @@ void TabControl::StateChanged( StateChangedType nType )
     Control::StateChanged( nType );
 
     if ( nType == STATE_CHANGE_INITSHOW )
+    {
         ImplPosCurTabPage();
+        if( mpTabCtrlData->mpListBox )
+            Resize();
+    }
     else if ( nType == STATE_CHANGE_UPDATEMODE )
     {
         if ( IsUpdateMode() )
@@ -1601,7 +1655,7 @@ long TabControl::PreNotify( NotifyEvent& rNEvt )
 
 // -----------------------------------------------------------------------
 
-long TabControl::Notify( NotifyEvent& rNEvt )
+bool TabControl::ImplHandleNotifyEvent( NotifyEvent& rNEvt )
 {
     if ( (rNEvt.GetType() == EVENT_KEYINPUT) && (GetPageCount() > 1) )
     {
@@ -1629,8 +1683,16 @@ long TabControl::Notify( NotifyEvent& rNEvt )
             }
         }
     }
+    return false;
+}
 
-    return Control::Notify( rNEvt );
+
+// -----------------------------------------------------------------------
+
+long TabControl::Notify( NotifyEvent& rNEvt )
+{
+
+    return ImplHandleNotifyEvent( rNEvt ) ? TRUE : Control::Notify( rNEvt );
 }
 
 // -----------------------------------------------------------------------
@@ -1708,24 +1770,34 @@ void TabControl::InsertPage( USHORT nPageId, const XubString& rText,
     DBG_ASSERT( GetPagePos( nPageId ) == TAB_PAGE_NOTFOUND,
                 "TabControl::InsertPage(): PageId already exists" );
 
-    // set current page id
-    if ( !mnCurPageId )
-        mnCurPageId = nPageId;
-
     // insert new page item
     ImplTabItem* pItem = NULL;
     if( nPos == TAB_APPEND || size_t(nPos) >= mpTabCtrlData->maItemList.size() )
     {
         mpTabCtrlData->maItemList.push_back( ImplTabItem() );
         pItem = &mpTabCtrlData->maItemList.back();
+        if( mpTabCtrlData->mpListBox )
+            mpTabCtrlData->mpListBox->InsertEntry( rText );
     }
     else
     {
         std::vector< ImplTabItem >::iterator new_it =
             mpTabCtrlData->maItemList.insert( mpTabCtrlData->maItemList.begin() + nPos, ImplTabItem() );
         pItem = &(*new_it);
+        if( mpTabCtrlData->mpListBox )
+            mpTabCtrlData->mpListBox->InsertEntry( rText, nPos);
+    }
+    if( mpTabCtrlData->mpListBox )
+    {
+        if( ! mnCurPageId )
+            mpTabCtrlData->mpListBox->SelectEntryPos( 0 );
+        mpTabCtrlData->mpListBox->SetDropDownLineCount( mpTabCtrlData->mpListBox->GetEntryCount() );
     }
 
+    // set current page id
+    if ( !mnCurPageId )
+        mnCurPageId = nPageId;
+
     // init new page item
     pItem->mnId             = nPageId;
     pItem->mpTabPage        = NULL;
@@ -1739,6 +1811,8 @@ void TabControl::InsertPage( USHORT nPageId, const XubString& rText,
         Invalidate();
 
     ImplFreeLayoutData();
+    if( mpTabCtrlData->mpListBox ) // reposition/resize listbox
+        Resize();
 
     ImplCallEventListeners( VCLEVENT_TABPAGE_INSERTED, (void*) (ULONG)nPageId );
 }
@@ -1756,6 +1830,11 @@ void TabControl::RemovePage( USHORT nPageId )
         std::vector< ImplTabItem >::iterator it = mpTabCtrlData->maItemList.begin() + nPos;
         bool bIsCurrentPage = (it->mnId == mnCurPageId);
         mpTabCtrlData->maItemList.erase( it );
+        if( mpTabCtrlData->mpListBox )
+        {
+            mpTabCtrlData->mpListBox->RemoveEntry( nPos );
+            mpTabCtrlData->mpListBox->SetDropDownLineCount( mpTabCtrlData->mpListBox->GetEntryCount() );
+        }
 
         // If current page is removed, than first page gets the current page
         if ( bIsCurrentPage  )
@@ -1793,6 +1872,8 @@ void TabControl::Clear()
     // clear item list
     mpTabCtrlData->maItemList.clear();
     mnCurPageId = 0;
+    if( mpTabCtrlData->mpListBox )
+        mpTabCtrlData->mpListBox->Clear();
 
     ImplFreeLayoutData();
 
@@ -1813,6 +1894,9 @@ void TabControl::EnablePage( USHORT i_nPageId, bool i_bEnable )
     {
         pItem->mbEnabled = i_bEnable;
         mbFormat = TRUE;
+        if( mpTabCtrlData->mpListBox )
+            mpTabCtrlData->mpListBox->SetEntryFlags( GetPagePos( i_nPageId ),
+                                                     i_bEnable ? 0 : (LISTBOX_ENTRY_FLAG_DISABLE_SELECTION | LISTBOX_ENTRY_FLAG_DRAW_DISABLED) );
         if( pItem->mnId == mnCurPageId )
         {
              // SetCurPageId will change to an enabled page
@@ -1937,6 +2021,8 @@ void TabControl::SelectTabPage( USHORT nPageId )
             nPageId = mnActPageId;
             mnActPageId = 0;
             SetCurPageId( nPageId );
+            if( mpTabCtrlData->mpListBox )
+                mpTabCtrlData->mpListBox->SelectEntryPos( GetPagePos( nPageId ) );
             ImplCallEventListeners( VCLEVENT_TABPAGE_ACTIVATE, (void*) (ULONG) nPageId );
         }
     }
@@ -2001,6 +2087,12 @@ void TabControl::SetPageText( USHORT nPageId, const XubString& rText )
     {
         pItem->maText = rText;
         mbFormat = TRUE;
+        if( mpTabCtrlData->mpListBox )
+        {
+            USHORT nPos = GetPagePos( nPageId );
+            mpTabCtrlData->mpListBox->RemoveEntry( nPos );
+            mpTabCtrlData->mpListBox->InsertEntry( rText, nPos );
+        }
         if ( IsUpdateMode() )
             Invalidate();
         ImplFreeLayoutData();
@@ -2216,3 +2308,25 @@ Point TabControl::GetItemsOffset() const
 }
 
 // -----------------------------------------------------------------------
+
+Size TabControl::GetOptimalSize(WindowSizeType eType) const
+{
+    switch (eType) {
+    case WINDOWSIZE_MINIMUM:
+        return mpTabCtrlData ? mpTabCtrlData->maMinSize : Size();
+    default:
+        return Control::GetOptimalSize( eType );
+    }
+}
+
+// -----------------------------------------------------------------------
+
+void TabControl::SetMinimumSizePixel( const Size& i_rSize )
+{
+    if( mpTabCtrlData )
+        mpTabCtrlData->maMinSize = i_rSize;
+}
+
+// -----------------------------------------------------------------------
+
+
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index dd198ff521db..39964f635c9c 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.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/vcl/source/fontsubset/fontsubset.cxx b/vcl/source/fontsubset/fontsubset.cxx
index 84f548d0a32f..64cf243c6a9d 100644
--- a/vcl/source/fontsubset/fontsubset.cxx
+++ b/vcl/source/fontsubset/fontsubset.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/vcl/source/fontsubset/gsub.cxx b/vcl/source/fontsubset/gsub.cxx
index 600c03194210..37650003eefa 100644
--- a/vcl/source/fontsubset/gsub.cxx
+++ b/vcl/source/fontsubset/gsub.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
  *
@@ -42,6 +42,7 @@ namespace vcl
 {
 
 typedef sal_uInt32 ULONG;
+typedef sal_uInt32 UINT32;
 typedef sal_uInt16 USHORT;
 typedef sal_uInt8 FT_Byte;
 
@@ -280,13 +281,11 @@ int ReadGSUB( struct _TrueTypeFont* pTTFile,
                         return false;
                     for( int i = nCntRange; --i >= 0; )
                     {
-                        const USHORT nGlyph0 = NEXT_UShort( pCoverage );
-                        const USHORT nGlyph1 = NEXT_UShort( pCoverage );
-                        const USHORT nStartCoverageIndex = NEXT_UShort( pCoverage );
-                        OSL_ENSURE( aSubstVector.size() == nStartCoverageIndex, "coverage index mismatch");
-                        (void)nStartCoverageIndex;
-                        for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                            aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                        const UINT32 nGlyph0 = NEXT_UShort( pCoverage );
+                        const UINT32 nGlyph1 = NEXT_UShort( pCoverage );
+                        const USHORT nCovIdx = NEXT_UShort( pCoverage );
+                        for( UINT32 j = nGlyph0; j <= nGlyph1; ++j )
+                            aSubstVector.push_back( GlyphSubst( static_cast<USHORT>(j + nCovIdx), 0 ) );
                     }
                 }
                 break;
diff --git a/vcl/source/fontsubset/gsub.h b/vcl/source/fontsubset/gsub.h
index 58b5b69c3e25..9d552ce45701 100644
--- a/vcl/source/fontsubset/gsub.h
+++ b/vcl/source/fontsubset/gsub.h
@@ -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/vcl/source/fontsubset/list.c b/vcl/source/fontsubset/list.c
index 86864650db85..3b55b4dfee15 100644
--- a/vcl/source/fontsubset/list.c
+++ b/vcl/source/fontsubset/list.c
@@ -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/vcl/source/fontsubset/makefile.mk b/vcl/source/fontsubset/makefile.mk
index 95cc12bccfaa..25dde00af521 100644
--- a/vcl/source/fontsubset/makefile.mk
+++ b/vcl/source/fontsubset/makefile.mk
@@ -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/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 0accc42af968..468d4be36b0a 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.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
  *
@@ -1094,6 +1094,14 @@ static void GetNames(TrueTypeFont *t)
     const sal_uInt8* table = getTable( t, O_name );
     int nTableSize = getTableSize(t, O_name);
 
+    if (nTableSize < 4)
+    {
+#if OSL_DEBUG_LEVEL > 1
+        fprintf(stderr, "O_name table too small\n");
+#endif
+        return;
+    }
+
     sal_uInt16 n = GetUInt16(table, 2, 1);
     int i, r;
     sal_Bool bPSNameOK = sal_True;
@@ -1681,7 +1689,6 @@ int OpenTTFontFile( const char* fname, sal_uInt32 facenum, TrueTypeFont** ttf )
         goto cleanup;
     }
 
-
     if (((*ttf)->ptr = (sal_uInt8 *) mmap(0, (*ttf)->fsize, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
         ret = SF_MEMORY;
         goto cleanup;
@@ -2702,7 +2709,7 @@ void GetTTGlobalFontInfo(TrueTypeFont *ttf, TTGlobalFontInfo *info)
     }
 
     table = getTable(ttf, O_post);
-    if (table) {
+    if (table && getTableSize(ttf, O_post) >= 12+sizeof(sal_uInt32)) {
         info->pitch  = GetUInt32(table, 12, 1);
         info->italicAngle = GetInt32(table, 4, 1);
     }
@@ -2808,6 +2815,15 @@ int GetTTNameRecords(TrueTypeFont *ttf, NameRecord **nr)
 {
     const sal_uInt8* table = getTable(ttf, O_name);
     int nTableSize = getTableSize(ttf, O_name );
+
+    if (nTableSize < 6)
+    {
+#if OSL_DEBUG_LEVEL > 1
+        fprintf(stderr, "O_name table too small\n");
+#endif
+        return 0;
+    }
+
     sal_uInt16 n = GetUInt16(table, 2, 1);
     int nStrBase = GetUInt16(table, 4, 1);
     int i;
diff --git a/vcl/source/fontsubset/ttcr.cxx b/vcl/source/fontsubset/ttcr.cxx
index ebd00c1e7c50..badf9fb496b0 100644
--- a/vcl/source/fontsubset/ttcr.cxx
+++ b/vcl/source/fontsubset/ttcr.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/vcl/source/fontsubset/ttcr.hxx b/vcl/source/fontsubset/ttcr.hxx
index 04c617efc944..69583ecdbdda 100644
--- a/vcl/source/fontsubset/ttcr.hxx
+++ b/vcl/source/fontsubset/ttcr.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/vcl/source/fontsubset/xlat.cxx b/vcl/source/fontsubset/xlat.cxx
index c4699ec5a81a..108c69cee8c7 100644
--- a/vcl/source/fontsubset/xlat.cxx
+++ b/vcl/source/fontsubset/xlat.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/vcl/source/fontsubset/xlat.hxx b/vcl/source/fontsubset/xlat.hxx
index 2e6d1721776b..5960336e13e3 100644
--- a/vcl/source/fontsubset/xlat.hxx
+++ b/vcl/source/fontsubset/xlat.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/vcl/source/gdi/alpha.cxx b/vcl/source/gdi/alpha.cxx
index fabab70e0ae3..9d93a540750a 100644
--- a/vcl/source/gdi/alpha.cxx
+++ b/vcl/source/gdi/alpha.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: alpha.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/vcl/source/gdi/animate.cxx b/vcl/source/gdi/animate.cxx
index 622f84c1d011..b0fb3b3de513 100644
--- a/vcl/source/gdi/animate.cxx
+++ b/vcl/source/gdi/animate.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: animate.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/vcl/source/gdi/base14.cxx b/vcl/source/gdi/base14.cxx
index 56d1c3ff5eba..83820bc654bf 100644
--- a/vcl/source/gdi/base14.cxx
+++ b/vcl/source/gdi/base14.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: base14.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/vcl/source/gdi/bitmap.cxx b/vcl/source/gdi/bitmap.cxx
index 572946f71690..51c76b5a4626 100644
--- a/vcl/source/gdi/bitmap.cxx
+++ b/vcl/source/gdi/bitmap.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: bitmap.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/vcl/source/gdi/bitmap2.cxx b/vcl/source/gdi/bitmap2.cxx
index 39aa9da8c470..de926a0446ca 100644
--- a/vcl/source/gdi/bitmap2.cxx
+++ b/vcl/source/gdi/bitmap2.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: bitmap2.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/vcl/source/gdi/bitmap3.cxx b/vcl/source/gdi/bitmap3.cxx
index 5a65aac25d99..9e2a21b43e37 100644
--- a/vcl/source/gdi/bitmap3.cxx
+++ b/vcl/source/gdi/bitmap3.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: bitmap3.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/vcl/source/gdi/bitmap4.cxx b/vcl/source/gdi/bitmap4.cxx
index 0a9dc3284f50..b64bcd8fe540 100644
--- a/vcl/source/gdi/bitmap4.cxx
+++ b/vcl/source/gdi/bitmap4.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: bitmap4.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/vcl/source/gdi/bitmapex.cxx b/vcl/source/gdi/bitmapex.cxx
index 4e2ed20a7966..a5b274bfd8e8 100644
--- a/vcl/source/gdi/bitmapex.cxx
+++ b/vcl/source/gdi/bitmapex.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: bitmapex.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/vcl/source/gdi/bmpacc.cxx b/vcl/source/gdi/bmpacc.cxx
index 36a4fc5f5f24..c963ea32542e 100644
--- a/vcl/source/gdi/bmpacc.cxx
+++ b/vcl/source/gdi/bmpacc.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: bmpacc.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/vcl/source/gdi/bmpacc2.cxx b/vcl/source/gdi/bmpacc2.cxx
index e4ddb4458a3d..436c165d3bb5 100644
--- a/vcl/source/gdi/bmpacc2.cxx
+++ b/vcl/source/gdi/bmpacc2.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: bmpacc2.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/vcl/source/gdi/bmpacc3.cxx b/vcl/source/gdi/bmpacc3.cxx
index 644bf81cedc5..a89015d12351 100644
--- a/vcl/source/gdi/bmpacc3.cxx
+++ b/vcl/source/gdi/bmpacc3.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: bmpacc3.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/vcl/source/gdi/bmpconv.cxx b/vcl/source/gdi/bmpconv.cxx
index 9d9b81ba50d4..d949f519d197 100644
--- a/vcl/source/gdi/bmpconv.cxx
+++ b/vcl/source/gdi/bmpconv.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: bmpconv.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -192,7 +189,8 @@ BmpTransporter::BmpTransporter( const Bitmap& rBM )
     m_aSize.Height = rBM.GetSizePixel().Height();
     SvMemoryStream aStream;
     rBM.Write( aStream, FALSE, TRUE );
-    m_aBM = Sequence<sal_Int8>((const sal_Int8*)aStream.GetData(), aStream.GetSize() );
+    m_aBM = Sequence<sal_Int8>(static_cast<const sal_Int8*>(aStream.GetData()),
+                aStream.GetEndOfData());
 }
 
 BmpTransporter::~BmpTransporter()
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index 4d509e6cc2fd..e6c94ba0475e 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.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: bmpfast.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/vcl/source/gdi/configsettings.cxx b/vcl/source/gdi/configsettings.cxx
index b601caef301a..b11b9ab822f4 100644
--- a/vcl/source/gdi/configsettings.cxx
+++ b/vcl/source/gdi/configsettings.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/vcl/source/gdi/cvtgrf.cxx b/vcl/source/gdi/cvtgrf.cxx
index e7a895168d6b..8ba963bc4718 100644
--- a/vcl/source/gdi/cvtgrf.cxx
+++ b/vcl/source/gdi/cvtgrf.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: cvtgrf.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/vcl/source/gdi/cvtsvm.cxx b/vcl/source/gdi/cvtsvm.cxx
index 8c4b6f1a2cb2..af98e402f158 100644
--- a/vcl/source/gdi/cvtsvm.cxx
+++ b/vcl/source/gdi/cvtsvm.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: cvtsvm.cxx,v $
- * $Revision: 1.16.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/extoutdevdata.cxx b/vcl/source/gdi/extoutdevdata.cxx
index 938c2b7caf2d..eebd6b35765b 100644
--- a/vcl/source/gdi/extoutdevdata.cxx
+++ b/vcl/source/gdi/extoutdevdata.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: extoutdevdata.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/vcl/source/gdi/font.cxx b/vcl/source/gdi/font.cxx
index afd6181351b4..e26c15309c54 100644
--- a/vcl/source/gdi/font.cxx
+++ b/vcl/source/gdi/font.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: font.cxx,v $
- * $Revision: 1.19.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/gdimtf.cxx b/vcl/source/gdi/gdimtf.cxx
index 6483c8292df7..01b34286a086 100644
--- a/vcl/source/gdi/gdimtf.cxx
+++ b/vcl/source/gdi/gdimtf.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: gdimtf.cxx,v $
- * $Revision: 1.24.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -876,6 +873,40 @@ void GDIMetaFile::Scale( const Fraction& rScaleX, const Fraction& rScaleY )
 
 // ------------------------------------------------------------------------
 
+void GDIMetaFile::Clip( const Rectangle& i_rClipRect )
+{
+    Rectangle aCurRect( i_rClipRect );
+    VirtualDevice   aMapVDev;
+
+    aMapVDev.EnableOutput( FALSE );
+    aMapVDev.SetMapMode( GetPrefMapMode() );
+
+    for( MetaAction* pAct = (MetaAction*) First(); pAct; pAct = (MetaAction*) Next() )
+    {
+        const long  nType = pAct->GetType();
+
+        if( ( META_MAPMODE_ACTION == nType ) ||
+            ( META_PUSH_ACTION == nType ) ||
+            ( META_POP_ACTION == nType ) )
+        {
+            pAct->Execute( &aMapVDev );
+            aCurRect = aMapVDev.LogicToLogic( i_rClipRect, GetPrefMapMode(), aMapVDev.GetMapMode() );
+        }
+        else if( nType == META_CLIPREGION_ACTION )
+        {
+            MetaClipRegionAction* pOldAct = (MetaClipRegionAction*)pAct;
+            Region aNewReg( aCurRect );
+            if( pOldAct->IsClipping() )
+                aNewReg.Intersect( pOldAct->GetRegion() );
+            MetaClipRegionAction* pNewAct = new MetaClipRegionAction( aNewReg, TRUE );
+            Replace( pNewAct, GetCurPos() );
+            pOldAct->Delete();
+        }
+    }
+}
+
+// ------------------------------------------------------------------------
+
 Point GDIMetaFile::ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt,
                                         const Size& rOffset, double fSin, double fCos )
 {
diff --git a/vcl/source/gdi/gfxlink.cxx b/vcl/source/gdi/gfxlink.cxx
index f740e62e4bff..4d32990f9335 100644
--- a/vcl/source/gdi/gfxlink.cxx
+++ b/vcl/source/gdi/gfxlink.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: gfxlink.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/vcl/source/gdi/gradient.cxx b/vcl/source/gdi/gradient.cxx
index 2d2a296bbd77..9856e2213d85 100644
--- a/vcl/source/gdi/gradient.cxx
+++ b/vcl/source/gdi/gradient.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: gradient.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/vcl/source/gdi/graph.cxx b/vcl/source/gdi/graph.cxx
index 76e94e091ff7..790c3d43bb85 100644
--- a/vcl/source/gdi/graph.cxx
+++ b/vcl/source/gdi/graph.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: graph.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/vcl/source/gdi/graphictools.cxx b/vcl/source/gdi/graphictools.cxx
index f584fad40f86..83c0cd628cdb 100644
--- a/vcl/source/gdi/graphictools.cxx
+++ b/vcl/source/gdi/graphictools.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: graphictools.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/vcl/source/gdi/hatch.cxx b/vcl/source/gdi/hatch.cxx
index 7f9c8689a23f..3a8b51bf3022 100644
--- a/vcl/source/gdi/hatch.cxx
+++ b/vcl/source/gdi/hatch.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: hatch.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/vcl/source/gdi/image.cxx b/vcl/source/gdi/image.cxx
index a5a9886bd7a3..e3f63a03d081 100644
--- a/vcl/source/gdi/image.cxx
+++ b/vcl/source/gdi/image.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: image.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/vcl/source/gdi/imagerepository.cxx b/vcl/source/gdi/imagerepository.cxx
index 1bd3395e0826..d97999311751 100644
--- a/vcl/source/gdi/imagerepository.cxx
+++ b/vcl/source/gdi/imagerepository.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: imagerepository.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/vcl/source/gdi/imgcons.cxx b/vcl/source/gdi/imgcons.cxx
index 357cab703213..0826c5f2310b 100644
--- a/vcl/source/gdi/imgcons.cxx
+++ b/vcl/source/gdi/imgcons.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: imgcons.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/vcl/source/gdi/impanmvw.cxx b/vcl/source/gdi/impanmvw.cxx
index 61ce829d6909..7762087dc605 100644
--- a/vcl/source/gdi/impanmvw.cxx
+++ b/vcl/source/gdi/impanmvw.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: impanmvw.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/vcl/source/gdi/impanmvw.hxx b/vcl/source/gdi/impanmvw.hxx
index b1c12b3e5e9d..69403c0f6928 100644
--- a/vcl/source/gdi/impanmvw.hxx
+++ b/vcl/source/gdi/impanmvw.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: impanmvw.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/vcl/source/gdi/impbmp.cxx b/vcl/source/gdi/impbmp.cxx
index c95e0eec7d6b..3e328b7db7a4 100644
--- a/vcl/source/gdi/impbmp.cxx
+++ b/vcl/source/gdi/impbmp.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: impbmp.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/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx
index d73f35bef962..397a5d6b704a 100644
--- a/vcl/source/gdi/impgraph.cxx
+++ b/vcl/source/gdi/impgraph.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: impgraph.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/vcl/source/gdi/impimage.cxx b/vcl/source/gdi/impimage.cxx
index 3954d8255dbc..476ac3ca44a9 100644
--- a/vcl/source/gdi/impimage.cxx
+++ b/vcl/source/gdi/impimage.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: impimage.cxx,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/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx
index 8178204a4ffd..03e4c1dbbb2a 100644
--- a/vcl/source/gdi/impimagetree.cxx
+++ b/vcl/source/gdi/impimagetree.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.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.
+ *
+ ***********************************************************************/
 
 #include "precompiled_vcl.hxx"
 #include "sal/config.h"
diff --git a/vcl/source/gdi/impprn.cxx b/vcl/source/gdi/impprn.cxx
index 539c879c89ea..5224286cdad1 100644
--- a/vcl/source/gdi/impprn.cxx
+++ b/vcl/source/gdi/impprn.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: impprn.cxx,v $
- * $Revision: 1.18.86.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -478,10 +475,12 @@ void ImplQPrinter::EndQueuePrint()
         DBG_ASSERT( mpPrinter, "no SalPrinter in ImplQPrinter" );
         if( mpPrinter )
         {
+            #if 0
             mpPrinter->StartJob( mbPrintFile ? &maPrintFile : NULL,
                                  Application::GetDisplayName(),
                                  maJobSetup.ImplGetConstData(),
                                  this );
+            #endif
             EndJob();
             mpParent->ImplEndPrint();
         }
diff --git a/vcl/source/gdi/impvect.cxx b/vcl/source/gdi/impvect.cxx
index 28e8f742fd6b..0846f5567200 100644
--- a/vcl/source/gdi/impvect.cxx
+++ b/vcl/source/gdi/impvect.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: impvect.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/vcl/source/gdi/impvect.hxx b/vcl/source/gdi/impvect.hxx
index 961704203caf..b21a9df2eb7a 100644
--- a/vcl/source/gdi/impvect.hxx
+++ b/vcl/source/gdi/impvect.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: impvect.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/vcl/source/gdi/jobset.cxx b/vcl/source/gdi/jobset.cxx
index 686d33593466..2bc0addaa93c 100644
--- a/vcl/source/gdi/jobset.cxx
+++ b/vcl/source/gdi/jobset.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: jobset.cxx,v $
- * $Revision: 1.14 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -73,6 +70,7 @@ ImplJobSetup::ImplJobSetup()
     mnRefCount          = 1;
     mnSystem            = 0;
     meOrientation       = ORIENTATION_PORTRAIT;
+    meDuplexMode        = DUPLEX_UNKNOWN;
     mnPaperBin          = 0;
     mePaperFormat       = PAPER_USER;
     mnPaperWidth        = 0;
@@ -90,6 +88,7 @@ ImplJobSetup::ImplJobSetup( const ImplJobSetup& rJobSetup ) :
     mnRefCount          = 1;
     mnSystem            = rJobSetup.mnSystem;
     meOrientation       = rJobSetup.meOrientation;
+    meDuplexMode        = rJobSetup.meDuplexMode;
     mnPaperBin          = rJobSetup.mnPaperBin;
     mePaperFormat       = rJobSetup.mePaperFormat;
     mnPaperWidth        = rJobSetup.mnPaperWidth;
@@ -277,6 +276,7 @@ BOOL JobSetup::operator==( const JobSetup& rJobSetup ) const
          (pData1->maPrinterName     == pData2->maPrinterName)           &&
          (pData1->maDriver          == pData2->maDriver)                &&
          (pData1->meOrientation     == pData2->meOrientation)           &&
+         (pData1->meDuplexMode      == pData2->meDuplexMode)            &&
          (pData1->mnPaperBin        == pData2->mnPaperBin)              &&
          (pData1->mePaperFormat     == pData2->mePaperFormat)           &&
          (pData1->mnPaperWidth      == pData2->mnPaperWidth)            &&
@@ -337,6 +337,7 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
                 pJobData->mnSystem                  = SVBT16ToShort( pOldJobData->nSystem );
                 pJobData->mnDriverDataLen           = SVBT32ToUInt32( pOldJobData->nDriverDataLen );
                 pJobData->meOrientation             = (Orientation)SVBT16ToShort( pOldJobData->nOrientation );
+                pJobData->meDuplexMode              = DUPLEX_UNKNOWN;
                 pJobData->mnPaperBin                = SVBT16ToShort( pOldJobData->nPaperBin );
                 pJobData->mePaperFormat             = (Paper)SVBT16ToShort( pOldJobData->nPaperFormat );
                 pJobData->mnPaperWidth              = (long)SVBT32ToUInt32( pOldJobData->nPaperWidth );
@@ -355,7 +356,19 @@ SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup )
                         String aKey, aValue;
                         rIStream.ReadByteString( aKey, RTL_TEXTENCODING_UTF8 );
                         rIStream.ReadByteString( aValue, RTL_TEXTENCODING_UTF8 );
-                        pJobData->maValueMap[ aKey ] = aValue;
+                        if( aKey.EqualsAscii( "COMPAT_DUPLEX_MODE" ) )
+                        {
+                            if( aValue.EqualsAscii( "DUPLEX_UNKNOWN" ) )
+                                pJobData->meDuplexMode = DUPLEX_UNKNOWN;
+                            else if( aValue.EqualsAscii( "DUPLEX_OFF" ) )
+                                pJobData->meDuplexMode = DUPLEX_OFF;
+                            else if( aValue.EqualsAscii( "DUPLEX_SHORTEDGE" ) )
+                                pJobData->meDuplexMode = DUPLEX_SHORTEDGE;
+                            else if( aValue.EqualsAscii( "DUPLEX_LONGEDGE" ) )
+                                pJobData->meDuplexMode = DUPLEX_LONGEDGE;
+                        }
+                        else
+                            pJobData->maValueMap[ aKey ] = aValue;
                     }
                     DBG_ASSERT( rIStream.Tell() == nFirstPos+nLen, "corrupted job setup" );
                     // ensure correct stream position
@@ -421,6 +434,14 @@ SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup )
                 rOStream.WriteByteString( it->first, RTL_TEXTENCODING_UTF8 );
                 rOStream.WriteByteString( it->second, RTL_TEXTENCODING_UTF8 );
             }
+            rOStream.WriteByteString( "COMPAT_DUPLEX_MODE" ) ;
+            switch( pJobData->meDuplexMode )
+            {
+            case DUPLEX_UNKNOWN: rOStream.WriteByteString( "DUPLEX_UNKNOWN" );break;
+            case DUPLEX_OFF: rOStream.WriteByteString( "DUPLEX_OFF" );break;
+            case DUPLEX_SHORTEDGE: rOStream.WriteByteString( "DUPLEX_SHORTEDGE" );break;
+            case DUPLEX_LONGEDGE: rOStream.WriteByteString( "DUPLEX_LONGEDGE" );break;
+            }
             nLen = sal::static_int_cast<USHORT>(rOStream.Tell() - nPos);
             rOStream.Seek( nPos );
             rOStream << nLen;
diff --git a/vcl/source/gdi/lineinfo.cxx b/vcl/source/gdi/lineinfo.cxx
index 7aa50811106b..bb57a0b582e6 100644
--- a/vcl/source/gdi/lineinfo.cxx
+++ b/vcl/source/gdi/lineinfo.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: lineinfo.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/vcl/source/gdi/makefile.mk b/vcl/source/gdi/makefile.mk
index eda537bf629a..75f2b3fffc64 100755..100644
--- a/vcl/source/gdi/makefile.mk
+++ b/vcl/source/gdi/makefile.mk
@@ -1,15 +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: makefile.mk,v $
-#
-# $Revision: 1.33.132.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -57,6 +53,8 @@ EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
                     $(SLO)$/gfxlink.obj		\
                     $(SLO)$/print.obj		\
                     $(SLO)$/print2.obj		\
+                    $(SLO)$/print3.obj		\
+                    $(SLO)$/oldprintadaptor.obj		\
                     $(SLO)$/configsettings.obj 	\
                     $(SLO)$/sallayout.obj		\
                     $(SLO)$/image.obj		\
@@ -72,7 +70,6 @@ EXCEPTIONSFILES=	$(SLO)$/salmisc.obj 	\
                     $(SLO)$/pngread.obj		\
                     $(SLO)$/pngwrite.obj    \
                     $(SLO)$/virdev.obj \
-                    $(SLO)$/impprn.obj \
                     $(SLO)$/gdimtf.obj		\
                     $(SLO)$/graphictools.obj \
                     $(SLO)$/textlayout.obj   \
@@ -118,6 +115,7 @@ SLOFILES=	$(EXCEPTIONSFILES)      \
             $(SLO)$/extoutdevdata.obj	\
             $(SLO)$/salnativewidgets-none.obj
 
+
 # --- Targets ------------------------------------------------------
 
 .INCLUDE :	target.mk
diff --git a/vcl/source/gdi/mapmod.cxx b/vcl/source/gdi/mapmod.cxx
index d235e0efa1cf..34f0f473c7f8 100644
--- a/vcl/source/gdi/mapmod.cxx
+++ b/vcl/source/gdi/mapmod.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: mapmod.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/vcl/source/gdi/metaact.cxx b/vcl/source/gdi/metaact.cxx
index 1f27ad2afe7d..752a4222bcb2 100644
--- a/vcl/source/gdi/metaact.cxx
+++ b/vcl/source/gdi/metaact.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: metaact.cxx,v $
- * $Revision: 1.21.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/metric.cxx b/vcl/source/gdi/metric.cxx
index c387bd158306..e5f54df41c9e 100644
--- a/vcl/source/gdi/metric.cxx
+++ b/vcl/source/gdi/metric.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/vcl/source/gdi/octree.cxx b/vcl/source/gdi/octree.cxx
index 5abd8f69f704..0660728fc8a5 100644
--- a/vcl/source/gdi/octree.cxx
+++ b/vcl/source/gdi/octree.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: octree.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/vcl/source/gdi/oldprintadaptor.cxx b/vcl/source/gdi/oldprintadaptor.cxx
new file mode 100644
index 000000000000..ce3ece7e1e5b
--- /dev/null
+++ b/vcl/source/gdi/oldprintadaptor.cxx
@@ -0,0 +1,117 @@
+/*************************************************************************
+ *
+ * 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_vcl.hxx"
+
+#include "vcl/oldprintadaptor.hxx"
+#include "vcl/gdimtf.hxx"
+
+#include "com/sun/star/awt/Size.hpp"
+
+#include <vector>
+
+namespace vcl
+{
+    struct AdaptorPage
+    {
+        GDIMetaFile                     maPage;
+        com::sun::star::awt::Size       maPageSize;
+    };
+
+    struct ImplOldStyleAdaptorData
+    {
+        std::vector< AdaptorPage >  maPages;
+    };
+}
+
+using namespace vcl;
+using namespace cppu;
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::beans;
+
+OldStylePrintAdaptor::OldStylePrintAdaptor( const boost::shared_ptr< Printer >& i_pPrinter )
+    : PrinterController( i_pPrinter )
+    , mpData( new ImplOldStyleAdaptorData() )
+{
+}
+
+OldStylePrintAdaptor::~OldStylePrintAdaptor()
+{
+}
+
+void OldStylePrintAdaptor::StartPage()
+{
+    Size aPaperSize( getPrinter()->PixelToLogic( getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
+    mpData->maPages.push_back( AdaptorPage() );
+    mpData->maPages.back().maPageSize.Width = aPaperSize.getWidth();
+    mpData->maPages.back().maPageSize.Height = aPaperSize.getHeight();
+    getPrinter()->SetConnectMetaFile( &mpData->maPages.back().maPage );
+
+    // copy state into metafile
+    boost::shared_ptr<Printer> pPrinter( getPrinter() );
+    pPrinter->SetMapMode( pPrinter->GetMapMode() );
+    pPrinter->SetFont( pPrinter->GetFont() );
+    pPrinter->SetDrawMode( pPrinter->GetDrawMode() );
+    pPrinter->SetLineColor( pPrinter->GetLineColor() );
+    pPrinter->SetFillColor( pPrinter->GetFillColor() );
+}
+
+void OldStylePrintAdaptor::EndPage()
+{
+    getPrinter()->SetConnectMetaFile( NULL );
+    mpData->maPages.back().maPage.WindStart();
+}
+
+int  OldStylePrintAdaptor::getPageCount() const
+{
+    return int(mpData->maPages.size());
+}
+
+Sequence< PropertyValue > OldStylePrintAdaptor::getPageParameters( int i_nPage ) const
+{
+    Sequence< PropertyValue > aRet( 1 );
+    aRet[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("PageSize") );
+    if( i_nPage < int(mpData->maPages.size() ) )
+        aRet[0].Value = makeAny( mpData->maPages[i_nPage].maPageSize );
+    else
+    {
+        awt::Size aEmpty( 0, 0  );
+        aRet[0].Value = makeAny( aEmpty );
+    }
+    return aRet;
+}
+
+void OldStylePrintAdaptor::printPage( int i_nPage ) const
+{
+    if( i_nPage < int(mpData->maPages.size()) )
+   {
+       mpData->maPages[ i_nPage ].maPage.WindStart();
+       mpData->maPages[ i_nPage ].maPage.Play( getPrinter().get() );
+   }
+}
+
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index 91ea8419cba9..62be0130e068 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.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: outdev.cxx,v $
- * $Revision: 1.59.74.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index b54862eda53e..3826a3dbc7b0 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.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: outdev2.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/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 51aad0790a26..895a98dfaf1a 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.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
  *
@@ -5601,6 +5601,8 @@ void OutputDevice::DrawTextArray( const Point& rStartPt, const String& rStr,
 
     if ( !IsDeviceOutputNecessary() )
         return;
+    if( !mpGraphics && !ImplGetGraphics() )
+        return;
     if( mbInitClipRegion )
         ImplInitClipRegion();
     if( mbOutputClipped )
diff --git a/vcl/source/gdi/outdev4.cxx b/vcl/source/gdi/outdev4.cxx
index 5c7c98cd5797..8ad02ed2d818 100644
--- a/vcl/source/gdi/outdev4.cxx
+++ b/vcl/source/gdi/outdev4.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: outdev4.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/vcl/source/gdi/outdev5.cxx b/vcl/source/gdi/outdev5.cxx
index 46a881ae1b92..d42723215c55 100644
--- a/vcl/source/gdi/outdev5.cxx
+++ b/vcl/source/gdi/outdev5.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: outdev5.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/vcl/source/gdi/outdev6.cxx b/vcl/source/gdi/outdev6.cxx
index 2d436ea43659..bef37284adbd 100644
--- a/vcl/source/gdi/outdev6.cxx
+++ b/vcl/source/gdi/outdev6.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: outdev6.cxx,v $
- * $Revision: 1.33.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -269,6 +266,9 @@ void OutputDevice::DrawTransparent( const PolyPolygon& rPolyPoly,
     // try hard to draw it directly, because the emulation layers are slower
     if( !pDisableNative
         && mpGraphics->supportsOperation( OutDevSupport_B2DDraw )
+#if defined UNX && ! defined QUARTZ
+            && GetBitCount() > 8
+#endif
 #ifdef WIN32
         // workaround bad dithering on remote displaying when using GDI+ with toolbar buttoin hilighting
         && !rPolyPoly.IsRect()
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index dfa346dbab05..568e8d836045 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.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: outmap.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx
index 9c8c1ec1bf5e..fefe904e371a 100644
--- a/vcl/source/gdi/pdfextoutdevdata.cxx
+++ b/vcl/source/gdi/pdfextoutdevdata.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: pdfextoutdevdata.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/vcl/source/gdi/pdffontcache.cxx b/vcl/source/gdi/pdffontcache.cxx
index 4ab60833b7b4..507ede81ef24 100644
--- a/vcl/source/gdi/pdffontcache.cxx
+++ b/vcl/source/gdi/pdffontcache.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: pdffontcache.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/vcl/source/gdi/pdffontcache.hxx b/vcl/source/gdi/pdffontcache.hxx
index bae73adb2048..06ffff86b070 100644
--- a/vcl/source/gdi/pdffontcache.hxx
+++ b/vcl/source/gdi/pdffontcache.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: pdffontcache.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/vcl/source/gdi/pdfwriter.cxx b/vcl/source/gdi/pdfwriter.cxx
index 4959a505ec41..040d38f538c9 100644
--- a/vcl/source/gdi/pdfwriter.cxx
+++ b/vcl/source/gdi/pdfwriter.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: pdfwriter.cxx,v $
- * $Revision: 1.24.134.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx
index c0205f1f325d..4371feb8ee37 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.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
  *
@@ -2814,37 +2814,6 @@ sal_Int32 PDFWriterImpl::emitBuiltinFont( const ImplFontData* pFont, sal_Int32 n
     return nFontObject;
 }
 
-typedef int ThreeInts[3];
-static bool getPfbSegmentLengths( const unsigned char* pFontBytes, int nByteLen,
-    ThreeInts& rSegmentLengths )
-{
-    if( !pFontBytes || (nByteLen < 0) )
-        return false;
-    const unsigned char* pPtr = pFontBytes;
-    const unsigned char* pEnd = pFontBytes + nByteLen;
-
-    for( int i = 0; i < 3; ++i) {
-        // read segment1 header
-        if( pPtr+6 >= pEnd )
-            return false;
-        if( (pPtr[0] != 0x80) || (pPtr[1] >= 0x03) )
-            return false;
-        const int nLen = (pPtr[5]<<24) + (pPtr[4]<<16) + (pPtr[3]<<8) + pPtr[2];
-        if( nLen <= 0)
-            return false;
-        rSegmentLengths[i] = nLen;
-        pPtr += nLen + 6;
-    }
-
-    // read segment-end header
-    if( pPtr+2 >= pEnd )
-        return false;
-    if( (pPtr[0] != 0x80) || (pPtr[1] != 0x03) )
-        return false;
-
-    return true;
-}
-
 std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const ImplFontData* pFont, EmbedFont& rEmbed )
 {
     std::map< sal_Int32, sal_Int32 > aRet;
@@ -2960,6 +2929,41 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitSystemFont( const ImplFontDa
     return aRet;
 }
 
+typedef int ThreeInts[3];
+static bool getPfbSegmentLengths( const unsigned char* pFontBytes, int nByteLen,
+    ThreeInts& rSegmentLengths )
+{
+    if( !pFontBytes || (nByteLen < 0) )
+        return false;
+    const unsigned char* pPtr = pFontBytes;
+    const unsigned char* pEnd = pFontBytes + nByteLen;
+
+    for( int i = 0; i < 3; ++i) {
+        // read segment1 header
+        if( pPtr+6 >= pEnd )
+            return false;
+        if( (pPtr[0] != 0x80) || (pPtr[1] >= 0x03) )
+            return false;
+        const int nLen = (pPtr[5]<<24) + (pPtr[4]<<16) + (pPtr[3]<<8) + pPtr[2];
+        if( nLen <= 0)
+            return false;
+        rSegmentLengths[i] = nLen;
+        pPtr += nLen + 6;
+    }
+
+    // read segment-end header
+    if( pPtr+2 >= pEnd )
+        return false;
+    if( (pPtr[0] != 0x80) || (pPtr[1] != 0x03) )
+        return false;
+
+    return true;
+}
+
+struct FontException : public std::exception
+{
+};
+
 // TODO: always subset instead of embedding the full font => this method becomes obsolete then
 std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFontData* pFont, EmbedFont& rEmbed )
 {
@@ -2979,10 +2983,16 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
     sal_Int32 nToUnicodeStream = 0;
     sal_uInt8 nEncoding[256];
     sal_Ucs nEncodedCodes[256];
+    std::vector<sal_Ucs> aUnicodes;
+    aUnicodes.reserve( 256 );
+    sal_Int32 pUnicodesPerGlyph[256];
+    sal_Int32 pEncToUnicodeIndex[256];
     if( pEncoding )
     {
-        memset( nEncodedCodes, 0, sizeof(nEncodedCodes) );
-        memset( nEncoding, 0, sizeof(nEncoding) );
+        rtl_zeroMemory( nEncoding, sizeof(nEncoding) );
+        rtl_zeroMemory( nEncodedCodes, sizeof(nEncodedCodes) );
+        rtl_zeroMemory( pUnicodesPerGlyph, sizeof(pUnicodesPerGlyph) );
+        rtl_zeroMemory( pEncToUnicodeIndex, sizeof(pEncToUnicodeIndex) );
         for( Ucs2SIntMap::const_iterator it = pEncoding->begin(); it != pEncoding->end(); ++it )
         {
             if( it->second != -1 )
@@ -2990,6 +3000,9 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
                 sal_Int32 nCode = (sal_Int32)(it->second & 0x000000ff);
                 nEncoding[ nCode ] = static_cast<sal_uInt8>( nCode );
                 nEncodedCodes[ nCode ] = it->first;
+                pEncToUnicodeIndex[ nCode ] = static_cast<sal_Int32>(aUnicodes.size());
+                aUnicodes.push_back( it->first );
+                pUnicodesPerGlyph[ nCode ] = 1;
             }
         }
     }
@@ -2999,553 +3012,525 @@ std::map< sal_Int32, sal_Int32 > PDFWriterImpl::emitEmbeddedFont( const ImplFont
     const unsigned char* pFontData = NULL;
     long nFontLen = 0;
     sal_Int32 nLength1, nLength2;
-    if( (pFontData = (const unsigned char*)m_pReferenceDevice->mpGraphics->GetEmbedFontData( pFont, nEncodedCodes, pWidths, aInfo, &nFontLen )) != NULL )
-    {
-        if( (aInfo.m_nFontType & FontSubsetInfo::ANY_TYPE1) == 0 )
-            goto streamend;
-        // see whether it is pfb or pfa; if it is a pfb, fill ranges
-        // of 6 bytes that are not part of the font program
-        std::list< int > aSections;
-        std::list< int >::const_iterator it;
-        int nIndex = 0;
-        while( pFontData[nIndex] == 0x80 && nIndex < nFontLen-1 )
-        {
-            aSections.push_back( nIndex );
-            if( pFontData[nIndex+1] == 0x03 )
-                break;
-            sal_Int32 nBytes =
+    try
+    {
+        if( (pFontData = (const unsigned char*)m_pReferenceDevice->mpGraphics->GetEmbedFontData( pFont, nEncodedCodes, pWidths, aInfo, &nFontLen )) != NULL )
+        {
+            if( (aInfo.m_nFontType & FontSubsetInfo::ANY_TYPE1) == 0 )
+                throw FontException();
+            // see whether it is pfb or pfa; if it is a pfb, fill ranges
+            // of 6 bytes that are not part of the font program
+            std::list< int > aSections;
+            std::list< int >::const_iterator it;
+            int nIndex = 0;
+            while( pFontData[nIndex] == 0x80 && nIndex < nFontLen-1 )
+            {
+                aSections.push_back( nIndex );
+                if( pFontData[nIndex+1] == 0x03 )
+                    break;
+                sal_Int32 nBytes =
                 ((sal_Int32)pFontData[nIndex+2])            |
                 ((sal_Int32)pFontData[nIndex+3]) << 8       |
                 ((sal_Int32)pFontData[nIndex+4]) << 16      |
                 ((sal_Int32)pFontData[nIndex+5]) << 24;
-            nIndex += nBytes+6;
-        }
-
-        // search for eexec
-        // TODO: use getPfbSegmentLengths() if possible to skip the search thingies below
-        nIndex = 0;
-        int nEndAsciiIndex;
-        int nBeginBinaryIndex;
-        int nEndBinaryIndex;
-        do
-        {
-            while( nIndex < nFontLen-4 &&
-                   ( pFontData[nIndex] != 'e'   ||
-                     pFontData[nIndex+1] != 'e' ||
-                     pFontData[nIndex+2] != 'x' ||
-                     pFontData[nIndex+3] != 'e' ||
-                     pFontData[nIndex+4] != 'c'
-                     )
-                   )
-                nIndex++;
-            // check whether we are in a excluded section
-            for( it = aSections.begin(); it != aSections.end() && (nIndex < *it || nIndex > ((*it) + 5) ); ++it )
-                ;
-        } while( it != aSections.end() && nIndex < nFontLen-4 );
-        // this should end the ascii part
-        if( nIndex > nFontLen-5 )
-            goto streamend;
-
-        nEndAsciiIndex = nIndex+4;
-        // now count backwards until we can account for 512 '0'
-        // which is the endmarker of the (hopefully) binary data
-        // do not count the pfb header sections
-        int nFound = 0;
-        nIndex =  nFontLen-1;
-        while( nIndex > 0 && nFound < 512 )
-        {
-            for( it = aSections.begin(); it != aSections.end() && (nIndex < *it || nIndex > ((*it) + 5) ); ++it )
-                ;
-            if( it == aSections.end() )
-            {
-                // inside the 512 '0' block there may only be whitespace
-                // according to T1 spec; probably it would be to simple
-                // if all fonts complied
-                if( pFontData[nIndex] == '0' )
-                    nFound++;
-                else if( nFound > 0                 &&
-                         pFontData[nIndex] != '\r'      &&
-                         pFontData[nIndex] != '\t'      &&
-                         pFontData[nIndex] != '\n'      &&
-                         pFontData[nIndex] != ' ' )
-                    break;
+                nIndex += nBytes+6;
             }
-            nIndex--;
-        }
-
-        if( nIndex < 1 || nIndex <= nEndAsciiIndex )
-            goto streamend;
-        // there may be whitespace to ignore before the 512 '0'
-        while( pFontData[nIndex] == '\r' || pFontData[nIndex] == '\n' )
-        {
-            nIndex--;
-            for( it = aSections.begin(); it != aSections.end() && (nIndex < *it || nIndex > ((*it) + 5) ); ++it )
-                ;
-            if( it != aSections.end() )
-            {
-                nIndex = (*it)-1;
-                break; // this is surely a binary boundary, in ascii case it wouldn't matter
-            }
-        }
-        nEndBinaryIndex = nIndex;
 
-        // and count forward again to the point where we have nFound '0'
-        // to get the corect value for nLength3
-        sal_Int32 nLength3 = 0;
-        sal_Int32 nL3Index = nIndex;
-        while( nFound && nL3Index < nFontLen )
-        {
-            for( it = aSections.begin(); it != aSections.end() && (nL3Index < *it || nL3Index > ((*it) + 5) ); ++it )
-                ;
-            if( it == aSections.end() )
+            // search for eexec
+            // TODO: use getPfbSegmentLengths() if possible to skip the search thingies below
+            nIndex = 0;
+            int nEndAsciiIndex;
+            int nBeginBinaryIndex;
+            int nEndBinaryIndex;
+            do
             {
-                // inside the 512 '0' block there may only be whitespace
-                // according to T1 spec; probably it would be to simple
-                // if all fonts complied
-                if( pFontData[nL3Index] == '0' )
-                    nFound--;
-                nLength3++;
-            }
-            nL3Index++;
-        }
-
-        // search for beginning of binary section
-        nBeginBinaryIndex = nEndAsciiIndex;
-        do
-        {
-            nBeginBinaryIndex++;
-            for( it = aSections.begin(); it != aSections.end() && (nBeginBinaryIndex < *it || nBeginBinaryIndex > ((*it) + 5) ); ++it )
-                ;
-        } while( nBeginBinaryIndex < nEndBinaryIndex &&
-                 ( pFontData[nBeginBinaryIndex] == '\r' ||
-                   pFontData[nBeginBinaryIndex] == '\n' ||
-                   it != aSections.end() ) );
-
-        // it seems to be vital to copy the exact whitespace between binary data
-        // and eexec, else a invalid font results. so make nEndAsciiIndex
-        // always immediate in front of nBeginBinaryIndex
-        nEndAsciiIndex = nBeginBinaryIndex-1;
-        for( it = aSections.begin(); it != aSections.end() && (nEndAsciiIndex < *it || nEndAsciiIndex > ((*it)+5)); ++it )
-            ;
-        if( it != aSections.end() )
-            nEndAsciiIndex = (*it)-1;
-
-        nLength1 = nEndAsciiIndex+1; // including the last character
-        for( it = aSections.begin(); it != aSections.end() && *it < nEndAsciiIndex; ++it )
-            nLength1 -= 6; // decrease by pfb section size
-
-        // if the first four bytes are all ascii hex characters, then binary data
-        // has to be converted to real binary data
-        for( nIndex = 0; nIndex < 4 &&
-                 ( ( pFontData[ nBeginBinaryIndex+nIndex ] >= '0' && pFontData[ nBeginBinaryIndex+nIndex ] <= '9' ) ||
-                   ( pFontData[ nBeginBinaryIndex+nIndex ] >= 'a' && pFontData[ nBeginBinaryIndex+nIndex ] <= 'f' ) ||
-                   ( pFontData[ nBeginBinaryIndex+nIndex ] >= 'A' && pFontData[ nBeginBinaryIndex+nIndex ] <= 'F' )
-                   ); ++nIndex )
-            ;
-        bool bConvertHexData = true;
-        if( nIndex < 4 )
-        {
-            bConvertHexData = false;
-            nLength2 = nEndBinaryIndex - nBeginBinaryIndex + 1; // include the last byte
-            for( it = aSections.begin(); it != aSections.end(); ++it )
-                if( *it > nBeginBinaryIndex && *it < nEndBinaryIndex )
-                    nLength2 -= 6;
-        }
-        else
-        {
-            // count the hex ascii characters to get nLength2
-            nLength2 = 0;
-            int nNextSectionIndex = 0;
-            for( it = aSections.begin(); it != aSections.end() && *it < nBeginBinaryIndex; ++it )
-                ;
-            if( it != aSections.end() )
-                nNextSectionIndex = *it;
-            for( nIndex = nBeginBinaryIndex; nIndex <= nEndBinaryIndex; nIndex++ )
+                while( nIndex < nFontLen-4 &&
+                    ( pFontData[nIndex] != 'e'  ||
+                        pFontData[nIndex+1] != 'e' ||
+                        pFontData[nIndex+2] != 'x' ||
+                        pFontData[nIndex+3] != 'e' ||
+                        pFontData[nIndex+4] != 'c'
+                        )
+                    )
+                nIndex++;
+                // check whether we are in a excluded section
+                for( it = aSections.begin(); it != aSections.end() && (nIndex < *it || nIndex > ((*it) + 5) ); ++it )
+                    ;
+            } while( it != aSections.end() && nIndex < nFontLen-4 );
+            // this should end the ascii part
+            if( nIndex > nFontLen-5 )
+                throw FontException();
+
+            nEndAsciiIndex = nIndex+4;
+            // now count backwards until we can account for 512 '0'
+            // which is the endmarker of the (hopefully) binary data
+            // do not count the pfb header sections
+            int nFound = 0;
+            nIndex =  nFontLen-1;
+            while( nIndex > 0 && nFound < 512 )
             {
-                if( nIndex == nNextSectionIndex )
+                for( it = aSections.begin(); it != aSections.end() && (nIndex < *it || nIndex > ((*it) + 5) ); ++it )
+                    ;
+                if( it == aSections.end() )
                 {
-                    nIndex += 6;
-                    ++it;
-                    nNextSectionIndex = (it == aSections.end() ? 0 : *it );
+                    // inside the 512 '0' block there may only be whitespace
+                    // according to T1 spec; probably it would be to simple
+                    // if all fonts complied
+                    if( pFontData[nIndex] == '0' )
+                        nFound++;
+                        else if( nFound > 0                 &&
+                            pFontData[nIndex] != '\r'       &&
+                        pFontData[nIndex] != '\t'       &&
+                        pFontData[nIndex] != '\n'       &&
+                        pFontData[nIndex] != ' ' )
+                        break;
                 }
-                if( ( pFontData[ nIndex ] >= '0' && pFontData[ nIndex ] <= '9' ) ||
-                    ( pFontData[ nIndex ] >= 'a' && pFontData[ nIndex ] <= 'f' ) ||
-                    ( pFontData[ nIndex ] >= 'A' && pFontData[ nIndex ] <= 'F' ) )
-                    nLength2++;
+                nIndex--;
             }
-            DBG_ASSERT( !(nLength2 & 1), "uneven number of hex chars in binary pfa section" );
-            nLength2 /= 2;
-        }
-
-        // now we can actually write the font stream !
-#if OSL_DEBUG_LEVEL > 1
-        {
-            OStringBuffer aLine( " PDFWriterImpl::emitEmbeddedFont" );
-            emitComment( aLine.getStr() );
-        }
-#endif
-        OStringBuffer aLine( 512 );
-        nStreamObject = createObject();
-        if( !updateObject(nStreamObject))
-            goto streamend;
-        sal_Int32 nStreamLengthObject = createObject();
-        aLine.append( nStreamObject );
-        aLine.append( " 0 obj\n"
-                      "<</Length " );
-        aLine.append( nStreamLengthObject );
-        aLine.append( " 0 R"
-#ifndef DEBUG_DISABLE_PDFCOMPRESSION
-                      "/Filter/FlateDecode"
-#endif
-                      "/Length1 " );
-        aLine.append( nLength1 );
-        aLine.append( " /Length2 " );
-        aLine.append( nLength2 );
-        aLine.append( " /Length3 ");
-        aLine.append( nLength3 );
-        aLine.append( ">>\n"
-                      "stream\n" );
-        if( !writeBuffer( aLine.getStr(), aLine.getLength() ) )
-            goto streamend;
 
-        sal_uInt64 nBeginStreamPos = 0;
-        osl_getFilePos( m_aFile, &nBeginStreamPos );
+            if( nIndex < 1 || nIndex <= nEndAsciiIndex )
+                throw FontException();
 
-        beginCompression();
-        checkAndEnableStreamEncryption( nStreamObject );
-
-        // write ascii section
-        if( aSections.begin() == aSections.end() )
-        {
-            if( ! writeBuffer( pFontData, nEndAsciiIndex+1 ) )
-            {
-                endCompression();
-                disableStreamEncryption();
-                goto streamend;
-            }
-        }
-        else
-        {
-            // first section always starts at 0
-            it = aSections.begin();
-            nIndex = (*it)+6;
-            ++it;
-            while( *it < nEndAsciiIndex )
+            // nLength3 is the rest of the file - excluding any section headers
+            // nIndex now points to the first of the 512 '0' characters marking the
+            // fixed content portion
+            sal_Int32 nLength3 = nFontLen - nIndex;
+            for( it = aSections.begin(); it != aSections.end(); ++it )
             {
-                if( ! writeBuffer( pFontData+nIndex, (*it)-nIndex ) )
+                if( *it >= nIndex  )
                 {
-                endCompression();
-                    disableStreamEncryption();
-                    goto streamend;
+                // special case: nIndex inside a section marker
+                    if( nIndex >= (*it) && (*it)+5 > nIndex )
+                        nLength3 -= (*it)+5 - nIndex;
+                    else
+                    {
+                        if( *it < nFontLen - 6 )
+                            nLength3 -= 6;
+                        else // the last section 0x8003 is only 2 bytes after all
+                            nLength3 -= (nFontLen - *it);
+                    }
                 }
-                nIndex = (*it)+6;
-                ++it;
             }
-            // write partial last section
-            if( ! writeBuffer( pFontData+nIndex, nEndAsciiIndex-nIndex+1 ) )
-            {
-                endCompression();
-                disableStreamEncryption();
-                goto streamend;
-            }
-        }
 
-        // write binary section
-        if( ! bConvertHexData )
-        {
-            if( aSections.begin() == aSections.end() )
+            // there may be whitespace to ignore before the 512 '0'
+            while( pFontData[nIndex] == '\r' || pFontData[nIndex] == '\n' )
             {
-                if( ! writeBuffer( pFontData+nBeginBinaryIndex, nFontLen-nBeginBinaryIndex ) )
+                nIndex--;
+                for( it = aSections.begin(); it != aSections.end() && (nIndex < *it || nIndex > ((*it) + 5) ); ++it )
+                    ;
+                if( it != aSections.end() )
                 {
-                    endCompression();
-                    disableStreamEncryption();
-                    goto streamend;
+                    nIndex = (*it)-1;
+                    break; // this is surely a binary boundary, in ascii case it wouldn't matter
                 }
             }
-            else
+            nEndBinaryIndex = nIndex;
+
+            // search for beginning of binary section
+            nBeginBinaryIndex = nEndAsciiIndex;
+            do
             {
-                for( it = aSections.begin(); *it < nBeginBinaryIndex; ++it )
+                nBeginBinaryIndex++;
+                for( it = aSections.begin(); it != aSections.end() && (nBeginBinaryIndex < *it || nBeginBinaryIndex > ((*it) + 5) ); ++it )
                     ;
-                // write first partial section
-                if( ! writeBuffer( pFontData+nBeginBinaryIndex, (*it) - nBeginBinaryIndex ) )
-                {
-                    endCompression();
-                    disableStreamEncryption();
-                    goto streamend;
-                }
-                // write following sections
-                while( it != aSections.end() )
-                {
-                    nIndex = (*it)+6;
-                    ++it;
-                    if( nIndex < nFontLen ) // last section marker is usually the EOF which has only 2 bytes
+                    } while( nBeginBinaryIndex < nEndBinaryIndex &&
+                        ( pFontData[nBeginBinaryIndex] == '\r'  ||
+                            pFontData[nBeginBinaryIndex] == '\n'    ||
+                            it != aSections.end() ) );
+
+                    // it seems to be vital to copy the exact whitespace between binary data
+                    // and eexec, else a invalid font results. so make nEndAsciiIndex
+                    // always immediate in front of nBeginBinaryIndex
+                    nEndAsciiIndex = nBeginBinaryIndex-1;
+                    for( it = aSections.begin(); it != aSections.end() && (nEndAsciiIndex < *it || nEndAsciiIndex > ((*it)+5)); ++it )
+                        ;
+                    if( it != aSections.end() )
+                        nEndAsciiIndex = (*it)-1;
+
+                    nLength1 = nEndAsciiIndex+1; // including the last character
+                    for( it = aSections.begin(); it != aSections.end() && *it < nEndAsciiIndex; ++it )
+                        nLength1 -= 6; // decrease by pfb section size
+
+                    // if the first four bytes are all ascii hex characters, then binary data
+                    // has to be converted to real binary data
+                    for( nIndex = 0; nIndex < 4 &&
+                        ( ( pFontData[ nBeginBinaryIndex+nIndex ] >= '0' && pFontData[ nBeginBinaryIndex+nIndex ] <= '9' ) ||
+                            ( pFontData[ nBeginBinaryIndex+nIndex ] >= 'a' && pFontData[ nBeginBinaryIndex+nIndex ] <= 'f' ) ||
+                            ( pFontData[ nBeginBinaryIndex+nIndex ] >= 'A' && pFontData[ nBeginBinaryIndex+nIndex ] <= 'F' )
+                            ); ++nIndex )
+                    ;
+                    bool bConvertHexData = true;
+                    if( nIndex < 4 )
+                    {
+                        bConvertHexData = false;
+                        nLength2 = nEndBinaryIndex - nBeginBinaryIndex + 1; // include the last byte
+                        for( it = aSections.begin(); it != aSections.end(); ++it )
+                            if( *it > nBeginBinaryIndex && *it < nEndBinaryIndex )
+                            nLength2 -= 6;
+                    }
+                    else
                     {
-                        sal_Int32 nSectionLen = (it == aSections.end()) ? nFontLen - nIndex : (*it) - nIndex;
-                        if( ! writeBuffer( pFontData+nIndex, nSectionLen ) )
+                        // count the hex ascii characters to get nLength2
+                        nLength2 = 0;
+                        int nNextSectionIndex = 0;
+                        for( it = aSections.begin(); it != aSections.end() && *it < nBeginBinaryIndex; ++it )
+                            ;
+                        if( it != aSections.end() )
+                            nNextSectionIndex = *it;
+                        for( nIndex = nBeginBinaryIndex; nIndex <= nEndBinaryIndex; nIndex++ )
                         {
-                            endCompression();
-                            disableStreamEncryption();
-                            goto streamend;
+                            if( nIndex == nNextSectionIndex )
+                            {
+                                nIndex += 6;
+                                ++it;
+                                nNextSectionIndex = (it == aSections.end() ? 0 : *it );
+                            }
+                            if( ( pFontData[ nIndex ] >= '0' && pFontData[ nIndex ] <= '9' ) ||
+                                ( pFontData[ nIndex ] >= 'a' && pFontData[ nIndex ] <= 'f' ) ||
+                            ( pFontData[ nIndex ] >= 'A' && pFontData[ nIndex ] <= 'F' ) )
+                            nLength2++;
                         }
+                        DBG_ASSERT( !(nLength2 & 1), "uneven number of hex chars in binary pfa section" );
+                        nLength2 /= 2;
                     }
-                }
-            }
-        }
-        else
-        {
-            unsigned char* pWriteBuffer = (unsigned char*)rtl_allocateMemory( nLength2 );
-            memset( pWriteBuffer, 0, nLength2 );
-            int nWriteIndex = 0;
-
-            int nNextSectionIndex = 0;
-            for( it = aSections.begin(); it != aSections.end() && *it < nBeginBinaryIndex; ++it )
-                ;
-            if( it != aSections.end() )
-                nNextSectionIndex = *it;
-            for( nIndex = nBeginBinaryIndex; nIndex <= nEndBinaryIndex; nIndex++ )
-            {
-                if( nIndex == nNextSectionIndex )
-                {
-                    nIndex += 6;
-                    ++it;
-                    nNextSectionIndex = (it == aSections.end() ? nFontLen : *it );
-                }
-                unsigned char cNibble = 0x80;
-                if( pFontData[ nIndex ] >= '0' && pFontData[ nIndex ] <= '9' )
-                    cNibble = pFontData[nIndex] - '0';
-                else if( pFontData[ nIndex ] >= 'a' && pFontData[ nIndex ] <= 'f' )
-                    cNibble = pFontData[nIndex] - 'a' + 10;
-                else if( pFontData[ nIndex ] >= 'A' && pFontData[ nIndex ] <= 'F' )
-                    cNibble = pFontData[nIndex] - 'A' + 10;
-                if( cNibble != 0x80 )
-                {
-                    if( !(nWriteIndex & 1 ) )
-                        cNibble <<= 4;
-                    pWriteBuffer[ nWriteIndex/2 ] |= cNibble;
-                    nWriteIndex++;
-                }
-            }
-            if( ! writeBuffer( pWriteBuffer, nLength2 ) )
-            {
-                endCompression();
-                disableStreamEncryption();
-                goto streamend;
-            }
-            rtl_freeMemory( pWriteBuffer );
 
-            if( aSections.empty() )
-            {
-                if( ! writeBuffer( pFontData+nIndex, nFontLen-nIndex ) )
-                {
-                    endCompression();
-                    disableStreamEncryption();
-                    goto streamend;
-                }
-            }
-            else
-            {
-                // write rest of this section
-                if( nIndex < nNextSectionIndex )
-                {
-                    if( ! writeBuffer( pFontData+nIndex, nNextSectionIndex - nIndex ) )
+                    // now we can actually write the font stream !
+                    #if OSL_DEBUG_LEVEL > 1
                     {
-                        endCompression();
-                        disableStreamEncryption();
-                        goto streamend;
+                        OStringBuffer aLine( " PDFWriterImpl::emitEmbeddedFont" );
+                        emitComment( aLine.getStr() );
                     }
-                }
-                // write following sections
-                while( it != aSections.end() )
-                {
-                    nIndex = (*it)+6;
-                    ++it;
-                    if( nIndex < nFontLen ) // last section marker is usually the EOF which has only 2 bytes
+                    #endif
+                    OStringBuffer aLine( 512 );
+                    nStreamObject = createObject();
+                    if( !updateObject(nStreamObject))
+                        throw FontException();
+                    sal_Int32 nStreamLengthObject = createObject();
+                    aLine.append( nStreamObject );
+                    aLine.append( " 0 obj\n"
+                        "<</Length " );
+                    aLine.append( nStreamLengthObject );
+                    aLine.append( " 0 R"
+                        #ifndef DEBUG_DISABLE_PDFCOMPRESSION
+                        "/Filter/FlateDecode"
+                        #endif
+                        "/Length1 " );
+                    aLine.append( nLength1 );
+                    aLine.append( " /Length2 " );
+                    aLine.append( nLength2 );
+                    aLine.append( " /Length3 ");
+                    aLine.append( nLength3 );
+                    aLine.append( ">>\n"
+                        "stream\n" );
+                    if( !writeBuffer( aLine.getStr(), aLine.getLength() ) )
+                        throw FontException();
+
+                    sal_uInt64 nBeginStreamPos = 0;
+                    osl_getFilePos( m_aFile, &nBeginStreamPos );
+
+                    beginCompression();
+                    checkAndEnableStreamEncryption( nStreamObject );
+
+                    // write ascii section
+                    if( aSections.begin() == aSections.end() )
+                    {
+                        if( ! writeBuffer( pFontData, nEndAsciiIndex+1 ) )
+                            throw FontException();
+                    }
+                    else
                     {
-                        sal_Int32 nSectionLen = (it == aSections.end()) ? nFontLen - nIndex : (*it) - nIndex;
-                        if( ! writeBuffer( pFontData+nIndex, nSectionLen ) )
+                        // first section always starts at 0
+                        it = aSections.begin();
+                        nIndex = (*it)+6;
+                        ++it;
+                        while( *it < nEndAsciiIndex )
                         {
-                            endCompression();
-                            disableStreamEncryption();
-                            goto streamend;
+                            if( ! writeBuffer( pFontData+nIndex, (*it)-nIndex ) )
+                                throw FontException();
+                            nIndex = (*it)+6;
+                            ++it;
                         }
+                        // write partial last section
+                        if( ! writeBuffer( pFontData+nIndex, nEndAsciiIndex-nIndex+1 ) )
+                            throw FontException();
                     }
-                }
-            }
-        }
-        endCompression();
-        disableStreamEncryption();
-
-
-        sal_uInt64 nEndStreamPos = 0;
-        osl_getFilePos( m_aFile, &nEndStreamPos );
 
-        // and finally close the stream
-        aLine.setLength( 0 );
-        aLine.append( "\nendstream\nendobj\n\n" );
-        if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
-            goto streamend;
+                    // write binary section
+                    if( ! bConvertHexData )
+                    {
+                        if( aSections.begin() == aSections.end() )
+                        {
+                            if( ! writeBuffer( pFontData+nBeginBinaryIndex, nFontLen-nBeginBinaryIndex ) )
+                                throw FontException();
+                        }
+                        else
+                        {
+                            for( it = aSections.begin(); *it < nBeginBinaryIndex; ++it )
+                                ;
+                            // write first partial section
+                            if( ! writeBuffer( pFontData+nBeginBinaryIndex, (*it) - nBeginBinaryIndex ) )
+                                throw FontException();
+                            // write following sections
+                            while( it != aSections.end() )
+                            {
+                                nIndex = (*it)+6;
+                                ++it;
+                                if( nIndex < nFontLen ) // last section marker is usually the EOF which has only 2 bytes
+                                {
+                                    sal_Int32 nSectionLen = (it == aSections.end()) ? nFontLen - nIndex : (*it) - nIndex;
+                                    if( ! writeBuffer( pFontData+nIndex, nSectionLen ) )
+                                        throw FontException();
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        boost::shared_array<unsigned char> pWriteBuffer( new unsigned char[ nLength2 ] );
+                        rtl_zeroMemory( pWriteBuffer.get(), nLength2 );
+                        int nWriteIndex = 0;
+
+                        int nNextSectionIndex = 0;
+                        for( it = aSections.begin(); it != aSections.end() && *it < nBeginBinaryIndex; ++it )
+                            ;
+                        if( it != aSections.end() )
+                            nNextSectionIndex = *it;
+                        for( nIndex = nBeginBinaryIndex; nIndex <= nEndBinaryIndex; nIndex++ )
+                        {
+                            if( nIndex == nNextSectionIndex )
+                            {
+                                nIndex += 6;
+                                ++it;
+                                nNextSectionIndex = (it == aSections.end() ? nFontLen : *it );
+                            }
+                            unsigned char cNibble = 0x80;
+                            if( pFontData[ nIndex ] >= '0' && pFontData[ nIndex ] <= '9' )
+                                cNibble = pFontData[nIndex] - '0';
+                            else if( pFontData[ nIndex ] >= 'a' && pFontData[ nIndex ] <= 'f' )
+                                cNibble = pFontData[nIndex] - 'a' + 10;
+                            else if( pFontData[ nIndex ] >= 'A' && pFontData[ nIndex ] <= 'F' )
+                                cNibble = pFontData[nIndex] - 'A' + 10;
+                            if( cNibble != 0x80 )
+                            {
+                                if( !(nWriteIndex & 1 ) )
+                                    cNibble <<= 4;
+                                pWriteBuffer.get()[ nWriteIndex/2 ] |= cNibble;
+                                nWriteIndex++;
+                            }
+                        }
+                        if( ! writeBuffer( pWriteBuffer.get(), nLength2 ) )
+                            throw FontException();
+                        if( aSections.empty() )
+                        {
+                            if( ! writeBuffer( pFontData+nIndex, nFontLen-nIndex ) )
+                                throw FontException();
+                        }
+                        else
+                        {
+                            // write rest of this section
+                            if( nIndex < nNextSectionIndex )
+                            {
+                                if( ! writeBuffer( pFontData+nIndex, nNextSectionIndex - nIndex ) )
+                                    throw FontException();
+                            }
+                            // write following sections
+                            while( it != aSections.end() )
+                            {
+                                nIndex = (*it)+6;
+                                ++it;
+                                if( nIndex < nFontLen ) // last section marker is usually the EOF which has only 2 bytes
+                                {
+                                    sal_Int32 nSectionLen = (it == aSections.end()) ? nFontLen - nIndex : (*it) - nIndex;
+                                    if( ! writeBuffer( pFontData+nIndex, nSectionLen ) )
+                                        throw FontException();
+                                }
+                            }
+                        }
+                    }
+                    endCompression();
+                    disableStreamEncryption();
 
-        // write stream length object
-        aLine.setLength( 0 );
-        if( ! updateObject( nStreamLengthObject ) )
-            goto streamend;
-        aLine.append( nStreamLengthObject );
-        aLine.append( " 0 obj\n" );
-        aLine.append( (sal_Int64)(nEndStreamPos-nBeginStreamPos ) );
-        aLine.append( "\nendobj\n\n" );
-        if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
-            goto streamend;
-    }
-    else
-    {
-        rtl::OStringBuffer aErrorComment( 256 );
-        aErrorComment.append( "GetEmbedFontData failed for font \"" );
-        aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) );
-        aErrorComment.append( '\"' );
-        if( pFont->GetSlant() == ITALIC_NORMAL )
-            aErrorComment.append( " italic" );
-        else if( pFont->GetSlant() == ITALIC_OBLIQUE )
-            aErrorComment.append( " oblique" );
-        aErrorComment.append( " weight=" );
-        aErrorComment.append( sal_Int32(pFont->GetWeight()) );
-        emitComment( aErrorComment.getStr() );
-    }
-
-    if( nStreamObject )
-        // write font descriptor
-        nFontDescriptor = emitFontDescriptor( pFont, aInfo, 0, nStreamObject );
 
-    if( nFontDescriptor )
-    {
-        if( pEncoding )
-            nToUnicodeStream = createToUnicodeCMap( nEncoding, nEncodedCodes, sizeof(nEncoding)/sizeof(nEncoding[0]) );
+                    sal_uInt64 nEndStreamPos = 0;
+                    osl_getFilePos( m_aFile, &nEndStreamPos );
 
-        // write font object
-        sal_Int32 nObject = createObject();
-        if( ! updateObject( nObject ) )
-            goto streamend;
+                    // and finally close the stream
+                    aLine.setLength( 0 );
+                    aLine.append( "\nendstream\nendobj\n\n" );
+                    if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
+                        throw FontException();
 
-        OStringBuffer aLine( 1024 );
-        aLine.append( nObject );
-        aLine.append( " 0 obj\n"
-                      "<</Type/Font/Subtype/Type1/BaseFont/" );
-        appendName( aInfo.m_aPSName, aLine );
-        aLine.append( "\n" );
-        if( !pFont->mbSymbolFlag &&  pEncoding == 0 )
-            aLine.append( "/Encoding/WinAnsiEncoding\n" );
-        if( nToUnicodeStream )
-        {
-            aLine.append( "/ToUnicode " );
-            aLine.append( nToUnicodeStream );
-            aLine.append( " 0 R\n" );
+                    // write stream length object
+                    aLine.setLength( 0 );
+                    if( ! updateObject( nStreamLengthObject ) )
+                        throw FontException();
+                    aLine.append( nStreamLengthObject );
+                    aLine.append( " 0 obj\n" );
+                    aLine.append( (sal_Int64)(nEndStreamPos-nBeginStreamPos ) );
+                    aLine.append( "\nendobj\n\n" );
+                    if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
+                        throw FontException();
         }
-        aLine.append( "/FirstChar 0 /LastChar 255\n"
-                      "/Widths[" );
-        for( int i = 0; i < 256; i++ )
+        else
         {
-            aLine.append( pWidths[i] );
-            aLine.append( ((i&15) == 15) ? "\n" : " " );
-        }
-        aLine.append( "]\n"
-                      "/FontDescriptor " );
-        aLine.append( nFontDescriptor );
-        aLine.append( " 0 R>>\n"
-                      "endobj\n\n" );
-        if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
-            goto streamend;
-
-        nFontObject = nObject;
-
-        aRet[ rEmbed.m_nNormalFontID ] = nObject;
+            rtl::OStringBuffer aErrorComment( 256 );
+            aErrorComment.append( "GetEmbedFontData failed for font \"" );
+            aErrorComment.append( OUStringToOString( pFont->GetFamilyName(), RTL_TEXTENCODING_UTF8 ) );
+            aErrorComment.append( '\"' );
+            if( pFont->GetSlant() == ITALIC_NORMAL )
+                aErrorComment.append( " italic" );
+            else if( pFont->GetSlant() == ITALIC_OBLIQUE )
+                aErrorComment.append( " oblique" );
+            aErrorComment.append( " weight=" );
+            aErrorComment.append( sal_Int32(pFont->GetWeight()) );
+            emitComment( aErrorComment.getStr() );
+        }
+
+        if( nStreamObject )
+            // write font descriptor
+        nFontDescriptor = emitFontDescriptor( pFont, aInfo, 0, nStreamObject );
 
-        // write additional encodings
-        for( std::list< EmbedEncoding >::iterator enc_it = rEmbed.m_aExtendedEncodings.begin(); enc_it != rEmbed.m_aExtendedEncodings.end(); ++enc_it )
+        if( nFontDescriptor )
         {
-            sal_Int32 aEncWidths[ 256 ];
-            // emit encoding dict
-            sal_Int32 nEncObject = createObject();
-            if( ! updateObject( nEncObject ) )
-                goto streamend;
-
-            OutputDevice* pRef = getReferenceDevice();
-            pRef->Push( PUSH_FONT | PUSH_MAPMODE );
-            pRef->SetMapMode( MapMode( MAP_PIXEL ) );
-            Font aFont( pFont->GetFamilyName(), pFont->GetStyleName(), Size( 0, 1000 ) );
-            aFont.SetWeight( pFont->GetWeight() );
-            aFont.SetItalic( pFont->GetSlant() );
-            aFont.SetPitch( pFont->GetPitch() );
-            pRef->SetFont( aFont );
-            pRef->ImplNewFont();
-
-            aLine.setLength( 0 );
-            aLine.append( nEncObject );
-            aLine.append( " 0 obj\n"
-                          "<</Type/Encoding/Differences[ 0\n" );
-            int nEncoded = 0;
-            for( std::vector< EmbedCode >::iterator str_it = enc_it->m_aEncVector.begin(); str_it != enc_it->m_aEncVector.end(); ++str_it )
-            {
-                String aStr( str_it->m_aUnicode );
-                aEncWidths[nEncoded] = pRef->GetTextWidth( aStr );
-                nEncodedCodes[nEncoded] = str_it->m_aUnicode;
-                nEncoding[nEncoded] = sal::static_int_cast<sal_uInt8>(nEncoded);
-
-                aLine.append( " /" );
-                aLine.append( str_it->m_aName );
-                if( !((++nEncoded) & 15) )
-                    aLine.append( "\n" );
-            }
-            aLine.append( "]>>\n"
-                          "endobj\n\n" );
-
-            pRef->Pop();
-
-            if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
-                goto streamend;
-
-            nToUnicodeStream = createToUnicodeCMap( nEncoding, nEncodedCodes, nEncoded );
+            if( pEncoding )
+                nToUnicodeStream = createToUnicodeCMap( nEncoding, &aUnicodes[0], pUnicodesPerGlyph, pEncToUnicodeIndex, sizeof(nEncoding)/sizeof(nEncoding[0]) );
 
-            nObject = createObject();
+            // write font object
+            sal_Int32 nObject = createObject();
             if( ! updateObject( nObject ) )
-                goto streamend;
+                throw FontException();
 
-            aLine.setLength( 0 );
+            OStringBuffer aLine( 1024 );
             aLine.append( nObject );
             aLine.append( " 0 obj\n"
-                          "<</Type/Font/Subtype/Type1/BaseFont/" );
+                "<</Type/Font/Subtype/Type1/BaseFont/" );
             appendName( aInfo.m_aPSName, aLine );
             aLine.append( "\n" );
-            aLine.append( "/Encoding " );
-            aLine.append( nEncObject );
-            aLine.append( " 0 R\n" );
+            if( !pFont->mbSymbolFlag &&  pEncoding == 0 )
+                aLine.append( "/Encoding/WinAnsiEncoding\n" );
             if( nToUnicodeStream )
             {
                 aLine.append( "/ToUnicode " );
                 aLine.append( nToUnicodeStream );
                 aLine.append( " 0 R\n" );
             }
-            aLine.append( "/FirstChar 0\n"
-                          "/LastChar " );
-            aLine.append( (sal_Int32)(nEncoded-1) );
-            aLine.append( "\n"
-                          "/Widths[" );
-            for( int i = 0; i < nEncoded; i++ )
+            aLine.append( "/FirstChar 0 /LastChar 255\n"
+                "/Widths[" );
+            for( int i = 0; i < 256; i++ )
             {
-                aLine.append( aEncWidths[i] );
+                aLine.append( pWidths[i] );
                 aLine.append( ((i&15) == 15) ? "\n" : " " );
             }
-            aLine.append( " ]\n"
-                          "/FontDescriptor " );
+            aLine.append( "]\n"
+                "/FontDescriptor " );
             aLine.append( nFontDescriptor );
             aLine.append( " 0 R>>\n"
-                          "endobj\n\n" );
+                "endobj\n\n" );
             if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
-                goto streamend;
+                throw FontException();
 
-            aRet[ enc_it->m_nFontID ] = nObject;
+            nFontObject = nObject;
+
+            aRet[ rEmbed.m_nNormalFontID ] = nObject;
+
+            // write additional encodings
+            for( std::list< EmbedEncoding >::iterator enc_it = rEmbed.m_aExtendedEncodings.begin(); enc_it != rEmbed.m_aExtendedEncodings.end(); ++enc_it )
+            {
+                sal_Int32 aEncWidths[ 256 ];
+                // emit encoding dict
+                sal_Int32 nEncObject = createObject();
+                if( ! updateObject( nEncObject ) )
+                    throw FontException();
+
+                OutputDevice* pRef = getReferenceDevice();
+                pRef->Push( PUSH_FONT | PUSH_MAPMODE );
+                pRef->SetMapMode( MapMode( MAP_PIXEL ) );
+                Font aFont( pFont->GetFamilyName(), pFont->GetStyleName(), Size( 0, 1000 ) );
+                aFont.SetWeight( pFont->GetWeight() );
+                aFont.SetItalic( pFont->GetSlant() );
+                aFont.SetPitch( pFont->GetPitch() );
+                pRef->SetFont( aFont );
+                pRef->ImplNewFont();
+
+                aLine.setLength( 0 );
+                aLine.append( nEncObject );
+                aLine.append( " 0 obj\n"
+                    "<</Type/Encoding/Differences[ 0\n" );
+                int nEncoded = 0;
+                aUnicodes.clear();
+                for( std::vector< EmbedCode >::iterator str_it = enc_it->m_aEncVector.begin(); str_it != enc_it->m_aEncVector.end(); ++str_it )
+                {
+                    String aStr( str_it->m_aUnicode );
+                    aEncWidths[nEncoded] = pRef->GetTextWidth( aStr );
+                    nEncodedCodes[nEncoded] = str_it->m_aUnicode;
+                    nEncoding[nEncoded] = sal::static_int_cast<sal_uInt8>(nEncoded);
+                    pEncToUnicodeIndex[nEncoded] = static_cast<sal_Int32>(aUnicodes.size());
+                    aUnicodes.push_back( nEncodedCodes[nEncoded] );
+                    pUnicodesPerGlyph[nEncoded] = 1;
+
+                    aLine.append( " /" );
+                    aLine.append( str_it->m_aName );
+                    if( !((++nEncoded) & 15) )
+                        aLine.append( "\n" );
+                }
+                aLine.append( "]>>\n"
+                    "endobj\n\n" );
+
+                pRef->Pop();
+
+                if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
+                    throw FontException();
+
+                nToUnicodeStream = createToUnicodeCMap( nEncoding, &aUnicodes[0], pUnicodesPerGlyph, pEncToUnicodeIndex, nEncoded );
+
+                nObject = createObject();
+                if( ! updateObject( nObject ) )
+                    throw FontException();
+
+                aLine.setLength( 0 );
+                aLine.append( nObject );
+                aLine.append( " 0 obj\n"
+                    "<</Type/Font/Subtype/Type1/BaseFont/" );
+                appendName( aInfo.m_aPSName, aLine );
+                aLine.append( "\n" );
+                aLine.append( "/Encoding " );
+                aLine.append( nEncObject );
+                aLine.append( " 0 R\n" );
+                if( nToUnicodeStream )
+                {
+                    aLine.append( "/ToUnicode " );
+                    aLine.append( nToUnicodeStream );
+                    aLine.append( " 0 R\n" );
+                }
+                aLine.append( "/FirstChar 0\n"
+                    "/LastChar " );
+                aLine.append( (sal_Int32)(nEncoded-1) );
+                aLine.append( "\n"
+                    "/Widths[" );
+                for( int i = 0; i < nEncoded; i++ )
+                {
+                    aLine.append( aEncWidths[i] );
+                    aLine.append( ((i&15) == 15) ? "\n" : " " );
+                }
+                aLine.append( " ]\n"
+                    "/FontDescriptor " );
+                aLine.append( nFontDescriptor );
+                aLine.append( " 0 R>>\n"
+                    "endobj\n\n" );
+                if( ! writeBuffer( aLine.getStr(), aLine.getLength() ) )
+                    throw FontException();
+
+                aRet[ enc_it->m_nFontID ] = nObject;
+            }
         }
     }
+    catch( FontException& )
+    {
+        // these do nothing in case there was no compression or encryption ongoing
+        endCompression();
+        disableStreamEncryption();
+    }
 
-  streamend:
     if( pFontData )
         m_pReferenceDevice->mpGraphics->FreeEmbedFontData( pFontData, nFontLen );
 
@@ -3567,11 +3552,15 @@ static void appendSubsetName( int nSubsetID, const OUString& rPSName, OStringBuf
     appendName( rPSName, rBuffer );
 }
 
-sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding, sal_Ucs* pUnicodes, int nGlyphs )
+sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding,
+                                              sal_Ucs* pUnicodes,
+                                              sal_Int32* pUnicodesPerGlyph,
+                                              sal_Int32* pEncToUnicodeIndex,
+                                              int nGlyphs )
 {
     int nMapped = 0, n = 0;
     for( n = 0; n < nGlyphs; n++ )
-        if( pUnicodes[n] )
+        if( pUnicodes[pEncToUnicodeIndex[n]] && pUnicodesPerGlyph[n] )
             nMapped++;
 
     if( nMapped == 0 )
@@ -3599,7 +3588,7 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding, sal_Ucs* pUn
     int nCount = 0;
     for( n = 0; n < nGlyphs; n++ )
     {
-        if( pUnicodes[n] )
+        if( pUnicodes[pEncToUnicodeIndex[n]] && pUnicodesPerGlyph[n] )
         {
             if( (nCount % 100) == 0 )
             {
@@ -3611,9 +3600,13 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* pEncoding, sal_Ucs* pUn
             aContents.append( '<' );
             appendHex( (sal_Int8)pEncoding[n], aContents );
             aContents.append( "> <" );
-        // TODO: handle unicodes>U+FFFF
-            appendHex( (sal_Int8)(pUnicodes[n] / 256), aContents );
-            appendHex( (sal_Int8)(pUnicodes[n] & 255), aContents );
+            // TODO: handle unicodes>U+FFFF
+            sal_Int32 nIndex = pEncToUnicodeIndex[n];
+            for( sal_Int32 j = 0; j < pUnicodesPerGlyph[n]; j++ )
+            {
+                appendHex( (sal_Int8)(pUnicodes[nIndex + j] / 256), aContents );
+                appendHex( (sal_Int8)(pUnicodes[nIndex + j] & 255), aContents );
+            }
             aContents.append( ">\n" );
             nCount++;
         }
@@ -3777,25 +3770,32 @@ bool PDFWriterImpl::emitFonts()
             sal_Int32 pGlyphIDs[ 256 ];
             sal_Int32 pWidths[ 256 ];
             sal_uInt8 pEncoding[ 256 ];
-            sal_Ucs   pUnicodes[ 256 ];
+            sal_Int32 pEncToUnicodeIndex[ 256 ];
+            sal_Int32 pUnicodesPerGlyph[ 256 ];
+            std::vector<sal_Ucs> aUnicodes;
+            aUnicodes.reserve( 256 );
             int nGlyphs = 1;
             // fill arrays and prepare encoding index map
             sal_Int32 nToUnicodeStream = 0;
 
-            memset( pGlyphIDs, 0, sizeof( pGlyphIDs ) );
-            memset( pEncoding, 0, sizeof( pEncoding ) );
-            memset( pUnicodes, 0, sizeof( pUnicodes ) );
+            rtl_zeroMemory( pGlyphIDs, sizeof( pGlyphIDs ) );
+            rtl_zeroMemory( pEncoding, sizeof( pEncoding ) );
+            rtl_zeroMemory( pUnicodesPerGlyph, sizeof( pUnicodesPerGlyph ) );
+            rtl_zeroMemory( pEncToUnicodeIndex, sizeof( pEncToUnicodeIndex ) );
             for( FontEmitMapping::iterator fit = lit->m_aMapping.begin(); fit != lit->m_aMapping.end();++fit )
             {
-                sal_uInt8 nEnc = fit->second.m_nSubsetGlyphID;
+                sal_uInt8 nEnc = fit->second.getGlyphId();
 
                 DBG_ASSERT( pGlyphIDs[nEnc] == 0 && pEncoding[nEnc] == 0, "duplicate glyph" );
                 DBG_ASSERT( nEnc <= lit->m_aMapping.size(), "invalid glyph encoding" );
 
                 pGlyphIDs[ nEnc ] = fit->first;
                 pEncoding[ nEnc ] = nEnc;
-                pUnicodes[ nEnc ] = fit->second.m_aUnicode;
-                if( pUnicodes[ nEnc ] )
+                pEncToUnicodeIndex[ nEnc ] = static_cast<sal_Int32>(aUnicodes.size());
+                pUnicodesPerGlyph[ nEnc ] = fit->second.countCodes();
+                for( sal_Int32 n = 0; n < pUnicodesPerGlyph[ nEnc ]; n++ )
+                    aUnicodes.push_back( fit->second.getCode( n ) );
+                if( fit->second.getCode(0) )
                     nToUnicodeStream = 1;
                 if( nGlyphs < 256 )
                     nGlyphs++;
@@ -3816,92 +3816,92 @@ bool PDFWriterImpl::emitFonts()
                 CHECK_RETURN( (osl_File_E_None == osl_getFilePos( aFontFile, &nLength1 ) ) );
                 CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) );
 
-#if OSL_DEBUG_LEVEL > 1
+                #if OSL_DEBUG_LEVEL > 1
                 {
                     OStringBuffer aLine1( " PDFWriterImpl::emitFonts" );
                     emitComment( aLine1.getStr() );
                 }
-#endif
+                #endif
                 sal_Int32 nFontStream = createObject();
                 sal_Int32 nStreamLengthObject = createObject();
                 CHECK_RETURN( updateObject( nFontStream ) );
                 aLine.setLength( 0 );
                 aLine.append( nFontStream );
                 aLine.append( " 0 obj\n"
-                              "<</Length " );
+                             "<</Length " );
                 aLine.append( (sal_Int32)nStreamLengthObject );
                 aLine.append( " 0 R"
-#ifndef DEBUG_DISABLE_PDFCOMPRESSION
-                              "/Filter/FlateDecode"
-#endif
-                              "/Length1 " );
-
-            sal_uInt64 nStartPos = 0;
-            if( aSubsetInfo.m_nFontType == FontSubsetInfo::SFNT_TTF )
-            {
-                      aLine.append( (sal_Int32)nLength1 );
+                             #ifndef DEBUG_DISABLE_PDFCOMPRESSION
+                             "/Filter/FlateDecode"
+                             #endif
+                             "/Length1 " );
 
-                aLine.append( ">>\n"
-                              "stream\n" );
-                CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
-                CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
-
-                // copy font file
-                beginCompression();
-                checkAndEnableStreamEncryption( nFontStream );
-                sal_Bool bEOF = sal_False;
-                do
+                sal_uInt64 nStartPos = 0;
+                if( aSubsetInfo.m_nFontType == FontSubsetInfo::SFNT_TTF )
                 {
-                    char buf[8192];
-                    sal_uInt64 nRead;
-                    CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, buf, sizeof( buf ), &nRead ) ) );
-                    CHECK_RETURN( writeBuffer( buf, nRead ) );
-                    CHECK_RETURN( (osl_File_E_None == osl_isEndOfFile( aFontFile, &bEOF ) ) );
-                } while( ! bEOF );
-            }
-            else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::CFF_FONT) != 0 )
-            {
-                // TODO: implement
-                DBG_ERROR( "PDFWriterImpl does not support CFF-font subsets yet!" );
-            }
-            else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::TYPE1_PFB) != 0 ) // TODO: also support PFA?
-            {
-                unsigned char* pBuffer = new unsigned char[ (int)nLength1 ];
-
-                   sal_uInt64 nBytesRead = 0;
-                CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, pBuffer, nLength1, &nBytesRead ) ) );
-                DBG_ASSERT( nBytesRead==nLength1, "PDF-FontSubset read incomplete!" );
-                   CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) );
-                // get the PFB-segment lengths
-                ThreeInts aSegmentLengths = {0,0,0};
-                getPfbSegmentLengths( pBuffer, (int)nBytesRead, aSegmentLengths );
-                // the lengths below are mandatory for PDF-exported Type1 fonts
-                // because the PFB segment headers get stripped! WhyOhWhy.
-                   aLine.append( (sal_Int32)aSegmentLengths[0] );
-                aLine.append( "/Length2 " );
-                aLine.append( (sal_Int32)aSegmentLengths[1] );
-                aLine.append( "/Length3 " );
-                aLine.append( (sal_Int32)aSegmentLengths[2] );
-
-                aLine.append( ">>\n"
-                              "stream\n" );
-                CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
-                CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
-
-                // emit PFB-sections without section headers
-                beginCompression();
-                checkAndEnableStreamEncryption( nFontStream );
-                CHECK_RETURN( writeBuffer( pBuffer+ 6, aSegmentLengths[0] ) );
-                CHECK_RETURN( writeBuffer( pBuffer+12 + aSegmentLengths[0], aSegmentLengths[1] ) );
-                CHECK_RETURN( writeBuffer( pBuffer+18 + aSegmentLengths[0] + aSegmentLengths[1], aSegmentLengths[2] ) );
-
-                delete[] pBuffer;
-            }
-            else
-            {
-                fprintf( stderr, "PDF: CreateFontSubset result in not yet supported format=%d\n",aSubsetInfo.m_nFontType);
-                aLine.append( "0 >>\nstream\n" );
-            }
+                    aLine.append( (sal_Int32)nLength1 );
+
+                    aLine.append( ">>\n"
+                                 "stream\n" );
+                    CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+                    CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
+
+                    // copy font file
+                    beginCompression();
+                    checkAndEnableStreamEncryption( nFontStream );
+                    sal_Bool bEOF = sal_False;
+                    do
+                    {
+                        char buf[8192];
+                        sal_uInt64 nRead;
+                        CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, buf, sizeof( buf ), &nRead ) ) );
+                        CHECK_RETURN( writeBuffer( buf, nRead ) );
+                        CHECK_RETURN( (osl_File_E_None == osl_isEndOfFile( aFontFile, &bEOF ) ) );
+                    } while( ! bEOF );
+                }
+                else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::CFF_FONT) != 0 )
+                {
+                    // TODO: implement
+                    DBG_ERROR( "PDFWriterImpl does not support CFF-font subsets yet!" );
+                }
+                else if( (aSubsetInfo.m_nFontType & FontSubsetInfo::TYPE1_PFB) != 0 ) // TODO: also support PFA?
+                {
+                    unsigned char* pBuffer = new unsigned char[ (int)nLength1 ];
+
+                    sal_uInt64 nBytesRead = 0;
+                    CHECK_RETURN( (osl_File_E_None == osl_readFile( aFontFile, pBuffer, nLength1, &nBytesRead ) ) );
+                    DBG_ASSERT( nBytesRead==nLength1, "PDF-FontSubset read incomplete!" );
+                    CHECK_RETURN( (osl_File_E_None == osl_setFilePos( aFontFile, osl_Pos_Absolut, 0 ) ) );
+                    // get the PFB-segment lengths
+                    ThreeInts aSegmentLengths = {0,0,0};
+                    getPfbSegmentLengths( pBuffer, (int)nBytesRead, aSegmentLengths );
+                    // the lengths below are mandatory for PDF-exported Type1 fonts
+                    // because the PFB segment headers get stripped! WhyOhWhy.
+                    aLine.append( (sal_Int32)aSegmentLengths[0] );
+                    aLine.append( "/Length2 " );
+                    aLine.append( (sal_Int32)aSegmentLengths[1] );
+                    aLine.append( "/Length3 " );
+                    aLine.append( (sal_Int32)aSegmentLengths[2] );
+
+                    aLine.append( ">>\n"
+                                 "stream\n" );
+                    CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
+                    CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos ) ) );
+
+                    // emit PFB-sections without section headers
+                    beginCompression();
+                    checkAndEnableStreamEncryption( nFontStream );
+                    CHECK_RETURN( writeBuffer( pBuffer+ 6, aSegmentLengths[0] ) );
+                    CHECK_RETURN( writeBuffer( pBuffer+12 + aSegmentLengths[0], aSegmentLengths[1] ) );
+                    CHECK_RETURN( writeBuffer( pBuffer+18 + aSegmentLengths[0] + aSegmentLengths[1], aSegmentLengths[2] ) );
+
+                    delete[] pBuffer;
+                }
+                else
+                {
+                    fprintf( stderr, "PDF: CreateFontSubset result in not yet supported format=%d\n",aSubsetInfo.m_nFontType);
+                    aLine.append( "0 >>\nstream\n" );
+                }
 
                 endCompression();
                 disableStreamEncryption();
@@ -3928,7 +3928,7 @@ bool PDFWriterImpl::emitFonts()
                 sal_Int32 nFontDescriptor = emitFontDescriptor( it->first, aSubsetInfo, lit->m_nFontID, nFontStream );
 
                 if( nToUnicodeStream )
-                    nToUnicodeStream = createToUnicodeCMap( pEncoding, pUnicodes, nGlyphs );
+                    nToUnicodeStream = createToUnicodeCMap( pEncoding, &aUnicodes[0], pUnicodesPerGlyph, pEncToUnicodeIndex, nGlyphs );
 
                 sal_Int32 nFontObject = createObject();
                 CHECK_RETURN( updateObject( nFontObject ) );
@@ -3937,22 +3937,22 @@ bool PDFWriterImpl::emitFonts()
 
                 aLine.append( " 0 obj\n" );
                 aLine.append( ((aSubsetInfo.m_nFontType & FontSubsetInfo::ANY_TYPE1) != 0) ?
-                    "<</Type/Font/Subtype/Type1/BaseFont/" :
-                    "<</Type/Font/Subtype/TrueType/BaseFont/" );
+                             "<</Type/Font/Subtype/Type1/BaseFont/" :
+                             "<</Type/Font/Subtype/TrueType/BaseFont/" );
                 appendSubsetName( lit->m_nFontID, aSubsetInfo.m_aPSName, aLine );
                 aLine.append( "\n"
-                              "/FirstChar 0\n"
-                              "/LastChar " );
+                             "/FirstChar 0\n"
+                             "/LastChar " );
                 aLine.append( (sal_Int32)(nGlyphs-1) );
                 aLine.append( "\n"
-                              "/Widths[" );
+                             "/Widths[" );
                 for( int i = 0; i < nGlyphs; i++ )
                 {
                     aLine.append( pWidths[ i ] );
                     aLine.append( ((i & 15) == 15) ? "\n" : " " );
                 }
                 aLine.append( "]\n"
-                              "/FontDescriptor " );
+                             "/FontDescriptor " );
                 aLine.append( nFontDescriptor );
                 aLine.append( " 0 R\n" );
                 if( nToUnicodeStream )
@@ -3962,7 +3962,7 @@ bool PDFWriterImpl::emitFonts()
                     aLine.append( " 0 R\n" );
                 }
                 aLine.append( ">>\n"
-                              "endobj\n\n" );
+                             "endobj\n\n" );
                 CHECK_RETURN( writeBuffer( aLine.getStr(), aLine.getLength() ) );
 
                 aFontIDToObject[ lit->m_nFontID ] = nFontObject;
@@ -4011,7 +4011,7 @@ bool PDFWriterImpl::emitFonts()
     OStringBuffer aFontDict( 1024 );
     aFontDict.append( getFontDictObject() );
     aFontDict.append( " 0 obj\n"
-                      "<<" );
+                     "<<" );
     int ni = 0;
     for( std::map< sal_Int32, sal_Int32 >::iterator mit = aFontIDToObject.begin(); mit != aFontIDToObject.end(); ++mit )
     {
@@ -4020,12 +4020,12 @@ bool PDFWriterImpl::emitFonts()
         aFontDict.append( ' ' );
         aFontDict.append( mit->second );
         aFontDict.append( " 0 R" );
-            if( ((++ni) & 7) == 0 )
-                aFontDict.append( '\n' );
+        if( ((++ni) & 7) == 0 )
+            aFontDict.append( '\n' );
     }
     // emit builtin font for widget apperances / variable text
     for( std::map< sal_Int32, sal_Int32 >::iterator it = m_aBuiltinFontToObjectMap.begin();
-         it != m_aBuiltinFontToObjectMap.end(); ++it )
+        it != m_aBuiltinFontToObjectMap.end(); ++it )
     {
         ImplPdfBuiltinFontData aData(m_aBuiltinFonts[it->first]);
         it->second = emitBuiltinFont( &aData, it->second );
@@ -6580,12 +6580,14 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs,
                                     sal_GlyphId* pGlyphs,
                                     sal_Int32* pGlyphWidths,
                                     sal_Ucs* pUnicodes,
+                                    sal_Int32* pUnicodesPerGlyph,
                                     sal_uInt8* pMappedGlyphs,
                                     sal_Int32* pMappedFontObjects,
                                     const ImplFontData* pFallbackFonts[] )
 {
     const ImplFontData* pDevFont = m_pReferenceDevice->mpFontEntry->maFontSelData.mpFontData;
-    for( int i = 0; i < nGlyphs; i++ )
+    sal_Ucs* pCurUnicode = pUnicodes;
+    for( int i = 0; i < nGlyphs; pCurUnicode += pUnicodesPerGlyph[i] , i++ )
     {
         const int nFontGlyphId = pGlyphs[i] & (GF_IDXMASK | GF_ISCHAR | GF_GSUB);
         const ImplFontData* pCurrentFont = pFallbackFonts[i] ? pFallbackFonts[i] : pDevFont;
@@ -6640,8 +6642,9 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs,
 
                 // add new glyph to emitted font subset
                 GlyphEmit& rNewGlyphEmit = rSubset.m_aSubsets.back().m_aMapping[ nFontGlyphId ];
-                rNewGlyphEmit.m_nSubsetGlyphID = nNewId;
-                rNewGlyphEmit.m_aUnicode = (pUnicodes ? pUnicodes[i] : 0);
+                rNewGlyphEmit.setGlyphId( nNewId );
+                for( sal_Int32 n = 0; n < pUnicodesPerGlyph[i]; n++ )
+                    rNewGlyphEmit.addCode( pCurUnicode[n] );
 
                 // add new glyph to font mapping
                 Glyph& rNewGlyph = rSubset.m_aMapping[ nFontGlyphId ];
@@ -6678,7 +6681,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs,
             Ucs2OStrMap::const_iterator nonenc_it;
 
             sal_Int32 nCurFontID = nFontID;
-            sal_Ucs cChar = pUnicodes[i];
+            sal_Ucs cChar = *pCurUnicode;
             if( pEncoding )
             {
                 enc_it = pEncoding->find( cChar );
@@ -6740,7 +6743,7 @@ void PDFWriterImpl::registerGlyphs( int nGlyphs,
             pMappedGlyphs[ i ] = (sal_Int8)cChar;
             pMappedFontObjects[ i ] = nCurFontID;
             pGlyphWidths[ i ] = m_aFontCache.getGlyphWidth( pCurrentFont,
-                                                            (pEncoding ? pUnicodes[i] : cChar) | GF_ISCHAR,
+                                                            (pEncoding ? *pCurUnicode : cChar) | GF_ISCHAR,
                                                             false,
                                                             m_pReferenceDevice->mpGraphics );
         }
@@ -7020,7 +7023,9 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
     sal_Int32 pGlyphWidths[nMaxGlyphs];
     sal_uInt8 pMappedGlyphs[nMaxGlyphs];
     sal_Int32 pMappedFontObjects[nMaxGlyphs];
-    sal_Ucs   pUnicodes[nMaxGlyphs];
+    std::vector<sal_Ucs> aUnicodes;
+    aUnicodes.reserve( nMaxGlyphs );
+    sal_Int32 pUnicodesPerGlyph[nMaxGlyphs];
     int pCharPosAry[nMaxGlyphs];
     sal_Int32 nAdvanceWidths[nMaxGlyphs];
     const ImplFontData* pFallbackFonts[nMaxGlyphs];
@@ -7153,15 +7158,29 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
     Point aGNGlyphPos;
     while( (nGlyphs = rLayout.GetNextGlyphs( nTmpMaxGlyphs, pGlyphs, aGNGlyphPos, nIndex, nAdvanceWidths, pCharPosAry )) != 0 )
     {
+        aUnicodes.clear();
         for( int i = 0; i < nGlyphs; i++ )
         {
             pFallbackFonts[i] = rLayout.GetFallbackFontData( pGlyphs[i] );
 
+            // default case: 1 glyph is one unicode
+            pUnicodesPerGlyph[i] = 1;
             if( (pGlyphs[i] & GF_ISCHAR) )
-                pUnicodes[i] = static_cast<sal_Ucs>(pGlyphs[i] & GF_IDXMASK);
+            {
+                aUnicodes.push_back( static_cast<sal_Ucs>(pGlyphs[i] & GF_IDXMASK) );
+            }
             else if( pCharPosAry[i] >= nMinCharPos && pCharPosAry[i] <= nMaxCharPos )
             {
-                pUnicodes[i] = rText.GetChar( sal::static_int_cast<xub_StrLen>(pCharPosAry[i]) );
+                int nChars = 1;
+                aUnicodes.push_back( rText.GetChar( sal::static_int_cast<xub_StrLen>(pCharPosAry[i]) ) );
+                pUnicodesPerGlyph[i] = 1;
+                // try to handle ligatures and such
+                if( i < nGlyphs-1 )
+                {
+                    pUnicodesPerGlyph[i] = nChars = pCharPosAry[i+1] - pCharPosAry[i];
+                    for( int n = 1; n < nChars; n++ )
+                        aUnicodes.push_back( rText.GetChar( sal::static_int_cast<xub_StrLen>(pCharPosAry[i]+n) ) );
+                }
                 // #i36691# hack that is needed because currently the pGlyphs[]
                 // argument is ignored for embeddable fonts and so the layout
                 // engine's glyph work is ignored (i.e. char mirroring)
@@ -7169,17 +7188,21 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const String& rText, bool bT
                 // glyphid (i.e. FreeType's synthetic glyphid for a Type1 font)
                 // back to unicode and then to embeddable font's encoding
                 if( getReferenceDevice()->GetLayoutMode() & TEXT_LAYOUT_BIDI_RTL )
-                    pUnicodes[i] = static_cast<sal_Ucs>(GetMirroredChar(pUnicodes[i]));
+                {
+                    size_t nI = aUnicodes.size()-1;
+                    for( int n = 0; n < nChars; n++, nI-- )
+                        aUnicodes[nI] = static_cast<sal_Ucs>(GetMirroredChar(aUnicodes[nI]));
+                }
             }
             else
-                pUnicodes[i] = 0;
+                aUnicodes.push_back( 0 );
             // note: in case of ctl one character may result
             // in multiple glyphs. The current SalLayout
             // implementations set -1 then to indicate that no direct
             // mapping is possible
         }
 
-        registerGlyphs( nGlyphs, pGlyphs, pGlyphWidths, pUnicodes, pMappedGlyphs, pMappedFontObjects, pFallbackFonts );
+        registerGlyphs( nGlyphs, pGlyphs, pGlyphWidths, &aUnicodes[0], pUnicodesPerGlyph, pMappedGlyphs, pMappedFontObjects, pFallbackFonts );
 
         for( int i = 0; i < nGlyphs; i++ )
         {
@@ -9513,7 +9536,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
     sal_uInt64 nStartPos = 0;
     CHECK_RETURN( (osl_File_E_None == osl_getFilePos( m_aFile, &nStartPos )) );
 
-    checkAndEnableStreamEncryption(  rObject.m_nObject );
+    checkAndEnableStreamEncryption( rObject.m_nObject );
     beginCompression();
     if( ! bTrueColor || pAccess->GetScanlineFormat() == BMP_FORMAT_24BIT_TC_RGB )
     {
@@ -9527,7 +9550,7 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
     else
     {
         const int nScanLineBytes = pAccess->Width()*3;
-        sal_uInt8 *pCol = (sal_uInt8*)rtl_allocateMemory( nScanLineBytes );
+        boost::shared_array<sal_uInt8> pCol( new sal_uInt8[ nScanLineBytes ] );
         for( int y = 0; y < pAccess->Height(); y++ )
         {
             for( int x = 0; x < pAccess->Width(); x++ )
@@ -9537,9 +9560,8 @@ bool PDFWriterImpl::writeBitmapObject( BitmapEmit& rObject, bool bMask )
                 pCol[3*x+1] = aColor.GetGreen();
                 pCol[3*x+2] = aColor.GetBlue();
             }
-            CHECK_RETURN( writeBuffer( pCol, nScanLineBytes ) );
+            CHECK_RETURN( writeBuffer( pCol.get(), nScanLineBytes ) );
         }
-        rtl_freeMemory( pCol );
     }
     endCompression();
     disableStreamEncryption();
diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx
index e058cfa487db..4adf54ea98a3 100644
--- a/vcl/source/gdi/pdfwriter_impl.hxx
+++ b/vcl/source/gdi/pdfwriter_impl.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
  *
@@ -52,6 +52,8 @@
 #include <hash_map>
 #include <list>
 
+#include <boost/shared_array.hpp>
+
 class ImplFontSelectData;
 class ImplFontMetricData;
 class FontSubsetInfo;
@@ -270,10 +272,53 @@ public:
     };
 
     // font subsets
-    struct GlyphEmit
+    class GlyphEmit
     {
-        sal_Ucs     m_aUnicode;
-        sal_uInt8   m_nSubsetGlyphID;
+        // performance: actually this should probably a vector;
+        sal_Ucs                         m_aBufferedUnicodes[3];
+        sal_Int32                       m_nUnicodes;
+        sal_Int32                       m_nMaxUnicodes;
+        boost::shared_array<sal_Ucs>    m_pUnicodes;
+        sal_uInt8                       m_nSubsetGlyphID;
+
+    public:
+        GlyphEmit() : m_nUnicodes(0), m_nSubsetGlyphID(0)
+        {
+            rtl_zeroMemory( m_aBufferedUnicodes, sizeof( m_aBufferedUnicodes ) );
+            m_nMaxUnicodes = sizeof(m_aBufferedUnicodes)/sizeof(m_aBufferedUnicodes[0]);
+        }
+        ~GlyphEmit()
+        {
+        }
+
+        void setGlyphId( sal_uInt8 i_nId ) { m_nSubsetGlyphID = i_nId; }
+        sal_uInt8 getGlyphId() const { return m_nSubsetGlyphID; }
+
+        void addCode( sal_Ucs i_cCode )
+        {
+            if( m_nUnicodes == m_nMaxUnicodes )
+            {
+                sal_Ucs* pNew = new sal_Ucs[ 2 * m_nMaxUnicodes];
+                if( m_pUnicodes.get() )
+                    rtl_copyMemory( pNew, m_pUnicodes.get(), m_nMaxUnicodes * sizeof(sal_Ucs) );
+                else
+                    rtl_copyMemory( pNew, m_aBufferedUnicodes, m_nMaxUnicodes * sizeof(sal_Ucs) );
+                m_pUnicodes.reset( pNew );
+                m_nMaxUnicodes *= 2;
+            }
+            if( m_pUnicodes.get() )
+                m_pUnicodes[ m_nUnicodes++ ] = i_cCode;
+            else
+                m_aBufferedUnicodes[ m_nUnicodes++ ] = i_cCode;
+        }
+        sal_Int32 countCodes() const { return m_nUnicodes; }
+        sal_Ucs getCode( sal_Int32 i_nIndex ) const
+        {
+            sal_Ucs nRet = 0;
+            if( i_nIndex < m_nUnicodes )
+                nRet = m_pUnicodes.get() ? m_pUnicodes[ i_nIndex ] : m_aBufferedUnicodes[ i_nIndex ];
+            return nRet;
+        }
     };
     typedef std::map< sal_GlyphId, GlyphEmit > FontEmitMapping;
     struct FontEmit
@@ -860,7 +905,7 @@ i12626
     void appendLiteralStringEncrypt( rtl::OStringBuffer& rInString, const sal_Int32 nInObjectNumber, rtl::OStringBuffer& rOutBuffer );
 
     /* creates fonts and subsets that will be emitted later */
-    void registerGlyphs( int nGlyphs, sal_GlyphId* pGlyphs, sal_Int32* pGlpyhWidths, sal_Ucs* pUnicodes, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const ImplFontData* pFallbackFonts[] );
+    void registerGlyphs( int nGlyphs, sal_GlyphId* pGlyphs, sal_Int32* pGlpyhWidths, sal_Ucs* pUnicodes, sal_Int32* pUnicodesPerGlyph, sal_uInt8* pMappedGlyphs, sal_Int32* pMappedFontObjects, const ImplFontData* pFallbackFonts[] );
 
     /*  emits a text object according to the passed layout */
     /* TODO: remove rText as soon as SalLayout will change so that rText is not necessary anymore */
@@ -909,7 +954,7 @@ i12626
     /* writes a font descriptor and returns its object id (or 0) */
     sal_Int32 emitFontDescriptor( const ImplFontData*, FontSubsetInfo&, sal_Int32 nSubsetID, sal_Int32 nStream );
     /* writes a ToUnicode cmap, returns the corresponding stream object */
-    sal_Int32 createToUnicodeCMap( sal_uInt8* pEncoding, sal_Ucs* pUnicodes, int nGlyphs );
+    sal_Int32 createToUnicodeCMap( sal_uInt8* pEncoding, sal_Ucs* pUnicodes, sal_Int32* pUnicodesPerGlyph, sal_Int32* pEncToUnicodeIndex, int nGlyphs );
 
     /* get resource dict object number */
     sal_Int32 getResourceDictObj()
diff --git a/vcl/source/gdi/pngread.cxx b/vcl/source/gdi/pngread.cxx
index 834116a9ffe9..b7eb8e5f50bf 100644
--- a/vcl/source/gdi/pngread.cxx
+++ b/vcl/source/gdi/pngread.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: pngread.cxx,v $
- * $Revision: 1.28.78.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/pngwrite.cxx b/vcl/source/gdi/pngwrite.cxx
index 372be81aaef6..bd28135ca498 100644
--- a/vcl/source/gdi/pngwrite.cxx
+++ b/vcl/source/gdi/pngwrite.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: pngwrite.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/vcl/source/gdi/polyscan.cxx b/vcl/source/gdi/polyscan.cxx
index 7078b8f97e6c..eb329f8c6869 100644
--- a/vcl/source/gdi/polyscan.cxx
+++ b/vcl/source/gdi/polyscan.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: polyscan.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/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx
index 937d966b3978..2ea9bfcc4c11 100644
--- a/vcl/source/gdi/print.cxx
+++ b/vcl/source/gdi/print.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: print.cxx,v $
- * $Revision: 1.65 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,8 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#define _SPOOLPRINTER_EXT
-#define _RMPRINTER_EXT
 #define ENABLE_BYTESTRING_STREAM_OPERATORS
 #include <list>
 
@@ -58,7 +53,6 @@
 #include <vcl/print.h>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
-#include <vcl/impprn.hxx>
 #include <vcl/print.hxx>
 
 #include <comphelper/processfactory.hxx>
@@ -280,7 +274,9 @@ static void ImplInitPrnQueueList()
 
     pSVData->maGDIData.mpPrinterQueueList = new ImplPrnQueueList;
 
-    pSVData->mpDefInst->GetPrinterQueueInfo( pSVData->maGDIData.mpPrinterQueueList );
+    static const char* pEnv = getenv( "SAL_DISABLE_PRINTERLIST" );
+    if( !pEnv || !*pEnv )
+        pSVData->mpDefInst->GetPrinterQueueInfo( pSVData->maGDIData.mpPrinterQueueList );
 }
 
 // -----------------------------------------------------------------------
@@ -339,16 +335,20 @@ const QueueInfo* Printer::GetQueueInfo( const String& rPrinterName, bool bStatus
 
 XubString Printer::GetDefaultPrinterName()
 {
-    ImplSVData* pSVData = ImplGetSVData();
+    static const char* pEnv = getenv( "SAL_DISABLE_DEFAULTPRINTER" );
+    if( !pEnv || !*pEnv )
+    {
+        ImplSVData* pSVData = ImplGetSVData();
 
-    return pSVData->mpDefInst->GetDefaultPrinter();
+        return pSVData->mpDefInst->GetDefaultPrinter();
+    }
+    return XubString();
 }
 
 // =======================================================================
 
 void Printer::ImplInitData()
 {
-    mpPrinterData       = new ImplPrivatePrinterData();
     mbDevOutput         = FALSE;
     meOutDevType        = OUTDEV_PRINTER;
     mbDefPrinter        = FALSE;
@@ -366,8 +366,6 @@ void Printer::ImplInitData()
     mpInfoPrinter       = NULL;
     mpPrinter           = NULL;
     mpDisplayDev        = NULL;
-    mpQPrinter          = NULL;
-    mpQMtf              = NULL;
     mbIsQueuePrinter    = FALSE;
     mpPrinterOptions    = new PrinterOptions;
 
@@ -414,7 +412,6 @@ void Printer::ImplInit( SalPrinterQueueInfo* pInfo )
 
     mpInfoPrinter   = pSVData->mpDefInst->CreateInfoPrinter( pInfo, pJobSetup );
     mpPrinter       = NULL;
-    mpJobPrinter    = NULL;
     mpJobGraphics   = NULL;
     ImplUpdateJobSetupPaper( maJobSetup );
 
@@ -446,7 +443,6 @@ void Printer::ImplInitDisplay( const Window* pWindow )
 
     mpInfoPrinter       = NULL;
     mpPrinter           = NULL;
-    mpJobPrinter        = NULL;
     mpJobGraphics       = NULL;
 
     if ( pWindow )
@@ -518,6 +514,26 @@ void Printer::ImplUpdatePageData()
                                 mnOutWidth, mnOutHeight,
                                 maPageOffset.X(), maPageOffset.Y(),
                                 maPaperSize.Width(), maPaperSize.Height() );
+    static const char* pDebugOffset = getenv( "SAL_DBG_PAGEOFFSET" );
+    if( pDebugOffset )
+    {
+        rtl::OString aLine( pDebugOffset );
+        sal_Int32 nIndex = 0;
+        rtl::OString aToken( aLine.getToken( 0, ',', nIndex ) );
+        sal_Int32 nLeft = aToken.toInt32();
+        sal_Int32 nTop = nLeft;
+        if( nIndex > 0 )
+        {
+            aToken = aLine.getToken( 0, ',', nIndex );
+            nTop = aToken.toInt32();
+        }
+        maPageOffset = LogicToPixel( Point( static_cast<long>(nLeft),
+                                            static_cast<long>(nTop) ),
+                                     MapMode( MAP_100TH_MM )
+                                     );
+        mnOutWidth = maPaperSize.Width() - 2*maPageOffset.X();
+        mnOutWidth = maPaperSize.Width() - 2*maPageOffset.Y();
+    }
 }
 
 // -----------------------------------------------------------------------
@@ -602,11 +618,6 @@ Printer::~Printer()
 {
     DBG_ASSERT( !IsPrinting(), "Printer::~Printer() - Job is printing" );
     DBG_ASSERT( !IsJobActive(), "Printer::~Printer() - Job is active" );
-    DBG_ASSERT( !mpQPrinter, "Printer::~Printer() - QueuePrinter not destroyed" );
-    DBG_ASSERT( !mpQMtf, "Printer::~Printer() - QueueMetafile not destroyed" );
-
-    delete mpPrinterData;
-    mpPrinterData = NULL;
 
     delete mpPrinterOptions;
 
@@ -653,21 +664,11 @@ Printer::~Printer()
 }
 
 // -----------------------------------------------------------------------
-void Printer::SetNextJobIsQuick( bool bQuick )
-{
-    mpPrinterData->mbNextJobIsQuick = bQuick;
-    if( mpQPrinter )
-        mpQPrinter->SetNextJobIsQuick( bQuick );
-}
-
-// -----------------------------------------------------------------------
 void Printer::Compat_OldPrinterMetrics( bool bSet )
 {
     // propagate flag
     if( mpInfoPrinter )
         mpInfoPrinter->m_bCompatMetrics = bSet;
-    if( mpQPrinter )
-        mpQPrinter->Compat_OldPrinterMetrics( bSet );
 
     // get new font data
     ImplUpdateFontData( TRUE );
@@ -977,12 +978,13 @@ USHORT Printer::GetPaperBin() const
 // -----------------------------------------------------------------------
 
 // Map user paper format to a available printer paper formats
-void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup )
+void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup, bool bMatchNearest )
 {
     ImplJobSetup*   pSetupData = aJobSetup.ImplGetData();
 
     int     nLandscapeAngle = GetLandscapeAngle();
     int     nPaperCount     = GetPaperInfoCount();
+    bool    bFound = false;
 
     PaperInfo aInfo(pSetupData->mnPaperWidth, pSetupData->mnPaperHeight);
 
@@ -995,6 +997,8 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup )
         {
             pSetupData->mePaperFormat = ImplGetPaperFormat( rPaperInfo.getWidth(),
                                                             rPaperInfo.getHeight() );
+            pSetupData->meOrientation = ORIENTATION_PORTRAIT;
+            bFound = true;
             break;
         }
     }
@@ -1017,10 +1021,49 @@ void Printer::ImplFindPaperFormatForUserSize( JobSetup& aJobSetup )
             {
                 pSetupData->mePaperFormat = ImplGetPaperFormat( rPaperInfo.getWidth(),
                                                                 rPaperInfo.getHeight() );
+                pSetupData->meOrientation = ORIENTATION_LANDSCAPE;
+                bFound = true;
                 break;
             }
         }
     }
+
+    if( ! bFound && bMatchNearest )
+    {
+         sal_Int64 nBestMatch = SAL_MAX_INT64;
+         int nBestIndex = 0;
+         Orientation eBestOrientation = ORIENTATION_PORTRAIT;
+         for( int i = 0; i < nPaperCount; i++ )
+         {
+             const PaperInfo& rPaperInfo = GetPaperInfo( i );
+
+             // check protrait match
+             sal_Int64 nDX = pSetupData->mnPaperWidth - rPaperInfo.getWidth();
+             sal_Int64 nDY = pSetupData->mnPaperHeight - rPaperInfo.getHeight();
+             sal_Int64 nMatch = nDX*nDX + nDY*nDY;
+             if( nMatch < nBestMatch )
+             {
+                 nBestMatch = nMatch;
+                 nBestIndex = i;
+                 eBestOrientation = ORIENTATION_PORTRAIT;
+             }
+
+             // check landscape match
+             nDX = pSetupData->mnPaperWidth - rPaperInfo.getHeight();
+             nDY = pSetupData->mnPaperHeight - rPaperInfo.getWidth();
+             nMatch = nDX*nDX + nDY*nDY;
+             if( nMatch < nBestMatch )
+             {
+                 nBestMatch = nMatch;
+                 nBestIndex = i;
+                 eBestOrientation = ORIENTATION_LANDSCAPE;
+             }
+         }
+         const PaperInfo& rBestInfo = GetPaperInfo( nBestIndex );
+         pSetupData->mePaperFormat = ImplGetPaperFormat( rBestInfo.getWidth(),
+                                                         rBestInfo.getHeight() );
+         pSetupData->meOrientation = eBestOrientation;
+    }
 }
 
 // -----------------------------------------------------------------------
@@ -1051,7 +1094,7 @@ BOOL Printer::SetPaper( Paper ePaper )
 
         ImplReleaseGraphics();
         if ( ePaper == PAPER_USER )
-            ImplFindPaperFormatForUserSize( aJobSetup );
+            ImplFindPaperFormatForUserSize( aJobSetup, false );
         if ( mpInfoPrinter->SetData( SAL_JOBSET_PAPERSIZE|SAL_JOBSET_ORIENTATION, pSetupData ) )
         {
             ImplUpdateJobSetupPaper( aJobSetup );
@@ -1072,6 +1115,11 @@ BOOL Printer::SetPaper( Paper ePaper )
 
 BOOL Printer::SetPaperSizeUser( const Size& rSize )
 {
+    return SetPaperSizeUser( rSize, false );
+}
+
+BOOL Printer::SetPaperSizeUser( const Size& rSize, bool bMatchNearest )
+{
     if ( mbInPrintPage )
         return FALSE;
 
@@ -1095,7 +1143,7 @@ BOOL Printer::SetPaperSizeUser( const Size& rSize )
         }
 
         ImplReleaseGraphics();
-        ImplFindPaperFormatForUserSize( aJobSetup );
+        ImplFindPaperFormatForUserSize( aJobSetup, bMatchNearest );
 
         // Changing the paper size can also change the orientation!
         if ( mpInfoPrinter->SetData( SAL_JOBSET_PAPERSIZE|SAL_JOBSET_ORIENTATION, pSetupData ) )
@@ -1142,7 +1190,44 @@ const PaperInfo& Printer::GetPaperInfo( int nPaper ) const
 
 DuplexMode Printer::GetDuplexMode() const
 {
-    return mpInfoPrinter ? mpInfoPrinter->GetDuplexMode( maJobSetup.ImplGetConstData() ) : DUPLEX_UNKNOWN;
+    return maJobSetup.ImplGetConstData()->meDuplexMode;
+}
+
+// -----------------------------------------------------------------------
+
+BOOL Printer::SetDuplexMode( DuplexMode eDuplex )
+{
+    if ( mbInPrintPage )
+        return FALSE;
+
+    if ( maJobSetup.ImplGetConstData()->meDuplexMode != eDuplex )
+    {
+        JobSetup        aJobSetup = maJobSetup;
+        ImplJobSetup*   pSetupData = aJobSetup.ImplGetData();
+        pSetupData->meDuplexMode = eDuplex;
+
+        if ( IsDisplayPrinter() )
+        {
+            mbNewJobSetup = TRUE;
+            maJobSetup = aJobSetup;
+            return TRUE;
+        }
+
+        ImplReleaseGraphics();
+        if ( mpInfoPrinter->SetData( SAL_JOBSET_DUPLEXMODE, pSetupData ) )
+        {
+            ImplUpdateJobSetupPaper( aJobSetup );
+            mbNewJobSetup = TRUE;
+            maJobSetup = aJobSetup;
+            ImplUpdatePageData();
+            ImplUpdateFontList();
+            return TRUE;
+        }
+        else
+            return FALSE;
+    }
+
+    return TRUE;
 }
 
 // -----------------------------------------------------------------------
@@ -1184,9 +1269,10 @@ XubString Printer::GetPaperBinName( USHORT nPaperBin ) const
 
 // -----------------------------------------------------------------------
 
-BOOL Printer::SetCopyCount( USHORT nCopy, BOOL /*bCollate*/ )
+BOOL Printer::SetCopyCount( USHORT nCopy, BOOL bCollate )
 {
     mnCopyCount = nCopy;
+    mbCollateCopy = bCollate;
     return TRUE;
 }
 
@@ -1199,29 +1285,8 @@ void Printer::Error()
 
 // -----------------------------------------------------------------------
 
-void Printer::StartPrint()
-{
-    maStartPrintHdl.Call( this );
-}
-
-// -----------------------------------------------------------------------
-
-void Printer::EndPrint()
-{
-    maEndPrintHdl.Call( this );
-}
-
-// -----------------------------------------------------------------------
-
-void Printer::PrintPage()
-{
-    maPrintPageHdl.Call( this );
-}
-
-// -----------------------------------------------------------------------
-
 
-ULONG ImplSalPrinterErrorCodeToVCL( ULONG nError )
+ULONG Printer::ImplSalPrinterErrorCodeToVCL( ULONG nError )
 {
     ULONG nVCLError;
     switch ( nError )
@@ -1247,12 +1312,6 @@ void Printer::ImplEndPrint()
     mbPrinting      = FALSE;
     mnCurPrintPage  = 0;
     maJobName.Erase();
-    if( mpQPrinter ) // not necessarily filled e.g. after AbortJob
-    {
-        mpQPrinter->Destroy();
-        mpQPrinter = NULL;
-    }
-    EndPrint();
 }
 
 // -----------------------------------------------------------------------
@@ -1267,180 +1326,6 @@ IMPL_LINK( Printer, ImplDestroyPrinterAsync, void*, pSalPrinter )
 
 // -----------------------------------------------------------------------
 
-void Printer::ImplUpdateQuickStatus()
-{
-    // remove possibly added "IsQuickJob"
-    if( mpPrinterData->mbNextJobIsQuick )
-    {
-        rtl::OUString aKey( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) );
-        // const data means not really const, but change all references
-        // to refcounted job setup
-        ImplJobSetup* pImpSetup = maJobSetup.ImplGetConstData();
-        pImpSetup->maValueMap.erase( aKey );
-        mpPrinterData->mbNextJobIsQuick = false;
-    }
-}
-
-class QuickGuard
-{
-    Printer* mpPrinter;
-    public:
-    QuickGuard( Printer* pPrn ) : mpPrinter( pPrn ) {}
-    ~QuickGuard()
-    {
-        mpPrinter->ImplUpdateQuickStatus();
-    }
-};
-
-BOOL Printer::StartJob( const XubString& rJobName )
-{
-    mnError = PRINTER_OK;
-
-    if ( IsDisplayPrinter() )
-        return FALSE;
-
-    if ( IsJobActive() || IsPrinting() )
-        return FALSE;
-
-    if( mpPrinterData->mbNextJobIsQuick )
-    {
-        String aKey( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) );
-        if( maJobSetup.GetValue( aKey ).Len() == 0 )
-            maJobSetup.SetValue( aKey, String( RTL_CONSTASCII_USTRINGPARAM( "true" ) ) );
-    }
-
-    QuickGuard aQGuard( this );
-
-    ULONG   nCopies = mnCopyCount;
-    BOOL    bCollateCopy = mbCollateCopy;
-    BOOL    bUserCopy = FALSE;
-    if ( IsQueuePrinter() )
-    {
-        if ( ((ImplQPrinter*)this)->IsUserCopy() )
-        {
-            nCopies = 1;
-            bCollateCopy = FALSE;
-        }
-    }
-    else
-    {
-        if ( nCopies > 1 )
-        {
-            ULONG nDevCopy;
-
-            if ( bCollateCopy )
-                nDevCopy = GetCapabilities( PRINTER_CAPABILITIES_COLLATECOPIES );
-            else
-                nDevCopy = GetCapabilities( PRINTER_CAPABILITIES_COPIES );
-
-            // Muessen Kopien selber gemacht werden?
-            if ( nCopies > nDevCopy )
-            {
-                bUserCopy = TRUE;
-                nCopies = 1;
-                bCollateCopy = FALSE;
-            }
-        }
-        else
-            bCollateCopy = FALSE;
-
-        // we need queue printing
-        if( !mnPageQueueSize )
-            mnPageQueueSize = 1;
-    }
-
-    if ( !mnPageQueueSize )
-    {
-        ImplSVData* pSVData = ImplGetSVData();
-        mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter );
-
-        if ( !mpPrinter )
-            return FALSE;
-
-        XubString* pPrintFile;
-        if ( mbPrintFile )
-            pPrintFile = &maPrintFile;
-        else
-            pPrintFile = NULL;
-
-        // #125075# StartJob can Reschedule on Windows, sfx
-        // depends on IsPrinting() in case of closing a document
-        BOOL bSaveNewJobSetup   = mbNewJobSetup;
-        mbNewJobSetup           = FALSE;
-        String aSaveJobName     = maJobName;
-        maJobName               = rJobName;
-        mnCurPage               = 1;
-        mnCurPrintPage          = 1;
-        mbPrinting              = TRUE;
-
-        if( ! ImplGetSVData()->maGDIData.mbPrinterPullModel )
-        {
-            // in the pull model the job can only be started when
-            // we have collected all pages to be printed
-            if ( !mpPrinter->StartJob( pPrintFile, rJobName, Application::GetDisplayName(),
-                                       nCopies, bCollateCopy,
-                                       maJobSetup.ImplGetConstData() ) )
-            {
-                mnError = ImplSalPrinterErrorCodeToVCL( mpPrinter->GetErrorCode() );
-                if ( !mnError )
-                    mnError = PRINTER_GENERALERROR;
-                pSVData->mpDefInst->DestroyPrinter( mpPrinter );
-                mbNewJobSetup       = bSaveNewJobSetup;
-                maJobName           = aSaveJobName;
-                mnCurPage           = 0;
-                mnCurPrintPage      = 0;
-                mbPrinting          = FALSE;
-                mpPrinter = NULL;
-                return FALSE;
-            }
-        }
-
-        mbJobActive             = TRUE;
-        StartPrint();
-    }
-    else
-    {
-        mpQPrinter = new ImplQPrinter( this );
-        if( mpInfoPrinter )
-            mpQPrinter->Compat_OldPrinterMetrics( mpInfoPrinter->m_bCompatMetrics );
-        mpQPrinter->SetDigitLanguage( GetDigitLanguage() );
-        mpQPrinter->SetUserCopy( bUserCopy );
-        mpQPrinter->SetPrinterOptions( *mpPrinterOptions );
-
-        // #125075# StartJob can Reschedule on Windows, sfx
-        // depends on IsPrinting() in case of closing a document
-        BOOL bSaveNewJobSetup   = mbNewJobSetup;
-        mbNewJobSetup           = FALSE;
-        String aSaveJobName     = maJobName;
-        maJobName               = rJobName;
-        mnCurPage               = 1;
-        mbPrinting              = TRUE;
-
-        if ( mpQPrinter->StartJob( rJobName ) )
-        {
-            mbJobActive             = TRUE;
-            StartPrint();
-            mpQPrinter->StartQueuePrint();
-        }
-        else
-        {
-            mbNewJobSetup   = bSaveNewJobSetup;
-            maJobName       = aSaveJobName;
-            mnCurPage       = 0;
-            mbPrinting      = FALSE;
-            mnError = mpQPrinter->GetErrorCode();
-            mpQPrinter->Destroy();
-            mpQPrinter = NULL;
-            return FALSE;
-        }
-    }
-
-
-    return TRUE;
-}
-
-// -----------------------------------------------------------------------
-
 BOOL Printer::EndJob()
 {
     BOOL bRet = FALSE;
@@ -1451,7 +1336,7 @@ BOOL Printer::EndJob()
 
     mbJobActive = FALSE;
 
-    if ( mpPrinter || mpQPrinter )
+    if ( mpPrinter )
     {
         ImplReleaseGraphics();
 
@@ -1459,23 +1344,17 @@ BOOL Printer::EndJob()
 
         bRet = TRUE;
 
-        if ( mpPrinter )
-        {
-            mbPrinting      = FALSE;
-            mnCurPrintPage  = 0;
-            maJobName.Erase();
-
-            mbDevOutput = FALSE;
-            bRet = mpPrinter->EndJob();
-            // Hier den Drucker nicht asyncron zerstoeren, da es
-            // W95 nicht verkraftet, wenn gleichzeitig gedruckt wird
-            // und ein Druckerobjekt zerstoert wird
-            ImplGetSVData()->mpDefInst->DestroyPrinter( mpPrinter );
-            mpPrinter = NULL;
-            EndPrint();
-        }
-        else
-            mpQPrinter->EndQueuePrint();
+        mbPrinting      = FALSE;
+        mnCurPrintPage  = 0;
+        maJobName.Erase();
+
+        mbDevOutput = FALSE;
+        bRet = mpPrinter->EndJob();
+        // Hier den Drucker nicht asyncron zerstoeren, da es
+        // W95 nicht verkraftet, wenn gleichzeitig gedruckt wird
+        // und ein Druckerobjekt zerstoert wird
+        ImplGetSVData()->mpDefInst->DestroyPrinter( mpPrinter );
+        mpPrinter = NULL;
     }
 
     return bRet;
@@ -1494,35 +1373,18 @@ BOOL Printer::AbortJob()
     mbInPrintPage   = FALSE;
     mpJobGraphics   = NULL;
 
-    if ( mpPrinter || mpQPrinter )
+    if ( mpPrinter )
     {
         mbPrinting      = FALSE;
         mnCurPage       = 0;
         mnCurPrintPage  = 0;
         maJobName.Erase();
 
-        if ( mpPrinter )
-        {
-            ImplReleaseGraphics();
-            mbDevOutput = FALSE;
-            mpPrinter->AbortJob();
-            Application::PostUserEvent( LINK( this, Printer, ImplDestroyPrinterAsync ), mpPrinter );
-            mpPrinter = NULL;
-            EndPrint();
-        }
-        else
-        {
-            mpQPrinter->AbortQueuePrint();
-            mpQPrinter->Destroy();
-            mpQPrinter = NULL;
-            if ( mpQMtf )
-            {
-                mpQMtf->Clear();
-                delete mpQMtf;
-                mpQMtf = NULL;
-            }
-            EndPrint();
-        }
+        ImplReleaseGraphics();
+        mbDevOutput = FALSE;
+        mpPrinter->AbortJob();
+        Application::PostUserEvent( LINK( this, Printer, ImplDestroyPrinterAsync ), mpPrinter );
+        mpPrinter = NULL;
 
         return TRUE;
     }
@@ -1532,88 +1394,49 @@ BOOL Printer::AbortJob()
 
 // -----------------------------------------------------------------------
 
-BOOL Printer::StartPage()
+void Printer::ImplStartPage()
 {
     if ( !IsJobActive() )
-        return FALSE;
+        return;
 
-    if ( mpPrinter || mpQPrinter )
+    if ( mpPrinter )
     {
-        if ( mpPrinter )
-        {
-            SalGraphics* pGraphics = mpPrinter->StartPage( maJobSetup.ImplGetConstData(), mbNewJobSetup );
-            if ( pGraphics )
-            {
-                ImplReleaseGraphics();
-                mpJobGraphics = pGraphics;
-            }
-            mbDevOutput = TRUE;
-        }
-        else
+        SalGraphics* pGraphics = mpPrinter->StartPage( maJobSetup.ImplGetConstData(), mbNewJobSetup );
+        if ( pGraphics )
         {
-            ImplGetGraphics();
-            mpJobGraphics = mpGraphics;
+            ImplReleaseGraphics();
+            mpJobGraphics = pGraphics;
         }
+        mbDevOutput = TRUE;
 
         // PrintJob not aborted ???
         if ( IsJobActive() )
         {
             mbInPrintPage = TRUE;
             mnCurPage++;
-            if ( mpQPrinter )
-            {
-                mpQPrinter->SetPrinterOptions( *mpPrinterOptions );
-                mpQMtf = new GDIMetaFile;
-                mpQMtf->Record( this );
-                mpQMtf->SaveStatus();
-            }
-            else
-            {
-                mnCurPrintPage++;
-                PrintPage();
-            }
+            mnCurPrintPage++;
         }
-
-        return TRUE;
     }
-
-    return FALSE;
 }
 
 // -----------------------------------------------------------------------
 
-BOOL Printer::EndPage()
+void Printer::ImplEndPage()
 {
     if ( !IsJobActive() )
-        return FALSE;
+        return;
 
     mbInPrintPage = FALSE;
 
-    if ( mpPrinter || mpQPrinter )
+    if ( mpPrinter )
     {
-        if ( mpPrinter )
-        {
-            mpPrinter->EndPage();
-            ImplReleaseGraphics();
-            mbDevOutput = FALSE;
-        }
-        else if ( mpQPrinter )
-        {
-            // Eigentuemeruebergang an QPrinter
-            mpQMtf->Stop();
-            mpQMtf->WindStart();
-            GDIMetaFile* pPage = mpQMtf;
-            mpQMtf = NULL;
-            mpQPrinter->AddQueuePage( pPage, mnCurPage, mbNewJobSetup );
-        }
+        mpPrinter->EndPage();
+        ImplReleaseGraphics();
+        mbDevOutput = FALSE;
 
         mpJobGraphics = NULL;
         mbNewJobSetup = FALSE;
-
-        return TRUE;
     }
-
-    return FALSE;
 }
 
 // -----------------------------------------------------------------------
diff --git a/vcl/source/gdi/print2.cxx b/vcl/source/gdi/print2.cxx
index 685f68fe7af3..d560b0b6e7cc 100644
--- a/vcl/source/gdi/print2.cxx
+++ b/vcl/source/gdi/print2.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: print2.cxx,v $
- * $Revision: 1.24.86.3 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,8 +28,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
-#define _SPOOLPRINTER_EXT
-
 #include <functional>
 #include <algorithm>
 #include <utility>
@@ -648,7 +643,9 @@ static bool ImplIsActionHandlingTransparency( const MetaAction& rAct )
 bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf, GDIMetaFile& rOutMtf,
                                                      long nMaxBmpDPIX, long nMaxBmpDPIY,
                                                      bool bReduceTransparency, bool bTransparencyAutoMode,
-                                                     bool bDownsampleBitmaps )
+                                                     bool bDownsampleBitmaps,
+                                                     const Color& rBackground
+                                                     )
 {
     MetaAction*             pCurrAct;
     bool                    bTransparent( false );
@@ -737,6 +734,20 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         bool bStillBackground=true; // true until first non-bg action
         nActionNum=0; nLastBgAction=-1;
         pCurrAct=const_cast<GDIMetaFile&>(rInMtf).FirstAction();
+        if( rBackground != Color( COL_TRANSPARENT ) )
+        {
+            aBackgroundComponent.aBgColor = rBackground;
+            if( meOutDevType == OUTDEV_PRINTER )
+            {
+                Printer* pThis = dynamic_cast<Printer*>(this);
+                Point aPageOffset = pThis->GetPageOffsetPixel();
+                aPageOffset = Point( 0, 0 ) - aPageOffset;
+                Size aSize  = pThis->GetPaperSizePixel();
+                aBackgroundComponent.aBounds = Rectangle( aPageOffset, aSize );
+            }
+            else
+                aBackgroundComponent.aBounds = Rectangle( Point( 0, 0 ), GetOutputSizePixel() );
+        }
         while( pCurrAct && bStillBackground )
         {
             switch( pCurrAct->GetType() )
@@ -880,7 +891,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
             //
 
             // if aBBCurrAct is empty, it will intersect with no
-            // aCCList member. Thus, we can safe us the check.
+            // aCCList member. Thus, we can save the check.
             // Furthermore, this ensures that non-output-generating
             // actions get their own aCCList entry, which is necessary
             // when copying them to the output metafile (see stage 4
@@ -1110,7 +1121,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
         //  ====================================================
         //
 
-        Point aTmpPoint;
+        Point aPageOffset;
         Size aTmpSize( GetOutputSizePixel() );
         if( mpPDFWriter )
         {
@@ -1120,7 +1131,14 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
             // also add error code to PDFWriter
             mpPDFWriter->insertError( vcl::PDFWriter::Warning_Transparency_Converted );
         }
-        const Rectangle aOutputRect( aTmpPoint, aTmpSize );
+        else if( meOutDevType == OUTDEV_PRINTER )
+        {
+            Printer* pThis = dynamic_cast<Printer*>(this);
+            aPageOffset = pThis->GetPageOffsetPixel();
+            aPageOffset = Point( 0, 0 ) - aPageOffset;
+            aTmpSize  = pThis->GetPaperSizePixel();
+        }
+        const Rectangle aOutputRect( aPageOffset, aTmpSize );
         bool bTiling = dynamic_cast<Printer*>(this) != NULL;
 
         // iterate over all aCCList members and generate bitmaps for the special ones
@@ -1228,7 +1246,7 @@ bool OutputDevice::RemoveTransparenciesFromMetaFile( const GDIMetaFile& rInMtf,
                                             pCurrAct->Execute( &aPaintVDev );
                                         }
 
-                                        if( !( nActionNum % 4 ) )
+                                        if( !( nActionNum % 8 ) )
                                             Application::Reschedule();
                                     }
 
diff --git a/vcl/source/gdi/print3.cxx b/vcl/source/gdi/print3.cxx
new file mode 100644
index 000000000000..de7cd2e139da
--- /dev/null
+++ b/vcl/source/gdi/print3.cxx
@@ -0,0 +1,1762 @@
+/*************************************************************************
+ *
+ * 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_vcl.hxx"
+
+#include "vcl/print.hxx"
+#include "vcl/prndlg.hxx"
+#include "vcl/svapp.hxx"
+#include "vcl/svdata.hxx"
+#include "vcl/salinst.hxx"
+#include "vcl/salprn.hxx"
+#include "vcl/svids.hrc"
+#include "vcl/metaact.hxx"
+#include "vcl/msgbox.hxx"
+
+#include "tools/urlobj.hxx"
+
+#include "com/sun/star/ui/dialogs/XFilePicker.hpp"
+#include "com/sun/star/ui/dialogs/XFilterManager.hpp"
+#include "com/sun/star/ui/dialogs/TemplateDescription.hpp"
+#include "com/sun/star/ui/dialogs/ExecutableDialogResults.hpp"
+#include "com/sun/star/view/DuplexMode.hpp"
+#include "com/sun/star/lang/XMultiServiceFactory.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "comphelper/processfactory.hxx"
+
+#include <hash_map>
+#include <hash_set>
+
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::beans;
+using namespace vcl;
+
+class ImplPageCache
+{
+    struct CacheEntry
+    {
+        GDIMetaFile                 aPage;
+        PrinterController::PageSize aSize;
+    };
+
+    std::vector< CacheEntry >  maPages;
+    std::vector< sal_Int32 >    maPageNumbers;
+    std::vector< sal_Int32 >    maCacheRanking;
+
+    static const sal_Int32 nCacheSize = 6;
+
+    void updateRanking( sal_Int32 nLastHit )
+    {
+        if( maCacheRanking[0] != nLastHit )
+        {
+            bool bMove = false;
+            for( sal_Int32 i = nCacheSize-1; i > 0; i-- )
+            {
+                if( maCacheRanking[i] == nLastHit )
+                    bMove = true;
+                maCacheRanking[i] = maCacheRanking[i-1];
+            }
+            maCacheRanking[0] = nLastHit;
+        }
+    }
+
+public:
+    ImplPageCache()
+    : maPages( nCacheSize )
+    , maPageNumbers( nCacheSize, -1 )
+    , maCacheRanking( nCacheSize )
+    {
+        for( sal_Int32 i = 0; i < nCacheSize; i++ )
+            maCacheRanking[i] = nCacheSize - i - 1;
+    }
+
+    // caution: does not ensure uniqueness
+    void insert( sal_Int32 i_nPageNo, const GDIMetaFile& i_rPage, const PrinterController::PageSize& i_rSize )
+    {
+        sal_Int32 nReplacePage = maCacheRanking.back();
+        maPages[ nReplacePage ].aPage = i_rPage;
+        maPages[ nReplacePage ].aSize = i_rSize;
+        maPageNumbers[ nReplacePage ] = i_nPageNo;
+        // cache insertion means in our case, the page was just queried
+        // so update the ranking
+        updateRanking( nReplacePage );
+    }
+
+    // caution: bad algorithm; should there ever be reason to increase the cache size beyond 6
+    // this needs to be urgently rewritten. However do NOT increase the cache size lightly,
+    // whole pages can be rather memory intensive
+    bool get( sal_Int32 i_nPageNo, GDIMetaFile& o_rPageFile, PrinterController::PageSize& o_rSize )
+    {
+        for( sal_Int32 i = 0; i < nCacheSize; ++i )
+        {
+            if( maPageNumbers[i] == i_nPageNo )
+            {
+                updateRanking( i );
+                o_rPageFile = maPages[i].aPage;
+                o_rSize = maPages[i].aSize;
+                return true;
+            }
+        }
+        return false;
+    }
+
+    void invalidate()
+    {
+        for( sal_Int32 i = 0; i < nCacheSize; ++i )
+        {
+            maPageNumbers[i] = -1;
+            maPages[i].aPage.Clear();
+            maCacheRanking[i] = nCacheSize - i - 1;
+        }
+    }
+};
+
+class vcl::ImplPrinterControllerData
+{
+public:
+    struct ControlDependency
+    {
+        rtl::OUString       maDependsOnName;
+        sal_Int32           mnDependsOnEntry;
+
+        ControlDependency() : mnDependsOnEntry( -1 ) {}
+    };
+
+    typedef std::hash_map< rtl::OUString, size_t, rtl::OUStringHash > PropertyToIndexMap;
+    typedef std::hash_map< rtl::OUString, ControlDependency, rtl::OUStringHash > ControlDependencyMap;
+
+    boost::shared_ptr<Printer>                                  mpPrinter;
+    Sequence< PropertyValue >                                   maUIOptions;
+    std::vector< PropertyValue >                                maUIProperties;
+    std::vector< bool >                                         maUIPropertyEnabled;
+    PropertyToIndexMap                                          maPropertyToIndex;
+    Link                                                        maOptionChangeHdl;
+    ControlDependencyMap                                        maControlDependencies;
+    sal_Bool                                                    mbFirstPage;
+    sal_Bool                                                    mbLastPage;
+    sal_Bool                                                    mbReversePageOrder;
+    view::PrintableState                                        meJobState;
+
+    vcl::PrinterController::MultiPageSetup                      maMultiPage;
+
+    vcl::PrintProgressDialog*                                   mpProgress;
+
+    ImplPageCache                                               maPageCache;
+
+    // set by user through printer config dialog
+    // if set, pages are centered and trimmed onto the fixed page
+    Size                                                        maFixedPageSize;
+
+    ImplPrinterControllerData() :
+        mbFirstPage( sal_True ),
+        mbLastPage( sal_False ),
+        mbReversePageOrder( sal_False ),
+        meJobState( view::PrintableState_JOB_STARTED ),
+        mpProgress( NULL )
+    {}
+    ~ImplPrinterControllerData() { delete mpProgress; }
+
+    Size getRealPaperSize( const Size& i_rPageSize ) const
+    {
+        if( maFixedPageSize.Width() > 0 && maFixedPageSize.Height() > 0 )
+            return maFixedPageSize;
+        if( maMultiPage.nRows * maMultiPage.nColumns > 1 )
+            return maMultiPage.aPaperSize;
+        return i_rPageSize;
+    }
+    bool isFixedPageSize() const
+    { return maFixedPageSize.Width() != 0 && maFixedPageSize.Height() != 0; }
+    PrinterController::PageSize modifyJobSetup( const Sequence< PropertyValue >& i_rProps );
+};
+
+PrinterController::PrinterController()
+    : mpImplData( new ImplPrinterControllerData )
+{
+}
+
+PrinterController::PrinterController( const boost::shared_ptr<Printer>& i_pPrinter )
+    : mpImplData( new ImplPrinterControllerData )
+{
+    mpImplData->mpPrinter = i_pPrinter;
+}
+
+static rtl::OUString queryFile( Printer* pPrinter )
+{
+    rtl::OUString aResult;
+
+    uno::Reference< lang::XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory() );
+    if( xFactory.is() )
+    {
+        uno::Sequence< uno::Any > aTempl( 1 );
+        aTempl.getArray()[0] <<= ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION;
+        uno::Reference< ui::dialogs::XFilePicker > xFilePicker(
+            xFactory->createInstanceWithArguments(
+                ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.dialogs.FilePicker" ) ),
+                aTempl ), uno::UNO_QUERY );
+        DBG_ASSERT( xFilePicker.is(), "could not get FilePicker service" );
+
+        uno::Reference< ui::dialogs::XFilterManager > xFilterMgr( xFilePicker, uno::UNO_QUERY );
+        if( xFilePicker.is() && xFilterMgr.is() )
+        {
+            try
+            {
+#ifdef UNX
+                // add PostScript and PDF
+                bool bPS = true, bPDF = true;
+                if( pPrinter )
+                {
+                    if( pPrinter->GetCapabilities( PRINTER_CAPABILITIES_PDF ) )
+                        bPS = false;
+                    else
+                        bPDF = false;
+                }
+                if( bPS )
+                    xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PostScript" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.ps" ) ) );
+                if( bPDF )
+                    xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Portable Document Format" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.pdf" ) ) );
+#elif defined WNT
+        (void)pPrinter;
+                xFilterMgr->appendFilter( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.PRN" ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.prn" ) ) );
+#endif
+                // add arbitrary files
+                xFilterMgr->appendFilter( String( VclResId( SV_STDTEXT_ALLFILETYPES ) ), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) );
+            }
+            catch( lang::IllegalArgumentException rExc )
+            {
+                DBG_ERRORFILE( "caught IllegalArgumentException when registering filter\n" );
+            }
+
+            if( xFilePicker->execute() == ui::dialogs::ExecutableDialogResults::OK )
+            {
+                uno::Sequence< ::rtl::OUString > aPathSeq( xFilePicker->getFiles() );
+                INetURLObject aObj( aPathSeq[0] );
+                aResult = aObj.PathToFileName();
+            }
+        }
+    }
+    return aResult;
+}
+
+struct PrintJobAsync
+{
+    boost::shared_ptr<PrinterController>  mpController;
+    JobSetup                            maInitSetup;
+
+    PrintJobAsync( const boost::shared_ptr<PrinterController>& i_pController,
+                   const JobSetup& i_rInitSetup
+                   )
+    : mpController( i_pController ), maInitSetup( i_rInitSetup )
+    {}
+
+    DECL_LINK( ExecJob, void* );
+};
+
+IMPL_LINK( PrintJobAsync, ExecJob, void*, EMPTYARG )
+{
+    Printer::ImplPrintJob( mpController, maInitSetup );
+
+    // clean up, do not access members after this
+    delete this;
+
+    return 0;
+}
+
+void Printer::PrintJob( const boost::shared_ptr<PrinterController>& i_pController,
+                        const JobSetup& i_rInitSetup
+                        )
+{
+    sal_Bool bSynchronous = sal_False;
+    beans::PropertyValue* pVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Wait" ) ) );
+    if( pVal )
+        pVal->Value >>= bSynchronous;
+
+    if( bSynchronous )
+        ImplPrintJob( i_pController, i_rInitSetup );
+    else
+    {
+        PrintJobAsync* pAsync = new PrintJobAsync( i_pController, i_rInitSetup );
+        Application::PostUserEvent( LINK( pAsync, PrintJobAsync, ExecJob ) );
+    }
+}
+
+void Printer::ImplPrintJob( const boost::shared_ptr<PrinterController>& i_pController,
+                            const JobSetup& i_rInitSetup
+                            )
+{
+    boost::shared_ptr<PrinterController> pController( i_pController );
+
+    // check if there is a default printer; if not, show an error box (if appropriate)
+    if( GetDefaultPrinterName().Len() == 0  )
+    {
+        if(  pController->isShowDialogs()
+             // && ! pController->isDirectPrint()
+           )
+        {
+            ErrorBox aBox( NULL, VclResId( SV_PRINT_NOPRINTERWARNING ) );
+            aBox.Execute();
+        }
+        pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDirect" ) ),
+                               makeAny( sal_False ) );
+    }
+
+    // setup printer
+
+    // if no specific printer is already set, create one
+    if( ! pController->getPrinter() )
+    {
+        boost::shared_ptr<Printer> pPrinter( new Printer( i_rInitSetup.GetPrinterName() ) );
+        pController->setPrinter( pPrinter );
+    }
+
+    // reset last page property
+    i_pController->setLastPage( sal_False );
+
+    // update "PageRange" property inferring from other properties:
+    // case 1: "Pages" set from UNO API ->
+    //         setup "Print Selection" and insert "PageRange" attribute
+    // case 2: "All pages" is selected
+    //         update "Page range" attribute to have a sensible default,
+    //         but leave "All" as selected
+
+    // "Pages" attribute from API is now equivalent to "PageRange"
+    // AND "PrintContent" = 1 except calc where it is "PrintRange" = 1
+    // Argh ! That sure needs cleaning up
+    beans::PropertyValue* pContentVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintRange" ) ) );
+    if( ! pContentVal )
+        pContentVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintContent" ) ) );
+
+    // case 1: UNO API has set "Pages"
+    beans::PropertyValue* pPagesVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Pages" ) ) );
+    if( pPagesVal )
+    {
+        rtl::OUString aPagesVal;
+        pPagesVal->Value >>= aPagesVal;
+        if( aPagesVal.getLength() )
+        {
+            // "Pages" attribute from API is now equivalent to "PageRange"
+            // AND "PrintContent" = 1 except calc where it is "PrintRange" = 1
+            // Argh ! That sure needs cleaning up
+            if( pContentVal )
+            {
+                pContentVal->Value = makeAny( sal_Int32( 1 ) );
+                i_pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), pPagesVal->Value );
+            }
+        }
+    }
+    // case 2: is "All" selected ?
+    else if( pContentVal )
+    {
+        sal_Int32 nContent = -1;
+        if( pContentVal->Value >>= nContent )
+        {
+            if( nContent == 0 )
+            {
+                sal_Int32 nPages = i_pController->getPageCount();
+                if( nPages > 0 )
+                {
+                    rtl::OUStringBuffer aBuf( 32 );
+                    aBuf.appendAscii( "1" );
+                    if( nPages > 1 )
+                    {
+                        aBuf.appendAscii( "-" );
+                        aBuf.append( nPages );
+                    }
+                    i_pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PageRange" ) ), makeAny( aBuf.makeStringAndClear() ) );
+                }
+            }
+        }
+    }
+
+    beans::PropertyValue* pReverseVal = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintReverse" ) ) );
+    if( pReverseVal )
+    {
+        sal_Bool bReverse = sal_False;
+        pReverseVal->Value >>= bReverse;
+        pController->setReversePrint( bReverse );
+    }
+
+    // in direct print case check whether there is anything to print.
+    // if not, show an errorbox (if appropriate)
+    if( pController->isShowDialogs() && pController->isDirectPrint() )
+    {
+        if( pController->getFilteredPageCount() == 0 )
+        {
+            ErrorBox aBox( NULL, VclResId( SV_PRINT_NOCONTENT ) );
+            aBox.Execute();
+            return;
+        }
+    }
+
+    // check if the printer brings up its own dialog
+    // in that case leave the work to that dialog
+    if( ! pController->getPrinter()->GetCapabilities( PRINTER_CAPABILITIES_EXTERNALDIALOG ) &&
+        ! pController->isDirectPrint() &&
+        pController->isShowDialogs()
+        )
+    {
+        try
+        {
+            PrintDialog aDlg( NULL, i_pController );
+            if( ! aDlg.Execute() )
+            {
+                GDIMetaFile aPageFile;
+                i_pController->setLastPage( sal_True );
+                i_pController->getFilteredPageFile( 0, aPageFile );
+                return;
+            }
+            if( aDlg.isPrintToFile() )
+            {
+                rtl::OUString aFile = queryFile( pController->getPrinter().get() );
+                if( ! aFile.getLength() )
+                {
+                    GDIMetaFile aPageFile;
+                    i_pController->setLastPage( sal_True );
+                    i_pController->getFilteredPageFile( 0, aPageFile );
+                    return;
+                }
+                pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LocalFileName" ) ),
+                                     makeAny( aFile ) );
+            }
+        }
+        catch( std::bad_alloc& )
+        {
+        }
+    }
+
+    pController->pushPropertiesToPrinter();
+
+    rtl::OUString aJobName;
+    beans::PropertyValue* pJobNameVal = pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobName" ) ) );
+    if( pJobNameVal )
+        pJobNameVal->Value >>= aJobName;
+
+    pController->getPrinter()->StartJob( String( aJobName ), pController );
+
+    pController->jobFinished( pController->getJobState() );
+}
+
+bool Printer::StartJob( const rtl::OUString& i_rJobName, boost::shared_ptr<vcl::PrinterController>& i_pController )
+{
+    mnError = PRINTER_OK;
+
+    if ( IsDisplayPrinter() )
+        return FALSE;
+
+    if ( IsJobActive() || IsPrinting() )
+        return FALSE;
+
+    ULONG   nCopies = mnCopyCount;
+    bool    bCollateCopy = mbCollateCopy;
+    bool    bUserCopy = FALSE;
+
+    if ( nCopies > 1 )
+    {
+        ULONG nDevCopy;
+
+        if ( bCollateCopy )
+            nDevCopy = GetCapabilities( PRINTER_CAPABILITIES_COLLATECOPIES );
+        else
+            nDevCopy = GetCapabilities( PRINTER_CAPABILITIES_COPIES );
+
+        // need to do copies by hand ?
+        if ( nCopies > nDevCopy )
+        {
+            bUserCopy = TRUE;
+            nCopies = 1;
+            bCollateCopy = FALSE;
+        }
+    }
+    else
+        bCollateCopy = FALSE;
+
+
+    ImplSVData* pSVData = ImplGetSVData();
+    mpPrinter = pSVData->mpDefInst->CreatePrinter( mpInfoPrinter );
+
+    if ( !mpPrinter )
+        return FALSE;
+
+    // remark: currently it is still possible to use EnablePrintFile and
+    // SetPrintFileName to redirect printout into file
+    // it can be argued that those methods should be removed in favor
+    // of only using the LocalFileName property
+    beans::PropertyValue* pFileValue = i_pController->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LocalFileName" ) ) );
+    if( pFileValue )
+    {
+        rtl::OUString aFile;
+        pFileValue->Value >>= aFile;
+        if( aFile.getLength() )
+        {
+            mbPrintFile = TRUE;
+            maPrintFile = aFile;
+        }
+    }
+
+    XubString* pPrintFile = NULL;
+    if ( mbPrintFile )
+        pPrintFile = &maPrintFile;
+
+    maJobName               = i_rJobName;
+    mnCurPage               = 1;
+    mnCurPrintPage          = 1;
+    mbPrinting              = TRUE;
+    if( ImplGetSVData()->maGDIData.mbPrinterPullModel )
+    {
+        mbJobActive             = TRUE;
+        // sallayer does all necessary page printing
+        // and also handles showing a dialog
+        // that also means it must call jobStarted when the dialog is finished
+        // it also must set the JobState of the Controller
+        if( mpPrinter->StartJob( pPrintFile,
+                                 i_rJobName,
+                                 Application::GetDisplayName(),
+                                 maJobSetup.ImplGetConstData(),
+                                 *i_pController ) )
+        {
+            EndJob();
+        }
+        else
+        {
+            mnError = ImplSalPrinterErrorCodeToVCL( mpPrinter->GetErrorCode() );
+            if ( !mnError )
+                mnError = PRINTER_GENERALERROR;
+            pSVData->mpDefInst->DestroyPrinter( mpPrinter );
+            mnCurPage           = 0;
+            mnCurPrintPage      = 0;
+            mbPrinting          = FALSE;
+            mpPrinter = NULL;
+
+            return false;
+        }
+    }
+    else
+    {
+        // possibly a dialog has been shown
+        // now the real job starts
+        i_pController->setJobState( view::PrintableState_JOB_STARTED );
+        i_pController->jobStarted();
+
+        if( mpPrinter->StartJob( pPrintFile,
+                                 i_rJobName,
+                                 Application::GetDisplayName(),
+                                 nCopies,
+                                 bCollateCopy,
+                                 i_pController->isDirectPrint(),
+                                 maJobSetup.ImplGetConstData() ) )
+        {
+            mbJobActive             = TRUE;
+            i_pController->createProgressDialog();
+            int nPages = i_pController->getFilteredPageCount();
+            int nRepeatCount = bUserCopy ? mnCopyCount : 1;
+            for( int nIteration = 0; nIteration < nRepeatCount; nIteration++ )
+            {
+                for( int nPage = 0; nPage < nPages; nPage++ )
+                {
+                    if( nPage == nPages-1 && nIteration == nRepeatCount-1 )
+                        i_pController->setLastPage( sal_True );
+                    i_pController->printFilteredPage( nPage );
+                }
+                // FIXME: duplex ?
+            }
+            EndJob();
+
+            if( i_pController->getJobState() == view::PrintableState_JOB_STARTED )
+                i_pController->setJobState( view::PrintableState_JOB_SPOOLED );
+        }
+        else
+        {
+            mnError = ImplSalPrinterErrorCodeToVCL( mpPrinter->GetErrorCode() );
+            if ( !mnError )
+                mnError = PRINTER_GENERALERROR;
+            i_pController->setJobState( mnError == PRINTER_ABORT
+                                        ? view::PrintableState_JOB_ABORTED
+                                        : view::PrintableState_JOB_FAILED );
+            pSVData->mpDefInst->DestroyPrinter( mpPrinter );
+            mnCurPage           = 0;
+            mnCurPrintPage      = 0;
+            mbPrinting          = FALSE;
+            mpPrinter = NULL;
+
+            return false;
+        }
+    }
+
+    return true;
+}
+
+PrinterController::~PrinterController()
+{
+    delete mpImplData;
+}
+
+view::PrintableState PrinterController::getJobState() const
+{
+    return mpImplData->meJobState;
+}
+
+void PrinterController::setJobState( view::PrintableState i_eState )
+{
+    mpImplData->meJobState = i_eState;
+}
+
+const boost::shared_ptr<Printer>& PrinterController::getPrinter() const
+{
+    return mpImplData->mpPrinter;
+}
+
+void PrinterController::setPrinter( const boost::shared_ptr<Printer>& i_rPrinter )
+{
+    mpImplData->mpPrinter = i_rPrinter;
+    setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" ) ),
+              makeAny( rtl::OUString( i_rPrinter->GetName() ) ) );
+}
+
+bool PrinterController::setupPrinter( Window* i_pParent )
+{
+    bool bRet = false;
+    if( mpImplData->mpPrinter.get() )
+    {
+        Size aPaperSize( mpImplData->mpPrinter->PixelToLogic(
+            mpImplData->mpPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
+        bRet = mpImplData->mpPrinter->Setup( i_pParent );
+        if( bRet )
+        {
+            // was the papersize overridden ? if so we need to take action
+            Size aNewPaperSize( mpImplData->mpPrinter->PixelToLogic(
+                mpImplData->mpPrinter->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
+            if( aNewPaperSize != aPaperSize )
+            {
+                mpImplData->maFixedPageSize = aNewPaperSize;
+                mpImplData->maPageCache.invalidate();
+                awt::Size aOverrideSize;
+                aOverrideSize.Width = aNewPaperSize.Width();
+                aOverrideSize.Height = aNewPaperSize.Height();
+                setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OverridePageSize" ) ),
+                          makeAny( aOverrideSize ) );
+            }
+        }
+    }
+    return bRet;
+}
+
+PrinterController::PageSize vcl::ImplPrinterControllerData::modifyJobSetup( const Sequence< PropertyValue >& i_rProps )
+{
+    PrinterController::PageSize aPageSize;
+    aPageSize.aSize = mpPrinter->GetPaperSize();
+    for( sal_Int32 nProperty = 0, nPropertyCount = i_rProps.getLength(); nProperty < nPropertyCount; ++nProperty )
+    {
+        if( i_rProps[ nProperty ].Name.equalsAscii( "PageSize" ) )
+        {
+            awt::Size aSize;
+            i_rProps[ nProperty].Value >>= aSize;
+            aPageSize.aSize.Width() = aSize.Width;
+            aPageSize.aSize.Height() = aSize.Height;
+
+            Size aCurSize( mpPrinter->GetPaperSize() );
+            Size aRealPaperSize( getRealPaperSize( aPageSize.aSize ) );
+            if( aRealPaperSize != aCurSize )
+                mpPrinter->SetPaperSizeUser( aRealPaperSize, ! isFixedPageSize() );
+        }
+        if( i_rProps[ nProperty ].Name.equalsAscii( "PageIncludesNonprintableArea" ) )
+        {
+            sal_Bool bVal = sal_False;
+            i_rProps[ nProperty].Value >>= bVal;
+            aPageSize.bFullPaper = static_cast<bool>(bVal);
+        }
+    }
+    return aPageSize;
+}
+
+int PrinterController::getPageCountProtected() const
+{
+    const MapMode aMapMode( MAP_100TH_MM );
+
+    mpImplData->mpPrinter->Push();
+    mpImplData->mpPrinter->SetMapMode( aMapMode );
+    int nPages = getPageCount();
+    mpImplData->mpPrinter->Pop();
+    return nPages;
+}
+
+Sequence< beans::PropertyValue > PrinterController::getPageParametersProtected( int i_nPage ) const
+{
+    const MapMode aMapMode( MAP_100TH_MM );
+
+    mpImplData->mpPrinter->Push();
+    mpImplData->mpPrinter->SetMapMode( aMapMode );
+    Sequence< beans::PropertyValue > aResult( getPageParameters( i_nPage ) );
+    mpImplData->mpPrinter->Pop();
+    return aResult;
+}
+
+PrinterController::PageSize PrinterController::getPageFile( int i_nUnfilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache )
+{
+    // update progress if necessary
+    if( mpImplData->mpProgress )
+    {
+        // do nothing if printing is canceled
+        if( mpImplData->mpProgress->isCanceled() )
+            return PrinterController::PageSize();
+        mpImplData->mpProgress->tick();
+        Application::Reschedule( true );
+    }
+
+    if( i_bMayUseCache )
+    {
+        PrinterController::PageSize aPageSize;
+        if( mpImplData->maPageCache.get( i_nUnfilteredPage, o_rMtf, aPageSize ) )
+        {
+            return aPageSize;
+        }
+    }
+    else
+        mpImplData->maPageCache.invalidate();
+
+    o_rMtf.Clear();
+
+    // get page parameters
+    Sequence< PropertyValue > aPageParm( getPageParametersProtected( i_nUnfilteredPage ) );
+    const MapMode aMapMode( MAP_100TH_MM );
+
+    mpImplData->mpPrinter->Push();
+    mpImplData->mpPrinter->SetMapMode( aMapMode );
+
+    // modify job setup if necessary
+    PrinterController::PageSize aPageSize = mpImplData->modifyJobSetup( aPageParm );
+
+    o_rMtf.SetPrefSize( aPageSize.aSize );
+    o_rMtf.SetPrefMapMode( aMapMode );
+
+    mpImplData->mpPrinter->EnableOutput( FALSE );
+
+    o_rMtf.Record( mpImplData->mpPrinter.get() );
+
+    printPage( i_nUnfilteredPage );
+
+    o_rMtf.Stop();
+    o_rMtf.WindStart();
+    mpImplData->mpPrinter->Pop();
+
+    if( i_bMayUseCache )
+        mpImplData->maPageCache.insert( i_nUnfilteredPage, o_rMtf, aPageSize );
+
+    // reset "FirstPage" property to false now we've gotten at least our first one
+    mpImplData->mbFirstPage = sal_False;
+
+    return aPageSize;
+}
+
+static void appendSubPage( GDIMetaFile& o_rMtf, const Rectangle& i_rClipRect, GDIMetaFile& io_rSubPage, bool i_bDrawBorder )
+{
+    // intersect all clipregion actions with our clip rect
+    io_rSubPage.WindStart();
+    io_rSubPage.Clip( i_rClipRect );
+
+    // save gstate
+    o_rMtf.AddAction( new MetaPushAction( PUSH_ALL ) );
+
+    // clip to page rect
+    o_rMtf.AddAction( new MetaClipRegionAction( Region( i_rClipRect ), TRUE ) );
+
+    // append the subpage
+    io_rSubPage.WindStart();
+    io_rSubPage.Play( o_rMtf );
+
+    // restore gstate
+    o_rMtf.AddAction( new MetaPopAction() );
+
+    // draw a border
+    if( i_bDrawBorder )
+    {
+        // save gstate
+        o_rMtf.AddAction( new MetaPushAction( PUSH_LINECOLOR | PUSH_FILLCOLOR | PUSH_CLIPREGION | PUSH_MAPMODE ) );
+        o_rMtf.AddAction( new MetaMapModeAction( MapMode( MAP_100TH_MM ) ) );
+
+        Rectangle aBorderRect( i_rClipRect );
+        o_rMtf.AddAction( new MetaLineColorAction( Color( COL_BLACK ), TRUE ) );
+        o_rMtf.AddAction( new MetaFillColorAction( Color( COL_TRANSPARENT ), FALSE ) );
+        o_rMtf.AddAction( new MetaRectAction( aBorderRect ) );
+
+        // restore gstate
+        o_rMtf.AddAction( new MetaPopAction() );
+    }
+}
+
+PrinterController::PageSize PrinterController::getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache )
+{
+    const MultiPageSetup& rMPS( mpImplData->maMultiPage );
+    int nSubPages = rMPS.nRows * rMPS.nColumns;
+    if( nSubPages < 1 )
+        nSubPages = 1;
+
+    // reverse sheet order
+    if( mpImplData->mbReversePageOrder )
+    {
+        int nDocPages = getFilteredPageCount();
+        i_nFilteredPage = nDocPages - 1 - i_nFilteredPage;
+    }
+
+    // there is no filtering to be done (and possibly the page size of the
+    // original page is to be set), when N-Up is "neutral" that is there is
+    // only one subpage and the margins are 0
+    if( nSubPages == 1 &&
+        rMPS.nLeftMargin == 0 && rMPS.nRightMargin == 0 &&
+        rMPS.nTopMargin == 0 && rMPS.nBottomMargin == 0 )
+    {
+        PrinterController::PageSize aPageSize = getPageFile( i_nFilteredPage, o_rMtf, i_bMayUseCache );
+        Size aPaperSize = mpImplData->getRealPaperSize( aPageSize.aSize );
+        mpImplData->mpPrinter->SetMapMode( MapMode( MAP_100TH_MM ) );
+        mpImplData->mpPrinter->SetPaperSizeUser( aPaperSize, ! mpImplData->isFixedPageSize() );
+        if( aPaperSize != aPageSize.aSize )
+        {
+            // user overridden page size, center Metafile
+            o_rMtf.WindStart();
+            long nDX = (aPaperSize.Width() - aPageSize.aSize.Width()) / 2;
+            long nDY = (aPaperSize.Height() - aPageSize.aSize.Height()) / 2;
+            o_rMtf.Move( nDX, nDY );
+            o_rMtf.WindStart();
+            o_rMtf.SetPrefSize( aPaperSize );
+            aPageSize.aSize = aPaperSize;
+        }
+        return aPageSize;
+    }
+
+    // set last page property really only on the very last page to be rendered
+    // that is on the last subpage of a NUp run
+    sal_Bool bIsLastPage = mpImplData->mbLastPage;
+    mpImplData->mbLastPage = sal_False;
+
+    Size aPaperSize( mpImplData->getRealPaperSize( mpImplData->maMultiPage.aPaperSize ) );
+
+    // multi page area: page size minus margins + one time spacing right and down
+    // the added spacing is so each subpage can be calculated including its spacing
+    Size aMPArea( aPaperSize );
+    aMPArea.Width()  -= rMPS.nLeftMargin + rMPS.nRightMargin;
+    aMPArea.Width()  += rMPS.nHorizontalSpacing;
+    aMPArea.Height() -= rMPS.nTopMargin + rMPS.nBottomMargin;
+    aMPArea.Height() += rMPS.nVerticalSpacing;
+
+    // determine offsets
+    long nAdvX = aMPArea.Width() / rMPS.nColumns;
+    long nAdvY = aMPArea.Height() / rMPS.nRows;
+
+    // determine size of a "cell" subpage, leave a little space around pages
+    Size aSubPageSize( nAdvX - rMPS.nHorizontalSpacing, nAdvY - rMPS.nVerticalSpacing );
+
+    o_rMtf.Clear();
+    o_rMtf.SetPrefSize( aPaperSize );
+    o_rMtf.SetPrefMapMode( MapMode( MAP_100TH_MM ) );
+    o_rMtf.AddAction( new MetaMapModeAction( MapMode( MAP_100TH_MM ) ) );
+
+    int nDocPages = getPageCountProtected();
+    for( int nSubPage = 0; nSubPage < nSubPages; nSubPage++ )
+    {
+        // map current sub page to real page
+        int nPage = (i_nFilteredPage * nSubPages + nSubPage) / rMPS.nRepeat;
+        if( nSubPage == nSubPages-1 ||
+            nPage == nDocPages-1 )
+        {
+            mpImplData->mbLastPage = bIsLastPage;
+        }
+        if( nPage >= 0 && nPage < nDocPages )
+        {
+            GDIMetaFile aPageFile;
+            PrinterController::PageSize aPageSize = getPageFile( nPage, aPageFile, i_bMayUseCache );
+            if( aPageSize.aSize.Width() && aPageSize.aSize.Height() )
+            {
+                long nCellX = 0, nCellY = 0;
+                switch( rMPS.nOrder )
+                {
+                case PrinterController::LRTB:
+                    nCellX = (nSubPage % rMPS.nColumns);
+                    nCellY = (nSubPage / rMPS.nColumns);
+                    break;
+                case PrinterController::TBLR:
+                    nCellX = (nSubPage / rMPS.nRows);
+                    nCellY = (nSubPage % rMPS.nRows);
+                    break;
+                }
+                // scale the metafile down to a sub page size
+                double fScaleX = double(aSubPageSize.Width())/double(aPageSize.aSize.Width());
+                double fScaleY = double(aSubPageSize.Height())/double(aPageSize.aSize.Height());
+                double fScale  = std::min( fScaleX, fScaleY );
+                aPageFile.Scale( fScale, fScale );
+                aPageFile.WindStart();
+
+                // move the subpage so it is centered in its "cell"
+                long nOffX = (aSubPageSize.Width() - long(double(aPageSize.aSize.Width()) * fScale)) / 2;
+                long nOffY = (aSubPageSize.Height() - long(double(aPageSize.aSize.Height()) * fScale)) / 2;
+                long nX = rMPS.nLeftMargin + nOffX + nAdvX * nCellX;
+                long nY = rMPS.nTopMargin + nOffY + nAdvY * nCellY;
+                aPageFile.Move( nX, nY );
+                aPageFile.WindStart();
+                // calculate border rectangle
+                Rectangle aSubPageRect( Point( nX, nY ),
+                                        Size( long(double(aPageSize.aSize.Width())*fScale),
+                                              long(double(aPageSize.aSize.Height())*fScale) ) );
+
+                // append subpage to page
+                appendSubPage( o_rMtf, aSubPageRect, aPageFile, rMPS.bDrawBorder );
+            }
+        }
+    }
+    o_rMtf.WindStart();
+
+    // subsequent getPageFile calls have changed the paper, reset it to current value
+    mpImplData->mpPrinter->SetMapMode( MapMode( MAP_100TH_MM ) );
+    mpImplData->mpPrinter->SetPaperSizeUser( aPaperSize, ! mpImplData->isFixedPageSize() );
+
+    return PrinterController::PageSize( aPaperSize, true );
+}
+
+int PrinterController::getFilteredPageCount()
+{
+    int nDiv = mpImplData->maMultiPage.nRows * mpImplData->maMultiPage.nColumns;
+    if( nDiv < 1 )
+        nDiv = 1;
+    return (getPageCountProtected() * mpImplData->maMultiPage.nRepeat + (nDiv-1)) / nDiv;
+}
+
+ULONG PrinterController::removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut )
+{
+    ULONG nRestoreDrawMode = mpImplData->mpPrinter->GetDrawMode();
+    sal_Int32 nMaxBmpDPIX = mpImplData->mpPrinter->ImplGetDPIX();
+    sal_Int32 nMaxBmpDPIY = mpImplData->mpPrinter->ImplGetDPIY();
+
+    const PrinterOptions&   rPrinterOptions = mpImplData->mpPrinter->GetPrinterOptions();
+
+    static const sal_Int32 OPTIMAL_BMP_RESOLUTION = 300;
+    static const sal_Int32 NORMAL_BMP_RESOLUTION  = 200;
+
+
+    if( rPrinterOptions.IsReduceBitmaps() )
+    {
+        // calculate maximum resolution for bitmap graphics
+        if( PRINTER_BITMAP_OPTIMAL == rPrinterOptions.GetReducedBitmapMode() )
+        {
+            nMaxBmpDPIX = std::min( sal_Int32(OPTIMAL_BMP_RESOLUTION), nMaxBmpDPIX );
+            nMaxBmpDPIY = std::min( sal_Int32(OPTIMAL_BMP_RESOLUTION), nMaxBmpDPIY );
+        }
+        else if( PRINTER_BITMAP_NORMAL == rPrinterOptions.GetReducedBitmapMode() )
+        {
+            nMaxBmpDPIX = std::min( sal_Int32(NORMAL_BMP_RESOLUTION), nMaxBmpDPIX );
+            nMaxBmpDPIY = std::min( sal_Int32(NORMAL_BMP_RESOLUTION), nMaxBmpDPIY );
+        }
+        else
+        {
+            nMaxBmpDPIX = std::min( sal_Int32(rPrinterOptions.GetReducedBitmapResolution()), nMaxBmpDPIX );
+            nMaxBmpDPIY = std::min( sal_Int32(rPrinterOptions.GetReducedBitmapResolution()), nMaxBmpDPIY );
+        }
+    }
+
+    // convert to greysacles
+    if( rPrinterOptions.IsConvertToGreyscales() )
+    {
+        mpImplData->mpPrinter->SetDrawMode( mpImplData->mpPrinter->GetDrawMode() |
+                                            ( DRAWMODE_GRAYLINE | DRAWMODE_GRAYFILL | DRAWMODE_GRAYTEXT |
+                                              DRAWMODE_GRAYBITMAP | DRAWMODE_GRAYGRADIENT ) );
+    }
+
+    // disable transparency output
+    if( rPrinterOptions.IsReduceTransparency() && ( PRINTER_TRANSPARENCY_NONE == rPrinterOptions.GetReducedTransparencyMode() ) )
+    {
+        mpImplData->mpPrinter->SetDrawMode( mpImplData->mpPrinter->GetDrawMode() | DRAWMODE_NOTRANSPARENCY );
+    }
+
+    Color aBg( COL_TRANSPARENT ); // default: let RemoveTransparenciesFromMetaFile do its own background logic
+    if( mpImplData->maMultiPage.nRows * mpImplData->maMultiPage.nColumns > 1 )
+    {
+        // in N-Up printing we have no "page" background operation
+        // we also have no way to determine the paper color
+        // so let's go for white, which will kill 99.9% of the real cases
+        aBg = Color( COL_WHITE );
+    }
+    mpImplData->mpPrinter->RemoveTransparenciesFromMetaFile( i_rIn, o_rOut, nMaxBmpDPIX, nMaxBmpDPIY,
+                                                             rPrinterOptions.IsReduceTransparency(),
+                                                             rPrinterOptions.GetReducedTransparencyMode() == PRINTER_TRANSPARENCY_AUTO,
+                                                             rPrinterOptions.IsReduceBitmaps() && rPrinterOptions.IsReducedBitmapIncludesTransparency(),
+                                                             aBg
+                                                             );
+    return nRestoreDrawMode;
+}
+
+void PrinterController::printFilteredPage( int i_nPage )
+{
+    if( mpImplData->meJobState != view::PrintableState_JOB_STARTED )
+        return;
+
+    GDIMetaFile aPageFile;
+    PrinterController::PageSize aPageSize = getFilteredPageFile( i_nPage, aPageFile );
+
+    if( mpImplData->mpProgress )
+    {
+        // do nothing if printing is canceled
+        if( mpImplData->mpProgress->isCanceled() )
+        {
+            setJobState( view::PrintableState_JOB_ABORTED );
+            return;
+        }
+    }
+
+    // in N-Up printing set the correct page size
+    mpImplData->mpPrinter->SetMapMode( MAP_100TH_MM );
+    // aPageSize was filtered through mpImplData->getRealPaperSize already by getFilteredPageFile()
+    mpImplData->mpPrinter->SetPaperSizeUser( aPageSize.aSize, ! mpImplData->isFixedPageSize() );
+
+    // if full paper are is meant, move the output to accomodate for pageoffset
+    if( aPageSize.bFullPaper )
+    {
+        Point aPageOffset( mpImplData->mpPrinter->GetPageOffset() );
+        aPageFile.WindStart();
+        aPageFile.Move( -aPageOffset.X(), -aPageOffset.Y() );
+    }
+
+    GDIMetaFile aCleanedFile;
+    ULONG nRestoreDrawMode = removeTransparencies( aPageFile, aCleanedFile );
+
+    mpImplData->mpPrinter->EnableOutput( TRUE );
+
+    // actually print the page
+    mpImplData->mpPrinter->ImplStartPage();
+
+    mpImplData->mpPrinter->Push();
+    aCleanedFile.WindStart();
+    aCleanedFile.Play( mpImplData->mpPrinter.get() );
+    mpImplData->mpPrinter->Pop();
+
+    mpImplData->mpPrinter->ImplEndPage();
+
+    mpImplData->mpPrinter->SetDrawMode( nRestoreDrawMode );
+}
+
+void PrinterController::jobStarted()
+{
+}
+
+void PrinterController::jobFinished( view::PrintableState )
+{
+}
+
+void PrinterController::abortJob()
+{
+    setJobState( view::PrintableState_JOB_ABORTED );
+}
+
+void PrinterController::setLastPage( sal_Bool i_bLastPage )
+{
+    mpImplData->mbLastPage = i_bLastPage;
+}
+
+void PrinterController::setReversePrint( sal_Bool i_bReverse )
+{
+    mpImplData->mbReversePageOrder = i_bReverse;
+}
+
+bool PrinterController::getReversePrint() const
+{
+    return mpImplData->mbReversePageOrder;
+}
+
+Sequence< PropertyValue > PrinterController::getJobProperties( const Sequence< PropertyValue >& i_rMergeList ) const
+{
+    std::hash_set< rtl::OUString, rtl::OUStringHash > aMergeSet;
+    size_t nResultLen = size_t(i_rMergeList.getLength()) + mpImplData->maUIProperties.size() + 3;
+    for( int i = 0; i < i_rMergeList.getLength(); i++ )
+        aMergeSet.insert( i_rMergeList[i].Name );
+
+    Sequence< PropertyValue > aResult( nResultLen );
+    for( int i = 0; i < i_rMergeList.getLength(); i++ )
+        aResult[i] = i_rMergeList[i];
+    int nCur = i_rMergeList.getLength();
+    for( size_t i = 0; i < mpImplData->maUIProperties.size(); i++ )
+    {
+        if( aMergeSet.find( mpImplData->maUIProperties[i].Name ) == aMergeSet.end() )
+            aResult[nCur++] = mpImplData->maUIProperties[i];
+    }
+    // append IsFirstPage
+    if( aMergeSet.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFirstPage" ) ) ) == aMergeSet.end() )
+    {
+        PropertyValue aVal;
+        aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFirstPage" ) );
+        aVal.Value <<= mpImplData->mbFirstPage;
+        aResult[nCur++] = aVal;
+    }
+    // append IsLastPage
+    if( aMergeSet.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsLastPage" ) ) ) == aMergeSet.end() )
+    {
+        PropertyValue aVal;
+        aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsLastPage" ) );
+        aVal.Value <<= mpImplData->mbLastPage;
+        aResult[nCur++] = aVal;
+    }
+    // append IsPrinter
+    if( aMergeSet.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrinter" ) ) ) == aMergeSet.end() )
+    {
+        PropertyValue aVal;
+        aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsPrinter" ) );
+        aVal.Value <<= sal_True;
+        aResult[nCur++] = aVal;
+    }
+    aResult.realloc( nCur );
+    return aResult;
+}
+
+const Sequence< beans::PropertyValue >& PrinterController::getUIOptions() const
+{
+    return mpImplData->maUIOptions;
+}
+
+beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty )
+{
+    std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
+        mpImplData->maPropertyToIndex.find( i_rProperty );
+    return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL;
+}
+
+const beans::PropertyValue* PrinterController::getValue( const rtl::OUString& i_rProperty ) const
+{
+    std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
+        mpImplData->maPropertyToIndex.find( i_rProperty );
+    return it != mpImplData->maPropertyToIndex.end() ? &mpImplData->maUIProperties[it->second] : NULL;
+}
+
+Sequence< beans::PropertyValue > PrinterController::getValues( const Sequence< rtl::OUString >& i_rNames ) const
+{
+    Sequence< beans::PropertyValue > aRet( i_rNames.getLength() );
+    sal_Int32 nFound = 0;
+    for( sal_Int32 i = 0; i < i_rNames.getLength(); i++ )
+    {
+        const beans::PropertyValue* pVal = getValue( i_rNames[i] );
+        if( pVal )
+            aRet[ nFound++ ] = *pVal;
+    }
+    aRet.realloc( nFound );
+    return aRet;
+}
+
+void PrinterController::setValue( const rtl::OUString& i_rName, const Any& i_rValue )
+{
+    beans::PropertyValue aVal;
+    aVal.Name = i_rName;
+    aVal.Value = i_rValue;
+
+    setValue( aVal );
+}
+
+void PrinterController::setValue( const beans::PropertyValue& i_rValue )
+{
+    std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
+        mpImplData->maPropertyToIndex.find( i_rValue.Name );
+    if( it != mpImplData->maPropertyToIndex.end() )
+        mpImplData->maUIProperties[ it->second ] = i_rValue;
+    else
+    {
+        // insert correct index into property map
+        mpImplData->maPropertyToIndex[ i_rValue.Name ] = mpImplData->maUIProperties.size();
+        mpImplData->maUIProperties.push_back( i_rValue );
+        mpImplData->maUIPropertyEnabled.push_back( true );
+    }
+}
+
+void PrinterController::setUIOptions( const Sequence< beans::PropertyValue >& i_rOptions )
+{
+    DBG_ASSERT( mpImplData->maUIOptions.getLength() == 0, "setUIOptions called twice !" );
+
+    mpImplData->maUIOptions = i_rOptions;
+
+    for( int i = 0; i < i_rOptions.getLength(); i++ )
+    {
+        Sequence< beans::PropertyValue > aOptProp;
+        i_rOptions[i].Value >>= aOptProp;
+        bool bIsEnabled = true;
+        bool bHaveProperty = false;
+        rtl::OUString aPropName;
+        vcl::ImplPrinterControllerData::ControlDependency aDep;
+        for( int n = 0; n < aOptProp.getLength(); n++ )
+        {
+            const beans::PropertyValue& rEntry( aOptProp[ n ] );
+            if( rEntry.Name.equalsAscii( "Property" ) )
+            {
+                PropertyValue aVal;
+                rEntry.Value >>= aVal;
+                DBG_ASSERT( mpImplData->maPropertyToIndex.find( aVal.Name )
+                            == mpImplData->maPropertyToIndex.end(), "duplicate property entry" );
+                setValue( aVal );
+                aPropName = aVal.Name;
+                bHaveProperty = true;
+            }
+            else if( rEntry.Name.equalsAscii( "Enabled" ) )
+            {
+                sal_Bool bValue = sal_True;
+                rEntry.Value >>= bValue;
+                bIsEnabled = bValue;
+            }
+            else if( rEntry.Name.equalsAscii( "DependsOnName" ) )
+            {
+                rEntry.Value >>= aDep.maDependsOnName;
+            }
+            else if( rEntry.Name.equalsAscii( "DependsOnEntry" ) )
+            {
+                rEntry.Value >>= aDep.mnDependsOnEntry;
+            }
+        }
+        if( bHaveProperty )
+        {
+            vcl::ImplPrinterControllerData::PropertyToIndexMap::const_iterator it =
+                mpImplData->maPropertyToIndex.find( aPropName );
+            // sanity check
+            if( it != mpImplData->maPropertyToIndex.end() )
+            {
+                mpImplData->maUIPropertyEnabled[ it->second ] = bIsEnabled;
+            }
+            if( aDep.maDependsOnName.getLength() > 0 )
+                mpImplData->maControlDependencies[ aPropName ] = aDep;
+        }
+    }
+}
+
+void PrinterController::enableUIOption( const rtl::OUString& i_rProperty, bool i_bEnable )
+{
+    std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator it =
+        mpImplData->maPropertyToIndex.find( i_rProperty );
+    if( it != mpImplData->maPropertyToIndex.end() )
+    {
+        // call handler only for actual changes
+        if( ( mpImplData->maUIPropertyEnabled[ it->second ] && ! i_bEnable ) ||
+            ( ! mpImplData->maUIPropertyEnabled[ it->second ] && i_bEnable ) )
+        {
+            mpImplData->maUIPropertyEnabled[ it->second ] = i_bEnable;
+            rtl::OUString aPropName( i_rProperty );
+            mpImplData->maOptionChangeHdl.Call( &aPropName );
+        }
+    }
+}
+
+bool PrinterController::isUIOptionEnabled( const rtl::OUString& i_rProperty ) const
+{
+    bool bEnabled = false;
+    std::hash_map< rtl::OUString, size_t, rtl::OUStringHash >::const_iterator prop_it =
+        mpImplData->maPropertyToIndex.find( i_rProperty );
+    if( prop_it != mpImplData->maPropertyToIndex.end() )
+    {
+        bEnabled = mpImplData->maUIPropertyEnabled[prop_it->second];
+
+        if( bEnabled )
+        {
+            // check control dependencies
+            vcl::ImplPrinterControllerData::ControlDependencyMap::const_iterator it =
+                mpImplData->maControlDependencies.find( i_rProperty );
+            if( it != mpImplData->maControlDependencies.end() )
+            {
+                // check if the dependency is enabled
+                // if the dependency is disabled, we are too
+                bEnabled = isUIOptionEnabled( it->second.maDependsOnName );
+
+                if( bEnabled )
+                {
+                    // does the dependency have the correct value ?
+                    const com::sun::star::beans::PropertyValue* pVal = getValue( it->second.maDependsOnName );
+                    OSL_ENSURE( pVal, "unknown property in dependency" );
+                    if( pVal )
+                    {
+                        sal_Int32 nDepVal = 0;
+                        sal_Bool bDepVal = sal_False;
+                        if( pVal->Value >>= nDepVal )
+                        {
+                            bEnabled = (nDepVal == it->second.mnDependsOnEntry) || (it->second.mnDependsOnEntry == -1);
+                        }
+                        else if( pVal->Value >>= bDepVal )
+                        {
+                            // could be a dependency on a checked boolean
+                            // in this case the dependency is on a non zero for checked value
+                            bEnabled = (   bDepVal && it->second.mnDependsOnEntry != 0) ||
+                                       ( ! bDepVal && it->second.mnDependsOnEntry == 0);
+                        }
+                        else
+                        {
+                            // if the type does not match something is awry
+                            OSL_ENSURE( 0, "strange type in control dependency" );
+                            bEnabled = false;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return bEnabled;
+}
+
+rtl::OUString PrinterController::getDependency( const rtl::OUString& i_rProperty ) const
+{
+    rtl::OUString aDependency;
+
+    vcl::ImplPrinterControllerData::ControlDependencyMap::const_iterator it =
+        mpImplData->maControlDependencies.find( i_rProperty );
+    if( it != mpImplData->maControlDependencies.end() )
+        aDependency = it->second.maDependsOnName;
+
+    return aDependency;
+}
+
+rtl::OUString PrinterController::makeEnabled( const rtl::OUString& i_rProperty )
+{
+    rtl::OUString aDependency;
+
+    vcl::ImplPrinterControllerData::ControlDependencyMap::const_iterator it =
+        mpImplData->maControlDependencies.find( i_rProperty );
+    if( it != mpImplData->maControlDependencies.end() )
+    {
+        if( isUIOptionEnabled( it->second.maDependsOnName ) )
+        {
+           aDependency = it->second.maDependsOnName;
+           const com::sun::star::beans::PropertyValue* pVal = getValue( aDependency );
+           OSL_ENSURE( pVal, "unknown property in dependency" );
+           if( pVal )
+           {
+               sal_Int32 nDepVal = 0;
+               sal_Bool bDepVal = sal_False;
+               if( pVal->Value >>= nDepVal )
+               {
+                   if( it->second.mnDependsOnEntry != -1 )
+                   {
+                       setValue( aDependency, makeAny( sal_Int32( it->second.mnDependsOnEntry ) ) );
+                   }
+               }
+               else if( pVal->Value >>= bDepVal )
+               {
+                   setValue( aDependency, makeAny( sal_Bool( it->second.mnDependsOnEntry != 0 ) ) );
+               }
+               else
+               {
+                   // if the type does not match something is awry
+                   OSL_ENSURE( 0, "strange type in control dependency" );
+               }
+           }
+        }
+    }
+
+    return aDependency;
+}
+
+void PrinterController::setOptionChangeHdl( const Link& i_rHdl )
+{
+    mpImplData->maOptionChangeHdl = i_rHdl;
+}
+
+void PrinterController::createProgressDialog()
+{
+    if( ! mpImplData->mpProgress )
+    {
+        sal_Bool bShow = sal_True;
+        beans::PropertyValue* pMonitor = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MonitorVisible" ) ) );
+        if( pMonitor )
+            pMonitor->Value >>= bShow;
+        else
+        {
+            const com::sun::star::beans::PropertyValue* pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsApi" ) ) );
+            if( pVal )
+            {
+                sal_Bool bApi = sal_False;
+                pVal->Value >>= bApi;
+                bShow = ! bApi;
+            }
+        }
+
+        if( bShow && ! Application::IsHeadlessModeEnabled() )
+        {
+            mpImplData->mpProgress = new PrintProgressDialog( NULL, getPageCountProtected() );
+            mpImplData->mpProgress->Show();
+        }
+    }
+}
+
+void PrinterController::setMultipage( const MultiPageSetup& i_rMPS )
+{
+    mpImplData->maMultiPage = i_rMPS;
+}
+
+const PrinterController::MultiPageSetup& PrinterController::getMultipage() const
+{
+    return mpImplData->maMultiPage;
+}
+
+void PrinterController::pushPropertiesToPrinter()
+{
+    sal_Int32 nCopyCount = 1;
+    // set copycount and collate
+    const beans::PropertyValue* pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CopyCount" ) ) );
+    if( pVal )
+        pVal->Value >>= nCopyCount;
+    sal_Bool bCollate = sal_False;
+    pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ) );
+    if( pVal )
+        pVal->Value >>= bCollate;
+    mpImplData->mpPrinter->SetCopyCount( static_cast<USHORT>(nCopyCount), bCollate );
+
+    // duplex mode
+    pVal = getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DuplexMode" ) ) );
+    if( pVal )
+    {
+        sal_Int16 nDuplex = view::DuplexMode::UNKNOWN;
+        pVal->Value >>= nDuplex;
+        switch( nDuplex )
+        {
+        case view::DuplexMode::OFF: mpImplData->mpPrinter->SetDuplexMode( DUPLEX_OFF ); break;
+        case view::DuplexMode::LONGEDGE: mpImplData->mpPrinter->SetDuplexMode( DUPLEX_LONGEDGE ); break;
+        case view::DuplexMode::SHORTEDGE: mpImplData->mpPrinter->SetDuplexMode( DUPLEX_SHORTEDGE ); break;
+        }
+    }
+}
+
+bool PrinterController::isShowDialogs() const
+{
+    sal_Bool bApi = getBoolProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsApi" ) ), sal_False );
+    return ! bApi && ! Application::IsHeadlessModeEnabled();
+}
+
+bool PrinterController::isDirectPrint() const
+{
+    sal_Bool bDirect = getBoolProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsDirect" ) ), sal_False );
+    return bDirect == sal_True;
+}
+
+sal_Bool PrinterController::getBoolProperty( const rtl::OUString& i_rProperty, sal_Bool i_bFallback ) const
+{
+    sal_Bool bRet = i_bFallback;
+    const com::sun::star::beans::PropertyValue* pVal = getValue( i_rProperty );
+    if( pVal )
+        pVal->Value >>= bRet;
+    return bRet;
+}
+
+/*
+ * PrinterOptionsHelper
+**/
+Any PrinterOptionsHelper::getValue( const rtl::OUString& i_rPropertyName ) const
+{
+    Any aRet;
+    std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it =
+        m_aPropertyMap.find( i_rPropertyName );
+    if( it != m_aPropertyMap.end() )
+        aRet = it->second;
+    return aRet;
+}
+
+void PrinterOptionsHelper::setValue( const rtl::OUString& i_rPropertyName, const Any& i_rValue )
+{
+    m_aPropertyMap[ i_rPropertyName ] = i_rValue;
+}
+
+bool PrinterOptionsHelper::hasProperty( const rtl::OUString& i_rPropertyName ) const
+{
+    Any aRet;
+    std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::const_iterator it =
+        m_aPropertyMap.find( i_rPropertyName );
+    return it != m_aPropertyMap.end();
+}
+
+sal_Bool PrinterOptionsHelper::getBoolValue( const rtl::OUString& i_rPropertyName, sal_Bool i_bDefault ) const
+{
+    sal_Bool bRet = sal_False;
+    Any aVal( getValue( i_rPropertyName ) );
+    return (aVal >>= bRet) ? bRet : i_bDefault;
+}
+
+sal_Int64 PrinterOptionsHelper::getIntValue( const rtl::OUString& i_rPropertyName, sal_Int64 i_nDefault ) const
+{
+    sal_Int64 nRet = 0;
+    Any aVal( getValue( i_rPropertyName ) );
+    return (aVal >>= nRet) ? nRet : i_nDefault;
+}
+
+rtl::OUString PrinterOptionsHelper::getStringValue( const rtl::OUString& i_rPropertyName, const rtl::OUString& i_rDefault ) const
+{
+    rtl::OUString aRet;
+    Any aVal( getValue( i_rPropertyName ) );
+    return (aVal >>= aRet) ? aRet : i_rDefault;
+}
+
+bool PrinterOptionsHelper::processProperties( const Sequence< PropertyValue >& i_rNewProp,
+                                              std::set< rtl::OUString >* o_pChangeProp )
+{
+    bool bChanged = false;
+
+    // clear the changed set
+    if( o_pChangeProp )
+        o_pChangeProp->clear();
+
+    sal_Int32 nElements = i_rNewProp.getLength();
+    const PropertyValue* pVals = i_rNewProp.getConstArray();
+    for( sal_Int32 i = 0; i < nElements; i++ )
+    {
+        bool bElementChanged = false;
+        std::hash_map< rtl::OUString, Any, rtl::OUStringHash >::iterator it =
+            m_aPropertyMap.find( pVals[ i ].Name );
+        if( it != m_aPropertyMap.end() )
+        {
+            if( it->second != pVals[ i ].Value )
+                bElementChanged = true;
+        }
+        else
+            bElementChanged = true;
+
+        if( bElementChanged )
+        {
+            if( o_pChangeProp )
+                o_pChangeProp->insert( pVals[ i ].Name );
+            m_aPropertyMap[ pVals[i].Name ] = pVals[i].Value;
+            bChanged = true;
+        }
+    }
+    return bChanged;
+}
+
+void PrinterOptionsHelper::appendPrintUIOptions( uno::Sequence< beans::PropertyValue >& io_rProps ) const
+{
+    if( m_aUIProperties.getLength() > 0 )
+    {
+        sal_Int32 nIndex = io_rProps.getLength();
+        io_rProps.realloc( nIndex+1 );
+        PropertyValue aVal;
+        aVal.Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExtraPrintUIOptions" ) );
+        aVal.Value = makeAny( m_aUIProperties );
+        io_rProps[ nIndex ] = aVal;
+    }
+}
+
+Any PrinterOptionsHelper::getUIControlOpt( const rtl::OUString& i_rTitle,
+                                           const Sequence< rtl::OUString >& i_rHelpTexts,
+                                           const rtl::OUString& i_rType,
+                                           const PropertyValue* i_pVal,
+                                           const PrinterOptionsHelper::UIControlOptions& i_rControlOptions
+                                           )
+{
+    sal_Int32 nElements =
+        1                                                               // ControlType
+        + (i_rTitle.getLength() ? 1 : 0)                                // Text
+        + (i_rHelpTexts.getLength() ? 1 : 0)                            // HelpText
+        + (i_pVal ? 1 : 0)                                              // Property
+        + i_rControlOptions.maAddProps.getLength()                      // additional props
+        + (i_rControlOptions.maGroupHint.getLength() ? 1 : 0)           // grouping
+        + (i_rControlOptions.mbInternalOnly ? 1 : 0)                    // internal hint
+        + (i_rControlOptions.mbEnabled ? 0 : 1)                         // enabled
+        ;
+    if( i_rControlOptions.maDependsOnName.getLength() )
+    {
+        nElements += 1;
+        if( i_rControlOptions.mnDependsOnEntry != -1 )
+            nElements += 1;
+        if( i_rControlOptions.mbAttachToDependency )
+            nElements += 1;
+    }
+
+    Sequence< PropertyValue > aCtrl( nElements );
+    sal_Int32 nUsed = 0;
+    if( i_rTitle.getLength() )
+    {
+        aCtrl[nUsed  ].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Text" ) );
+        aCtrl[nUsed++].Value = makeAny( i_rTitle );
+    }
+    if( i_rHelpTexts.getLength() )
+    {
+        aCtrl[nUsed  ].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "HelpText" ) );
+        aCtrl[nUsed++].Value = makeAny( i_rHelpTexts );
+    }
+    aCtrl[nUsed  ].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ControlType" ) );
+    aCtrl[nUsed++].Value = makeAny( i_rType );
+    if( i_pVal )
+    {
+        aCtrl[nUsed  ].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Property" ) );
+        aCtrl[nUsed++].Value = makeAny( *i_pVal );
+    }
+    if( i_rControlOptions.maDependsOnName.getLength() )
+    {
+        aCtrl[nUsed  ].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DependsOnName" ) );
+        aCtrl[nUsed++].Value = makeAny( i_rControlOptions.maDependsOnName );
+        if( i_rControlOptions.mnDependsOnEntry != -1 )
+        {
+            aCtrl[nUsed  ].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DependsOnEntry" ) );
+            aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mnDependsOnEntry );
+        }
+        if( i_rControlOptions.mbAttachToDependency )
+        {
+            aCtrl[nUsed  ].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "AttachToDependency" ) );
+            aCtrl[nUsed++].Value = makeAny( i_rControlOptions.mbAttachToDependency );
+        }
+    }
+    if( i_rControlOptions.maGroupHint.getLength() )
+    {
+        aCtrl[nUsed  ].Name    = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GroupingHint" ) );
+        aCtrl[nUsed++].Value <<= i_rControlOptions.maGroupHint;
+    }
+    if( i_rControlOptions.mbInternalOnly )
+    {
+        aCtrl[nUsed  ].Name    = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InternalUIOnly" ) );
+        aCtrl[nUsed++].Value <<= sal_True;
+    }
+    if( ! i_rControlOptions.mbEnabled )
+    {
+        aCtrl[nUsed  ].Name    = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Enabled" ) );
+        aCtrl[nUsed++].Value <<= sal_False;
+    }
+
+    sal_Int32 nAddProps = i_rControlOptions.maAddProps.getLength();
+    for( sal_Int32 i = 0; i < nAddProps; i++ )
+        aCtrl[ nUsed++ ] = i_rControlOptions.maAddProps[i];
+
+    DBG_ASSERT( nUsed == nElements, "nUsed != nElements, probable heap corruption" );
+
+    return makeAny( aCtrl );
+}
+
+Any PrinterOptionsHelper::getGroupControlOpt( const rtl::OUString& i_rTitle, const rtl::OUString& i_rHelpText )
+{
+    Sequence< rtl::OUString > aHelpText;
+    if( i_rHelpText.getLength() > 0 )
+    {
+        aHelpText.realloc( 1 );
+        *aHelpText.getArray() = i_rHelpText;
+    }
+    return getUIControlOpt( i_rTitle, aHelpText, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Group" ) ) );
+}
+
+Any PrinterOptionsHelper::getSubgroupControlOpt( const rtl::OUString& i_rTitle,
+                                                 const rtl::OUString& i_rHelpText,
+                                                 const PrinterOptionsHelper::UIControlOptions& i_rControlOptions
+                                                 )
+{
+    Sequence< rtl::OUString > aHelpText;
+    if( i_rHelpText.getLength() > 0 )
+    {
+        aHelpText.realloc( 1 );
+        *aHelpText.getArray() = i_rHelpText;
+    }
+    return getUIControlOpt( i_rTitle, aHelpText, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Subgroup" ) ),
+                            NULL, i_rControlOptions );
+}
+
+Any PrinterOptionsHelper::getBoolControlOpt( const rtl::OUString& i_rTitle,
+                                             const rtl::OUString& i_rHelpText,
+                                             const rtl::OUString& i_rProperty,
+                                             sal_Bool i_bValue,
+                                             const PrinterOptionsHelper::UIControlOptions& i_rControlOptions
+                                             )
+{
+    Sequence< rtl::OUString > aHelpText;
+    if( i_rHelpText.getLength() > 0 )
+    {
+        aHelpText.realloc( 1 );
+        *aHelpText.getArray() = i_rHelpText;
+    }
+    PropertyValue aVal;
+    aVal.Name = i_rProperty;
+    aVal.Value = makeAny( i_bValue );
+    return getUIControlOpt( i_rTitle, aHelpText, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Bool" ) ), &aVal, i_rControlOptions );
+}
+
+Any PrinterOptionsHelper::getChoiceControlOpt( const rtl::OUString& i_rTitle,
+                                               const Sequence< rtl::OUString >& i_rHelpText,
+                                               const rtl::OUString& i_rProperty,
+                                               const Sequence< rtl::OUString >& i_rChoices,
+                                               sal_Int32 i_nValue,
+                                               const rtl::OUString& i_rType,
+                                               const PrinterOptionsHelper::UIControlOptions& i_rControlOptions
+                                               )
+{
+    UIControlOptions aOpt( i_rControlOptions );
+    sal_Int32 nUsed = aOpt.maAddProps.getLength();
+    aOpt.maAddProps.realloc( nUsed + 1 );
+    aOpt.maAddProps[nUsed].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Choices" ) );
+    aOpt.maAddProps[nUsed].Value = makeAny( i_rChoices );
+
+    PropertyValue aVal;
+    aVal.Name = i_rProperty;
+    aVal.Value = makeAny( i_nValue );
+    return getUIControlOpt( i_rTitle, i_rHelpText, i_rType, &aVal, aOpt );
+}
+
+Any PrinterOptionsHelper::getRangeControlOpt( const rtl::OUString& i_rTitle,
+                                              const rtl::OUString& i_rHelpText,
+                                              const rtl::OUString& i_rProperty,
+                                              sal_Int32 i_nValue,
+                                              sal_Int32 i_nMinValue,
+                                              sal_Int32 i_nMaxValue,
+                                              const PrinterOptionsHelper::UIControlOptions& i_rControlOptions
+                                            )
+{
+    UIControlOptions aOpt( i_rControlOptions );
+    if( i_nMaxValue >= i_nMinValue )
+    {
+        sal_Int32 nUsed = aOpt.maAddProps.getLength();
+        aOpt.maAddProps.realloc( nUsed + 2 );
+        aOpt.maAddProps[nUsed  ].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MinValue" ) );
+        aOpt.maAddProps[nUsed++].Value = makeAny( i_nMinValue );
+        aOpt.maAddProps[nUsed  ].Name  = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MaxValue" ) );
+        aOpt.maAddProps[nUsed++].Value = makeAny( i_nMaxValue );
+    }
+
+    Sequence< rtl::OUString > aHelpText;
+    if( i_rHelpText.getLength() > 0 )
+    {
+        aHelpText.realloc( 1 );
+        *aHelpText.getArray() = i_rHelpText;
+    }
+    PropertyValue aVal;
+    aVal.Name = i_rProperty;
+    aVal.Value = makeAny( i_nValue );
+    return getUIControlOpt( i_rTitle,
+                            aHelpText,
+                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Range" ) ),
+                            &aVal,
+                            aOpt
+                            );
+}
+
+Any PrinterOptionsHelper::getEditControlOpt( const rtl::OUString& i_rTitle,
+                                             const rtl::OUString& i_rHelpText,
+                                             const rtl::OUString& i_rProperty,
+                                             const rtl::OUString& i_rValue,
+                                             const PrinterOptionsHelper::UIControlOptions& i_rControlOptions
+                                           )
+{
+    Sequence< rtl::OUString > aHelpText;
+    if( i_rHelpText.getLength() > 0 )
+    {
+        aHelpText.realloc( 1 );
+        *aHelpText.getArray() = i_rHelpText;
+    }
+    PropertyValue aVal;
+    aVal.Name = i_rProperty;
+    aVal.Value = makeAny( i_rValue );
+    return getUIControlOpt( i_rTitle,
+                            aHelpText,
+                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Edit" ) ),
+                            &aVal,
+                            i_rControlOptions
+                            );
+}
diff --git a/vcl/source/gdi/regband.cxx b/vcl/source/gdi/regband.cxx
index 09c97ef7cd2b..14f45b4beafd 100644
--- a/vcl/source/gdi/regband.cxx
+++ b/vcl/source/gdi/regband.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: regband.cxx,v $
- * $Revision: 1.9.158.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/region.cxx b/vcl/source/gdi/region.cxx
index fefbf8cdcb08..07351e1c0fce 100644
--- a/vcl/source/gdi/region.cxx
+++ b/vcl/source/gdi/region.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: region.cxx,v $
- * $Revision: 1.18.36.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index c1f987377c67..9354b0f72130 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.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: salgdilayout.cxx,v $
- * $Revision: 1.31.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index c8748c65e2d3..344867ebb0b0 100755
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.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: sallayout.cxx,v $
- * $Revision: 1.94.90.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/gdi/salmisc.cxx b/vcl/source/gdi/salmisc.cxx
index 8b442086eabf..31df581f50a2 100644
--- a/vcl/source/gdi/salmisc.cxx
+++ b/vcl/source/gdi/salmisc.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: salmisc.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/vcl/source/gdi/salnativewidgets-none.cxx b/vcl/source/gdi/salnativewidgets-none.cxx
index a454d4f61683..8b87f142ba25 100644
--- a/vcl/source/gdi/salnativewidgets-none.cxx
+++ b/vcl/source/gdi/salnativewidgets-none.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: salnativewidgets-none.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/vcl/source/gdi/svcompat.cxx b/vcl/source/gdi/svcompat.cxx
index 967ead06fece..415cad128a49 100644
--- a/vcl/source/gdi/svcompat.cxx
+++ b/vcl/source/gdi/svcompat.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: svcompat.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/vcl/source/gdi/textlayout.cxx b/vcl/source/gdi/textlayout.cxx
index 67a30c351b7a..78ce197525ec 100755..100644
--- a/vcl/source/gdi/textlayout.cxx
+++ b/vcl/source/gdi/textlayout.cxx
@@ -1,27 +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_vcl.hxx"
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index f1c532a9295f..4c1439ffe6f4 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.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: virdev.cxx,v $
- * $Revision: 1.33 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -359,27 +356,40 @@ BOOL VirtualDevice::SetOutputSizePixel( const Size& rNewSize, BOOL bErase )
 
 // -----------------------------------------------------------------------
 
-void VirtualDevice::SetReferenceDevice( RefDevMode eRefDevMode )
+void VirtualDevice::SetReferenceDevice( RefDevMode i_eRefDevMode )
 {
-    switch( eRefDevMode )
+    sal_Int32 nDPIX = 600, nDPIY = 600;
+    switch( i_eRefDevMode )
     {
     case REFDEV_NONE:
     default:
         DBG_ASSERT( FALSE, "VDev::SetRefDev illegal argument!" );
-        // fall through
+        break;
     case REFDEV_MODE06:
-        mnDPIX = mnDPIY = 600;
+        nDPIX = nDPIY = 600;
         break;
     case REFDEV_MODE48:
-        mnDPIX = mnDPIY = 4800;
+        nDPIX = nDPIY = 4800;
         break;
     case REFDEV_MODE_MSO1:
-        mnDPIX = mnDPIY = 6*1440;
+        nDPIX = nDPIY = 6*1440;
         break;
     case REFDEV_MODE_PDF1:
-        mnDPIX = mnDPIY = 720;
+        nDPIX = nDPIY = 720;
         break;
     }
+    ImplSetReferenceDevice( i_eRefDevMode, nDPIX, nDPIY );
+}
+
+void VirtualDevice::SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY )
+{
+    ImplSetReferenceDevice( REFDEV_CUSTOM, i_nDPIX, i_nDPIY );
+}
+
+void VirtualDevice::ImplSetReferenceDevice( RefDevMode i_eRefDevMode, sal_Int32 i_nDPIX, sal_Int32 i_nDPIY )
+{
+    mnDPIX = i_nDPIX;
+    mnDPIY = i_nDPIY;
 
     EnableOutput( FALSE );  // prevent output on reference device
     mbScreenComp = FALSE;
@@ -391,7 +401,7 @@ void VirtualDevice::SetReferenceDevice( RefDevMode eRefDevMode )
     // avoid adjusting font lists when already in refdev mode
     BYTE nOldRefDevMode = meRefDevMode;
     BYTE nOldCompatFlag = (BYTE)meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD;
-    meRefDevMode = (BYTE)(eRefDevMode | nOldCompatFlag);
+    meRefDevMode = (BYTE)(i_eRefDevMode | nOldCompatFlag);
     if( (nOldRefDevMode ^ nOldCompatFlag) != REFDEV_NONE )
         return;
 
diff --git a/vcl/source/gdi/wall.cxx b/vcl/source/gdi/wall.cxx
index 587395fa783f..10aa4431f69d 100644
--- a/vcl/source/gdi/wall.cxx
+++ b/vcl/source/gdi/wall.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: wall.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/vcl/source/glyphs/gcach_ftyp.cxx b/vcl/source/glyphs/gcach_ftyp.cxx
index b92bea929c51..a337f2553ff7 100644
--- a/vcl/source/glyphs/gcach_ftyp.cxx
+++ b/vcl/source/glyphs/gcach_ftyp.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
  *
@@ -2486,14 +2486,12 @@ bool FreetypeServerFont::ApplyGSUB( const ImplFontSelectData& rFSD )
                         pCoverage += 2;
                         for( int i = nCntRange; --i >= 0; )
                         {
-                            const USHORT nGlyph0 = GetUShort( pCoverage+0 );
-                            const USHORT nGlyph1 = GetUShort( pCoverage+2 );
-                            const USHORT nStartCoverageIndex = GetUShort( pCoverage+4 );
-                            DBG_ASSERT( aSubstVector.size() == nStartCoverageIndex, "coverage index mismatch");
-                            (void)nStartCoverageIndex;
+                            const UINT32 nGlyph0 = GetUShort( pCoverage+0 );
+                            const UINT32 nGlyph1 = GetUShort( pCoverage+2 );
+                            const USHORT nCovIdx = GetUShort( pCoverage+4 );
                             pCoverage += 6;
-                            for( USHORT j = nGlyph0; j <= nGlyph1; ++j )
-                                aSubstVector.push_back( GlyphSubst( j, 0 ) );
+                            for( UINT32 j = nGlyph0; j <= nGlyph1; ++j )
+                                aSubstVector.push_back( GlyphSubst( static_cast<USHORT>(j + nCovIdx), 0 ) );
                         }
                     }
                     break;
@@ -2537,3 +2535,4 @@ bool FreetypeServerFont::ApplyGSUB( const ImplFontSelectData& rFSD )
 }
 
 // =======================================================================
+
diff --git a/vcl/source/glyphs/gcach_ftyp.hxx b/vcl/source/glyphs/gcach_ftyp.hxx
index 936abdc02e59..2a181b494c9f 100644
--- a/vcl/source/glyphs/gcach_ftyp.hxx
+++ b/vcl/source/glyphs/gcach_ftyp.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/vcl/source/glyphs/gcach_layout.cxx b/vcl/source/glyphs/gcach_layout.cxx
index 364a1fcd3beb..a9f9167062ba 100644
--- a/vcl/source/glyphs/gcach_layout.cxx
+++ b/vcl/source/glyphs/gcach_layout.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/vcl/source/glyphs/gcach_rbmp.cxx b/vcl/source/glyphs/gcach_rbmp.cxx
index 1419a205f9a6..5ea80da77794 100644
--- a/vcl/source/glyphs/gcach_rbmp.cxx
+++ b/vcl/source/glyphs/gcach_rbmp.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/vcl/source/glyphs/gcach_vdev.cxx b/vcl/source/glyphs/gcach_vdev.cxx
index 1ac9ee9bf0a6..8cd45cf58224 100644
--- a/vcl/source/glyphs/gcach_vdev.cxx
+++ b/vcl/source/glyphs/gcach_vdev.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/vcl/source/glyphs/gcach_vdev.hxx b/vcl/source/glyphs/gcach_vdev.hxx
index 01ebc0f704cd..e2349169ee13 100644
--- a/vcl/source/glyphs/gcach_vdev.hxx
+++ b/vcl/source/glyphs/gcach_vdev.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/vcl/source/glyphs/glyphcache.cxx b/vcl/source/glyphs/glyphcache.cxx
index 17e70c539254..34133a39ac95 100644
--- a/vcl/source/glyphs/glyphcache.cxx
+++ b/vcl/source/glyphs/glyphcache.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/vcl/source/glyphs/graphite_adaptors.cxx b/vcl/source/glyphs/graphite_adaptors.cxx
index 34e2f5f5bbe3..4afced765612 100644
--- a/vcl/source/glyphs/graphite_adaptors.cxx
+++ b/vcl/source/glyphs/graphite_adaptors.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -171,7 +168,7 @@ GraphiteFontAdaptor::~GraphiteFontAdaptor() throw()
     mpFeatures = NULL;
 }
 
-void GraphiteFontAdaptor::UniqueCacheInfo(std::wstring & face_name_out, bool & bold_out, bool & italic_out)
+void GraphiteFontAdaptor::UniqueCacheInfo(sil_std::wstring & face_name_out, bool & bold_out, bool & italic_out)
 {
     face_name_out = maFontProperties.szFaceName;
     bold_out = maFontProperties.fBold;
diff --git a/vcl/source/glyphs/graphite_cache.cxx b/vcl/source/glyphs/graphite_cache.cxx
index 8c514c611d2c..713f3c1ed088 100644
--- a/vcl/source/glyphs/graphite_cache.cxx
+++ b/vcl/source/glyphs/graphite_cache.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
  *
@@ -36,8 +36,10 @@
 #include <tools/debug.hxx>
 #include <vcl/sallayout.hxx>
 
+#include "pregraphitestl.h"
 #include <graphite/GrClient.h>
 #include <graphite/Segment.h>
+#include "postgraphitestl.h"
 
 #include <rtl/ustring.hxx>
 #include <vcl/graphite_layout.hxx>
diff --git a/vcl/source/glyphs/graphite_features.cxx b/vcl/source/glyphs/graphite_features.cxx
index dae1bfc2866e..bae96642da30 100644
--- a/vcl/source/glyphs/graphite_features.cxx
+++ b/vcl/source/glyphs/graphite_features.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -91,7 +88,7 @@ GrFeatureParser::GrFeatureParser(gr::Font & font, const std::string features, co
                 gr::isocode aLang = maLang;
                 for (size_t i = pos; i < nFeatEnd; i++)
                     aLang.rgch[i-pos] = features[i];
-                std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported
+                sil_std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported
                     = font.getSupportedLanguages();
                 gr::LanguageIterator iL = aSupported.first;
                 while (iL != aSupported.second)
@@ -142,7 +139,7 @@ void GrFeatureParser::setLang(gr::Font & font, const std::string & lang)
             if (lang[i] == '-') break;
             aLang.rgch[i] = lang[i];
         }
-        std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported
+        sil_std::pair<gr::LanguageIterator,gr::LanguageIterator> aSupported
                     = font.getSupportedLanguages();
         gr::LanguageIterator iL = aSupported.first;
         while (iL != aSupported.second)
@@ -189,7 +186,7 @@ bool GrFeatureParser::isValid(gr::Font & font, gr::FeatureSetting & setting)
     {
         return false;
     }
-    std::pair< gr::FeatureSettingIterator, gr::FeatureSettingIterator >
+    sil_std::pair< gr::FeatureSettingIterator, gr::FeatureSettingIterator >
         validValues = font.getFeatureSettings(i);
     gr::FeatureSettingIterator j = validValues.first;
     while (j != validValues.second)
diff --git a/vcl/source/glyphs/graphite_layout.cxx b/vcl/source/glyphs/graphite_layout.cxx
index 86dee2749efa..25ea77dd07a3 100644
--- a/vcl/source/glyphs/graphite_layout.cxx
+++ b/vcl/source/glyphs/graphite_layout.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -66,11 +63,13 @@
 #include <unicode/uscript.h>
 
 // Graphite Libraries (must be after vcl headers on windows)
+#include "pregraphitestl.h"
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/ITextSource.h>
 #include <graphite/Segment.h>
 #include <graphite/SegmentPainter.h>
+#include "postgraphitestl.h"
 
 #include <vcl/graphite_layout.hxx>
 #include <vcl/graphite_features.hxx>
@@ -105,8 +104,8 @@ FILE * grLog()
 
 namespace
 {
-    typedef std::pair<gr::GlyphIterator, gr::GlyphIterator>       glyph_range_t;
-    typedef std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> glyph_set_range_t;
+    typedef sil_std::pair<gr::GlyphIterator, gr::GlyphIterator>       glyph_range_t;
+    typedef sil_std::pair<gr::GlyphSetIterator, gr::GlyphSetIterator> glyph_set_range_t;
 
     inline long round(const float n) {
         return long(n + (n < 0 ? -0.5 : 0.5));
@@ -171,7 +170,7 @@ GraphiteLayout::Glyphs::fill_from(gr::Segment & rSegment, ImplLayoutArgs &rArgs,
     bool bRtl, long &rWidth, float fScaling, std::vector<int> & rChar2Base, std::vector<int> & rGlyph2Char, std::vector<int> & rCharDxs)
 {
     // Create a glyph item for each of the glyph and append it to the base class glyph list.
-    typedef std::pair< gr::GlyphSetIterator, gr::GlyphSetIterator > GrGlyphSet;
+    typedef sil_std::pair< gr::GlyphSetIterator, gr::GlyphSetIterator > GrGlyphSet;
     int nChar = rArgs.mnEndCharPos - rArgs.mnMinCharPos;
     glyph_range_t iGlyphs = rSegment.glyphs();
     int nGlyphs = iGlyphs.second - iGlyphs.first;
@@ -586,7 +585,7 @@ public:
     sal_Int32 hashCode(const grutils::GrFeatureParser * mpFeatures)
     {
         // is this sufficient?
-        std::wstring aFace;
+        sil_std::wstring aFace;
         bool bBold;
         bool bItalic;
         UniqueCacheInfo(aFace, bBold, bItalic);
@@ -720,6 +719,7 @@ bool GraphiteLayout::LayoutGlyphs(ImplLayoutArgs& rArgs, gr::Segment * pSegment)
 #ifdef GRCACHE_REUSE_VECTORS
     // if we have an exact match, then we can reuse the glyph vectors from before
     if (pSegRecord && (pSegRecord->glyphs().size() > 0) &&
+        (pSegRecord->fontScale() == mfScaling) &&
         !(SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags) )
     {
         mnWidth = pSegRecord->width();
@@ -765,7 +765,8 @@ bool GraphiteLayout::LayoutGlyphs(ImplLayoutArgs& rArgs, gr::Segment * pSegment)
                 !(SAL_LAYOUT_FOR_FALLBACK & rArgs.mnFlags))
             {
                 pSegRecord->setGlyphVectors(mnWidth, mvGlyphs, mvCharDxs,
-                                            mvChar2BaseGlyph, mvGlyph2Char);
+                                            mvChar2BaseGlyph, mvGlyph2Char,
+                                            mfScaling);
             }
 #endif
 #endif
diff --git a/vcl/source/glyphs/graphite_serverfont.cxx b/vcl/source/glyphs/graphite_serverfont.cxx
index be424c94b9d2..eda97f509f03 100644
--- a/vcl/source/glyphs/graphite_serverfont.cxx
+++ b/vcl/source/glyphs/graphite_serverfont.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/glyphs/graphite_textsrc.cxx b/vcl/source/glyphs/graphite_textsrc.cxx
index adc2ae99c4f8..d7547662e065 100644
--- a/vcl/source/glyphs/graphite_textsrc.cxx
+++ b/vcl/source/glyphs/graphite_textsrc.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -138,16 +135,16 @@ gr::isocode TextSourceAdaptor::getLanguage(gr::toffset)
     return unknown;
 }
 
-std::pair<gr::toffset, gr::toffset> TextSourceAdaptor::propertyRange(gr::toffset nCharIdx)
+sil_std::pair<gr::toffset, gr::toffset> TextSourceAdaptor::propertyRange(gr::toffset nCharIdx)
 {
 
     if (nCharIdx < unsigned(maLayoutArgs.mnMinCharPos))
-        return std::make_pair(0, maLayoutArgs.mnMinCharPos);
+        return sil_std::make_pair(0, maLayoutArgs.mnMinCharPos);
 
     if (nCharIdx < mnEnd)
-        return std::make_pair(maLayoutArgs.mnMinCharPos, mnEnd);
+        return sil_std::make_pair(maLayoutArgs.mnMinCharPos, mnEnd);
 
-    return std::make_pair(mnEnd, maLayoutArgs.mnLength);
+    return sil_std::make_pair(mnEnd, maLayoutArgs.mnLength);
 }
 
 size_t TextSourceAdaptor::getFontFeatures(gr::toffset, gr::FeatureSetting * settings)
@@ -159,7 +156,7 @@ size_t TextSourceAdaptor::getFontFeatures(gr::toffset, gr::FeatureSetting * sett
 
 bool TextSourceAdaptor::sameSegment(gr::toffset char_idx1, gr::toffset char_idx2)
 {
-    const std::pair<gr::toffset, gr::toffset>
+    const sil_std::pair<gr::toffset, gr::toffset>
     range1 = propertyRange(char_idx1),
     range2 = propertyRange(char_idx2);
 
diff --git a/vcl/source/glyphs/graphite_textsrc.hxx b/vcl/source/glyphs/graphite_textsrc.hxx
index 6f701988bb01..2397d6a5f701 100644
--- a/vcl/source/glyphs/graphite_textsrc.hxx
+++ b/vcl/source/glyphs/graphite_textsrc.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:  $
- * $Revision:  $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -62,9 +59,11 @@
 #include "vcl/dllapi.h"
 
 // Libraries
+#include "pregraphitestl.h"
 #include <graphite/GrClient.h>
 #include <graphite/Font.h>
 #include <graphite/ITextSource.h>
+#include "postgraphitestl.h"
 
 // Module type definitions and forward declarations.
 //
@@ -91,7 +90,7 @@ public:
         virtual float           getVerticalOffset(gr::toffset ich);
         virtual gr::isocode     getLanguage(gr::toffset ich);
 
-        virtual std::pair<gr::toffset, gr::toffset> propertyRange(gr::toffset ich);
+        virtual sil_std::pair<gr::toffset, gr::toffset> propertyRange(gr::toffset ich);
         virtual size_t  getFontFeatures(gr::toffset ich, gr::FeatureSetting * prgfset);
         virtual bool    sameSegment(gr::toffset ich1, gr::toffset ich2);
 
diff --git a/vcl/source/glyphs/makefile.mk b/vcl/source/glyphs/makefile.mk
index e43daaeac2ee..74811aba6204 100644
--- a/vcl/source/glyphs/makefile.mk
+++ b/vcl/source/glyphs/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/vcl/source/helper/canvasbitmap.cxx b/vcl/source/helper/canvasbitmap.cxx
index 1e487b141d80..2bc0ab94d272 100644
--- a/vcl/source/helper/canvasbitmap.cxx
+++ b/vcl/source/helper/canvasbitmap.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: canvasbitmap.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/vcl/source/helper/canvastools.cxx b/vcl/source/helper/canvastools.cxx
index a4a991366d97..71c306ff9bbb 100644
--- a/vcl/source/helper/canvastools.cxx
+++ b/vcl/source/helper/canvastools.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: canvastools.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/vcl/source/helper/evntpost.cxx b/vcl/source/helper/evntpost.cxx
index 347fa2831a2e..9e200a3136c3 100644
--- a/vcl/source/helper/evntpost.cxx
+++ b/vcl/source/helper/evntpost.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: evntpost.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/vcl/source/helper/lazydelete.cxx b/vcl/source/helper/lazydelete.cxx
index a300aedf8175..7b244781c3c7 100644
--- a/vcl/source/helper/lazydelete.cxx
+++ b/vcl/source/helper/lazydelete.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: lazydelete.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/vcl/source/helper/makefile.mk b/vcl/source/helper/makefile.mk
index 6f0d4959c9c4..e708bdec9eaa 100644
--- a/vcl/source/helper/makefile.mk
+++ b/vcl/source/helper/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.20 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/helper/smartid.cxx b/vcl/source/helper/smartid.cxx
index 73ad6f89a21c..c367aeb2bce5 100755
--- a/vcl/source/helper/smartid.cxx
+++ b/vcl/source/helper/smartid.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: smartid.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/vcl/source/helper/strhelper.cxx b/vcl/source/helper/strhelper.cxx
index 5b503fa65c05..db622073cea9 100644
--- a/vcl/source/helper/strhelper.cxx
+++ b/vcl/source/helper/strhelper.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: strhelper.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/vcl/source/helper/threadex.cxx b/vcl/source/helper/threadex.cxx
index ae6a5935d23e..133b19aa0538 100644
--- a/vcl/source/helper/threadex.cxx
+++ b/vcl/source/helper/threadex.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: threadex.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/vcl/source/helper/xconnection.cxx b/vcl/source/helper/xconnection.cxx
index 477ff5fb9902..19ac9103bf96 100644
--- a/vcl/source/helper/xconnection.cxx
+++ b/vcl/source/helper/xconnection.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: xconnection.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -30,10 +27,31 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
-#include <svsys.h>
-#include <vcl/xconnection.hxx>
-#include <vcl/svdata.hxx>
-#include <vcl/salinst.hxx>
+
+#include "svsys.h"
+#include "vcl/xconnection.hxx"
+#include "vcl/svdata.hxx"
+#include "vcl/salinst.hxx"
+#include "vcl/svapp.hxx"
+
+namespace vcl
+{
+    class SolarMutexReleaser
+    {
+        ULONG mnReleased;
+    public:
+        SolarMutexReleaser()
+        {
+            mnReleased = Application::ReleaseSolarMutex();
+        }
+
+        ~SolarMutexReleaser()
+        {
+            if( mnReleased )
+                Application::AcquireSolarMutex( mnReleased );
+        }
+    };
+}
 
 using namespace rtl;
 using namespace osl;
@@ -41,6 +59,7 @@ using namespace vcl;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::awt;
 
+
 DisplayConnection::DisplayConnection()
 {
     ImplSVData* pSVData = ImplGetSVData();
@@ -108,6 +127,8 @@ Any SAL_CALL DisplayConnection::getIdentifier() throw()
 
 void DisplayConnection::dispatchDowningEvent()
 {
+    SolarMutexReleaser aRel;
+
     MutexGuard aGuard( m_aMutex );
     Any aEvent;
     std::list< Reference< XEventHandler > > aLocalList( m_aHandlers );
@@ -117,6 +138,8 @@ void DisplayConnection::dispatchDowningEvent()
 
 bool DisplayConnection::dispatchEvent( void* pThis, void* pData, int nBytes )
 {
+    SolarMutexReleaser aRel;
+
     DisplayConnection* This = (DisplayConnection*)pThis;
     MutexGuard aGuard( This->m_aMutex );
 
@@ -131,6 +154,8 @@ bool DisplayConnection::dispatchEvent( void* pThis, void* pData, int nBytes )
 
 bool DisplayConnection::dispatchErrorEvent( void* pThis, void* pData, int nBytes )
 {
+    SolarMutexReleaser aRel;
+
     DisplayConnection* This = (DisplayConnection*)pThis;
     MutexGuard aGuard( This->m_aMutex );
 
diff --git a/vcl/source/salmain/makefile.mk b/vcl/source/salmain/makefile.mk
index 9eac20ad6fed..de085b482c4d 100644
--- a/vcl/source/salmain/makefile.mk
+++ b/vcl/source/salmain/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.3 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/salmain/salmain.cxx b/vcl/source/salmain/salmain.cxx
index 25f00d1ad6eb..c2e3af01635a 100644
--- a/vcl/source/salmain/salmain.cxx
+++ b/vcl/source/salmain/salmain.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: salmain.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/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index 271161cf96cf..6d2360dae6cb 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.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: btntext.src,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/vcl/source/src/helptext.src b/vcl/source/src/helptext.src
index f64f55a5a7ed..a42a9531d9ee 100644
--- a/vcl/source/src/helptext.src
+++ b/vcl/source/src/helptext.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: helptext.src,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/vcl/source/src/images.src b/vcl/source/src/images.src
index a2b057c8d234..fdb1e755c86a 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.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: images.src,v $
- * $Revision: 1.7 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -833,3 +830,23 @@ Bitmap (SV_ICON_SMALL_HC_START + SV_ICON_ID_PRINTERADMIN)
     File = "printeradmin_16_h.png" ;
 };
 
+Bitmap SV_DISCLOSURE_PLUS
+{
+    File = "plus.png";
+};
+
+Bitmap SV_DISCLOSURE_PLUS_HC
+{
+    File = "plus_sch.png";
+};
+
+Bitmap SV_DISCLOSURE_MINUS
+{
+    File = "minus.png";
+};
+
+Bitmap SV_DISCLOSURE_MINUS_HC
+{
+    File = "minus_sch.png";
+};
+
diff --git a/vcl/source/src/makefile.mk b/vcl/source/src/makefile.mk
index cf01c74b977d..40b7d4e75dfe 100644
--- a/vcl/source/src/makefile.mk
+++ b/vcl/source/src/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -47,7 +43,8 @@ SRC1FILES=			images.src			\
                     stdtext.src 		\
                     helptext.src		\
                     units.src		    \
-                    btntext.src
+                    btntext.src         \
+                    print.src
 
 RESLIB1NAME=		$(RESTARGET)
 RESLIB1IMAGES= $(PRJ)$/source/src
diff --git a/vcl/source/src/menu.src b/vcl/source/src/menu.src
index 7e9400dae664..1833093adfac 100644
--- a/vcl/source/src/menu.src
+++ b/vcl/source/src/menu.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: menu.src,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/vcl/source/src/print.src b/vcl/source/src/print.src
new file mode 100644
index 000000000000..3158926f5e6d
--- /dev/null
+++ b/vcl/source/src/print.src
@@ -0,0 +1,492 @@
+/*************************************************************************
+ *
+ * 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 "vcl/svids.hrc"
+
+ModalDialog SV_DLG_PRINT
+{
+    Text [en-US] = "Print";
+    Closeable = TRUE;
+    Sizeable = TRUE;
+    Moveable = TRUE;
+    Maxable = TRUE;
+    SVLook = TRUE;
+
+    Size = MAP_APPFONT( 350, 215 );
+
+    OKButton SV_PRINT_OK
+    {
+        DefButton = TRUE;
+        Pos = MAP_APPFONT( 240, 195 );
+        Size = MAP_APPFONT( 50, 15 );
+        Text [en-US] = "~Print";
+    };
+    CancelButton SV_PRINT_CANCEL
+    {
+        Pos = MAP_APPFONT( 295, 195 );
+        Size = MAP_APPFONT( 50, 15 );
+    };
+    HelpButton SV_PRINT_HELP
+    {
+        Pos = MAP_APPFONT( 5, 5 );
+        Size = MAP_APPFONT( 50, 15 );
+    };
+
+    Window SV_PRINT_PAGE_PREVIEW
+    {
+        Pos = MAP_APPFONT( 5, 5 );
+        Size = MAP_APPFONT( 130, 130 );
+        Border = FALSE;
+    };
+    NumericField SV_PRINT_PAGE_EDIT
+    {
+        Pos = MAP_APPFONT( 5, 140 );
+        Size = MAP_APPFONT( 30, 12 );
+        SVLook = TRUE;
+        Spin = FALSE;
+        Border = TRUE;
+        HelpText [en-US] = "Select page to display in preview.";
+    };
+    FixedText SV_PRINT_PAGE_TXT
+    {
+        Pos = MAP_APPFONT( 40,142 );
+        Size = MAP_APPFONT( 30, 12 );
+        Text [ en-US ] = "/ %n";
+        VCenter = TRUE;
+    };
+    PushButton SV_PRINT_PAGE_FORWARD
+    {
+        Pos = MAP_APPFONT( 95, 140 );
+        Size = MAP_APPFONT( 15, 12 );
+        HelpText [en-US] = "Scroll one page forward.";
+    };
+    PushButton SV_PRINT_PAGE_BACKWARD
+    {
+        Pos = MAP_APPFONT( 80, 140 );
+        Size = MAP_APPFONT( 15, 12 );
+        HelpText [en-US] = "Scroll one page backward.";
+    };
+    TabControl SV_PRINT_TABCTRL
+    {
+        Pos = MAP_APPFONT( 140, 5 );
+        Size = MAP_APPFONT( 205, 175 );
+    };
+    FixedLine SV_PRINT_BUTTONLINE
+    {
+        Pos = MAP_APPFONT( 0, 185 );
+        Size = MAP_APPFONT( 350, 8 );
+    };
+    String SV_PRINT_NOPAGES
+    {
+        Text [en-US] = "No pages";
+    };
+
+    String SV_PRINT_TOFILE_TXT
+    {
+        Text [en-US] = "Print to File...";
+    };
+
+    String SV_PRINT_DEFPRT_TXT
+    {
+        Text [en-US] = "Default printer";
+    };
+
+
+    String SV_PRINT_PRINTPREVIEW_TXT
+    {
+        Text [en-US] = "Print preview";
+    };
+
+    TabPage SV_PRINT_TAB_NUP
+    {
+        Text [en-US] = "Page Layout";
+        Hide = TRUE;
+
+        FixedLine SV_PRINT_PRT_NUP_LAYOUT_FL
+        {
+            Pos = MAP_APPFONT( 5, 5 );
+            Size = MAP_APPFONT( 150, 10 );
+            Text [en-US] = "Layout";
+        };
+        RadioButton SV_PRINT_PRT_NUP_DEFAULT_BTN
+        {
+            Pos = MAP_APPFONT( 0, 0 );
+            Size = MAP_APPFONT( 10, 10 );
+            Text [en-US] = "~Default";
+            HelpText [en-US] = "Print one page per sheet of paper.";
+        };
+        RadioButton SV_PRINT_PRT_NUP_BROCHURE_BTN
+        {
+            Pos = MAP_APPFONT( 0, 0 );
+            Size = MAP_APPFONT( 10, 10 );
+            Text = "";
+        };
+        RadioButton SV_PRINT_PRT_NUP_PAGES_BTN
+        {
+            Pos = MAP_APPFONT( 0, 0 );
+            Size = MAP_APPFONT( 10, 10 );
+            Text [en-US] = "Pa~ges per sheet";
+            HelpText [en-US] = "Print multiple pages per sheet of paper.";
+        };
+        ListBox SV_PRINT_PRT_NUP_PAGES_BOX
+        {
+            Pos = MAP_APPFONT( 0, 0 );
+            Size = MAP_APPFONT( 10, 80 );
+            Border = TRUE;
+            DropDown = TRUE;
+            CurPos = 0;
+            HelpText [en-US] = "Select how many pages to print per sheet of paper.";
+            StringList [en-US] =
+            {
+                < "1"; 1; >;
+                < "2"; 2; >;
+                < "4"; 4; >;
+                < "6"; 6; >;
+                < "9"; 9; >;
+                < "16"; 16; >;
+                < "Custom"; 0xffff; >;
+            };
+        };
+        FixedText SV_PRINT_PRT_NUP_NUM_PAGES_TXT
+        {
+            Pos = MAP_APPFONT( 0, 0 );
+            Size = MAP_APPFONT( 10, 10 );
+            Text [en-US] = "P~ages";
+            VCenter = TRUE;
+        };
+        NumericField SV_PRINT_PRT_NUP_COLS_EDT
+        {
+            Pos = MAP_APPFONT( 55, 20 );
+            Size = MAP_APPFONT( 40, 12 );
+            Border = TRUE;
+            Spin = TRUE;
+            Minimum = 1;
+            Maximum = 32;
+            Value = 1;
+            HelpText [en-US] = "Select number of columns.";
+        };
+        FixedText SV_PRINT_PRT_NUP_TIMES_TXT
+        {
+            Pos = MAP_APPFONT( 10, 35 );
+            Size = MAP_APPFONT( 40, 10 );
+            Text [en-US] = "b~y";
+            VCenter = TRUE;
+        };
+        NumericField SV_PRINT_PRT_NUP_ROWS_EDT
+        {
+            Pos = MAP_APPFONT( 55, 35 );
+            Size = MAP_APPFONT( 40, 12 );
+            Border = TRUE;
+            Spin = TRUE;
+            Minimum = 1;
+            Maximum = 32;
+            Value = 1;
+            HelpText [en-US] = "Select number of rows.";
+        };
+        FixedText SV_PRINT_PRT_NUP_MARGINS_PAGES_1_TXT
+        {
+            Pos = MAP_APPFONT( 10, 95 );
+            Size = MAP_APPFONT( 40, 10 );
+            Text [en-US] = "~Distance";
+        };
+        MetricField SV_PRINT_PRT_NUP_MARGINS_PAGES_EDT
+        {
+            Pos = MAP_APPFONT( 55, 95 );
+            Size = MAP_APPFONT( 40, 12 );
+            Spin = TRUE;
+            Border = TRUE;
+            Value = 0;
+            Unit = FUNIT_MM;
+            HelpText [en-US] = "Select margin between individual pages on each sheet of paper.";
+        };
+        FixedText SV_PRINT_PRT_NUP_MARGINS_PAGES_2_TXT
+        {
+            Pos = MAP_APPFONT( 10, 95 );
+            Size = MAP_APPFONT( 40, 10 );
+            Text [en-US] = "between pages";
+        };
+        FixedText SV_PRINT_PRT_NUP_MARGINS_SHEET_1_TXT
+        {
+            Pos = MAP_APPFONT( 110, 95 );
+            Size = MAP_APPFONT( 40, 10 );
+            Text [en-US] = "~Margin";
+        };
+        MetricField SV_PRINT_PRT_NUP_MARGINS_SHEET_EDT
+        {
+            Pos = MAP_APPFONT( 155, 95 );
+            Size = MAP_APPFONT( 40, 12 );
+            Spin = TRUE;
+            Border = TRUE;
+            Value = 0;
+            Unit = FUNIT_MM;
+            HelpText [en-US] = "Select margin between the printed pages and paper edge.";
+        };
+        FixedText SV_PRINT_PRT_NUP_MARGINS_SHEET_2_TXT
+        {
+            Pos = MAP_APPFONT( 110, 95 );
+            Size = MAP_APPFONT( 40, 10 );
+            Text [en-US] = "to sheet border";
+        };
+        FixedText SV_PRINT_PRT_NUP_ORIENTATION_TXT
+        {
+            Pos = MAP_APPFONT( 0, 0 );
+            Size = MAP_APPFONT( 10, 10 );
+            Text [en-US] = "~Orientation";
+        };
+        ListBox SV_PRINT_PRT_NUP_ORIENTATION_BOX
+        {
+            Pos = MAP_APPFONT( 0, 0 );
+            Size = MAP_APPFONT( 10, 40 );
+            Border = TRUE;
+            DropDown = TRUE;
+            CurPos = 0;
+            StringList [en-US] =
+            {
+                < "Automatic"; SV_PRINT_PRT_NUP_ORIENTATION_AUTOMATIC; >;
+                < "Portrait"; SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT; >;
+                < "Landscape"; SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE; >;
+            };
+            HelpText [en-US] = "Select the orientation of the paper.";
+        };
+        FixedText SV_PRINT_PRT_NUP_ORDER_TXT
+        {
+            Pos = MAP_APPFONT( 0, 0 );
+            Size = MAP_APPFONT( 10, 10 );
+            Text [en-US] = "Order";
+        };
+        ListBox SV_PRINT_PRT_NUP_ORDER_BOX
+        {
+            Pos = MAP_APPFONT( 0, 0 );
+            Size = MAP_APPFONT( 10, 20 );
+            DropDown = TRUE;
+            Border = TRUE;
+            CurPos = 0;
+            StringList [en-US] =
+            {
+                < "left to right, then down"; SV_PRINT_PRT_NUP_ORDER_LRTD; >;
+                < "top to bottom, then right"; SV_PRINT_PRT_NUP_ORDER_TDLR; >;
+            };
+            HelpText [en-US] = "Select order in which pages are to be printed.";
+        };
+        CheckBox SV_PRINT_PRT_NUP_BORDER_CB
+        {
+            Pos = MAP_APPFONT( 10, 65 );
+            Size = MAP_APPFONT( 150, 12 );
+            Text [en-US] = "Draw a border around each page";
+            HelpText [en-US] = "Check to draw a border around each page.";
+        };
+    };
+
+    TabPage SV_PRINT_TAB_JOB
+    {
+        Text [en-US] = "General";
+        Hide = TRUE;
+
+        FixedLine SV_PRINT_PRINTERS_FL
+        {
+            Pos = MAP_APPFONT( 5, 5 );
+            Size = MAP_APPFONT( 100, 10 );
+            Text [ en-US ] = "Prin~ter";
+        };
+        ListBox SV_PRINT_PRINTERS
+        {
+            Pos = MAP_APPFONT( 5, 5 );
+            Size = MAP_APPFONT( 100, 80 );
+            Border = TRUE;
+            Sort = TRUE;
+            HelpText [en-US] = "Select the printer to print on.";
+        };
+        CheckBox SV_PRINT_DETAILS_BTN
+        {
+            Pos = MAP_APPFONT( 5, 5 );
+            Size = MAP_APPFONT( 5, 5 );
+            Text [en-US] = "Details";
+            HelpText [en-US] = "Show/Hide detailed information of the selected printer.";
+        };
+        FixedText SV_PRINT_STATUS_TXT
+        {
+            Pos = MAP_APPFONT( 5, 5 );
+            Size = MAP_APPFONT( 100, 10 );
+            Text [en-US] = "Status:";
+        };
+        FixedText SV_PRINT_LOCATION_TXT
+        {
+            Pos = MAP_APPFONT( 5, 5 );
+            Size = MAP_APPFONT( 100, 10 );
+            Text [en-US] = "Location:";
+        };
+        FixedText SV_PRINT_COMMENT_TXT
+        {
+            Pos = MAP_APPFONT( 5, 5 );
+            Size = MAP_APPFONT( 100, 10 );
+            Text [en-US] = "Comment:";
+        };
+        PushButton SV_PRINT_PRT_SETUP
+        {
+            Pos = MAP_APPFONT( 115, 5 );
+            Size = MAP_APPFONT( 50, 15 );
+            Text [en-US] = "Properties...";
+            HelpText [en-US] = "Call the setup dialog of the selected printer.";
+        };
+        FixedLine SV_PRINT_COPIES
+        {
+            Pos = MAP_APPFONT( 5, 35 );
+            Size = MAP_APPFONT( 150, 10 );
+            Text [en-US] = "Range and Copies";
+        };
+        FixedText SV_PRINT_COPYCOUNT
+        {
+            Pos = MAP_APPFONT( 10, 45 );
+            Size = MAP_APPFONT( 80, 10 );
+            Text [en-US] = "Number of copies";
+        };
+        NumericField SV_PRINT_COPYCOUNT_FIELD
+        {
+            Pos = MAP_APPFONT( 10, 56 );
+            Size = MAP_APPFONT( 40, 12 );
+            Border = TRUE;
+            Spin = TRUE;
+            Minimum = 1;
+            Maximum = 16384;
+            Value = 1;
+            HelpText [en-US] = "Select the number of copies to be produced.";
+        };
+        FixedImage SV_PRINT_COLLATE_IMAGE
+        {
+            Pos = MAP_APPFONT( 95, 60 );
+            Size = MAP_PIXEL( 80, 30 );
+        };
+        CheckBox SV_PRINT_COLLATE
+        {
+            Pos = MAP_APPFONT( 95, 45 );
+            Size = MAP_APPFONT( 70, 10 );
+            Text [en-US] = "Collate";
+            HelpText [en-US] = "Select whether copies should be collated or not.";
+        };
+
+        Image SV_PRINT_COLLATE_IMG
+        {
+            ImageBitmap = Bitmap { File = "collate.png" ; };
+        };
+
+        Image SV_PRINT_NOCOLLATE_IMG
+        {
+            ImageBitmap = Bitmap { File = "ncollate.png" ; };
+        };
+
+        Image SV_PRINT_COLLATE_HC_IMG
+        {
+            ImageBitmap = Bitmap { File = "collate_h.png" ; };
+        };
+
+        Image SV_PRINT_NOCOLLATE_HC_IMG
+        {
+            ImageBitmap = Bitmap { File = "ncollate_h.png" ; };
+        };
+    };
+
+    TabPage SV_PRINT_TAB_OPT
+    {
+        Text [en-US] = "Options";
+        Hide = TRUE;
+
+        FixedLine SV_PRINT_OPT_PRINT_FL
+        {
+            Pos = MAP_APPFONT( 5, 5 );
+            Size = MAP_APPFONT( 150, 10 );
+            Text [en-US] = "Options";
+        };
+        CheckBox SV_PRINT_OPT_TOFILE
+        {
+            Pos = MAP_APPFONT( 10, 20 );
+            Size = MAP_APPFONT( 200, 12 );
+            Text [en-US] = "Print to ~file";
+            HelpText [en-US] = "Check to send output to a file instead of the actual printer.";
+        };
+        CheckBox SV_PRINT_OPT_SINGLEJOBS
+        {
+            Pos = MAP_APPFONT( 10, 35 );
+            Size = MAP_APPFONT( 200, 12 );
+            Text [en-US] = "~Create single print jobs for collated output";
+            HelpText [en-US] = "Check to not rely on the printer to create collated copies but create a print job for each copy instead.";
+        };
+        CheckBox SV_PRINT_OPT_REVERSE
+        {
+            Pos = MAP_APPFONT( 10, 50 );
+            Size = MAP_APPFONT( 200, 12 );
+            Text [en-US] = "Print in ~reverse page order";
+            HelpText [en-US] = "Check to print pages in reverse order.";
+        };
+    };
+};
+
+ModelessDialog SV_DLG_PRINT_PROGRESS
+{
+    Text [en-US] = "Printing";
+    Closeable = FALSE;
+    Sizeable = FALSE;
+    Moveable = TRUE;
+    SVLook = TRUE;
+
+    Size = MAP_APPFONT( 120, 70 );
+
+    CancelButton SV_PRINT_PROGRESS_CANCEL
+    {
+        Pos = MAP_APPFONT( 35, 50 );
+        Size = MAP_APPFONT( 50, 15 );
+    };
+    FixedText SV_PRINT_PROGRESS_TEXT
+    {
+        Pos = MAP_APPFONT( 5,10 );
+        Size = MAP_APPFONT( 110, 10 );
+        Text [ en-US ] = "Page %p of %n";
+        Center = TRUE;
+    };
+};
+
+ErrorBox SV_PRINT_NOPRINTERWARNING
+{
+    Title = "%PRODUCTNAME";
+    Message [en-US] = "No default printer found.\nPlease choose a printer and try again.";
+};
+
+ErrorBox SV_PRINT_NOCONTENT
+{
+    Title = "%PRODUCTNAME";
+    Message [en-US] = "There are no pages to be printed. Please check your document for ranges relevant to printing.";
+};
+
+StringArray SV_PRINT_NATIVE_STRINGS
+{
+    ItemList [en-US] =
+    {
+        < "Preview"; >;
+        < "Page number"; >;
+        < "Number of pages"; >;
+        < "More"; >;
+    };
+};
diff --git a/vcl/source/src/stdtext.src b/vcl/source/src/stdtext.src
index 5ad1cdceeb61..2c6574220a5f 100644
--- a/vcl/source/src/stdtext.src
+++ b/vcl/source/src/stdtext.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: stdtext.src,v $
- * $Revision: 1.53 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -123,3 +120,8 @@ String SV_MAC_SCREENNNAME
 {
     Text [en-US] = "Screen %d";
 };
+
+String SV_STDTEXT_ALLFILETYPES
+{
+    Text [en-US] = "Any type";
+};
diff --git a/vcl/source/src/units.src b/vcl/source/src/units.src
index 75269dd494bd..16b40b3f41a3 100644
--- a/vcl/source/src/units.src
+++ b/vcl/source/src/units.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: units.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/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 901a1ab0e13d..7f00b73b0808 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.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: abstdlg.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -61,3 +58,7 @@ VclAbstractDialog::~VclAbstractDialog()
 VclAbstractDialog2::~VclAbstractDialog2()
 {
 }
+
+VclAbstractDialogFactory::~VclAbstractDialogFactory()
+{
+}
diff --git a/vcl/source/window/accel.cxx b/vcl/source/window/accel.cxx
index 34e831d2daf8..3018236fff1a 100644
--- a/vcl/source/window/accel.cxx
+++ b/vcl/source/window/accel.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: accel.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/vcl/source/window/accmgr.cxx b/vcl/source/window/accmgr.cxx
index 36064fc8bc6b..81699bcaabb0 100644
--- a/vcl/source/window/accmgr.cxx
+++ b/vcl/source/window/accmgr.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: accmgr.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/vcl/source/window/arrange.cxx b/vcl/source/window/arrange.cxx
new file mode 100644
index 000000000000..dad48235f8fb
--- /dev/null
+++ b/vcl/source/window/arrange.cxx
@@ -0,0 +1,903 @@
+/*************************************************************************
+ *
+ * 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_vcl.hxx"
+
+#include "vcl/arrange.hxx"
+#include "vcl/edit.hxx"
+
+#include "osl/diagnose.h"
+
+using namespace vcl;
+
+// ----------------------------------------
+// vcl::WindowArranger
+//-----------------------------------------
+
+WindowArranger::~WindowArranger()
+{}
+
+void WindowArranger::setParent( WindowArranger* i_pParent )
+{
+    OSL_VERIFY( i_pParent->m_pParentWindow == m_pParentWindow || m_pParentWindow == NULL );
+
+    m_pParentArranger = i_pParent;
+    m_pParentWindow = i_pParent->m_pParentWindow;
+    setParentWindow( m_pParentWindow );
+}
+
+void WindowArranger::setParentWindow( Window* i_pNewParent )
+{
+    m_pParentWindow = i_pNewParent;
+
+    size_t nEle = countElements();
+    for( size_t i = 0; i < nEle; i++ )
+    {
+        Element* pEle = getElement( i );
+        if( pEle ) // sanity check
+        {
+            #if OSL_DEBUG_LEVEL > 0
+            if( pEle->m_pElement )
+            {
+                OSL_VERIFY( pEle->m_pElement->GetParent() == i_pNewParent );
+            }
+            #endif
+            if( pEle->m_pChild )
+                pEle->m_pChild->setParentWindow( i_pNewParent );
+        }
+    }
+}
+
+void WindowArranger::show( bool i_bShow, bool i_bImmediateUpdate )
+{
+    size_t nEle = countElements();
+    for( size_t i = 0; i < nEle; i++ )
+    {
+        Element* pEle = getElement( i );
+        if( pEle ) // sanity check
+        {
+            pEle->m_bHidden = ! i_bShow;
+            if( pEle->m_pElement )
+                pEle->m_pElement->Show( i_bShow );
+            if( pEle->m_pChild.get() )
+                pEle->m_pChild->show( i_bShow, false );
+        }
+    }
+    if( m_pParentArranger )
+    {
+        nEle = m_pParentArranger->countElements();
+        for( size_t i = 0; i < nEle; i++ )
+        {
+            Element* pEle = m_pParentArranger->getElement( i );
+            if( pEle && pEle->m_pChild.get() == this )
+            {
+                pEle->m_bHidden = ! i_bShow;
+                break;
+            }
+        }
+    }
+    if( i_bImmediateUpdate )
+    {
+        // find the topmost parent
+        WindowArranger* pResize = this;
+        while( pResize->m_pParentArranger )
+            pResize = pResize->m_pParentArranger;
+        pResize->resize();
+    }
+}
+
+bool WindowArranger::isVisible() const
+{
+    size_t nEle = countElements();
+    for( size_t i = 0; i < nEle; i++ )
+    {
+        const Element* pEle = getConstElement( i );
+        if( pEle->isVisible() )
+            return true;
+    }
+    return false;
+}
+
+bool WindowArranger::Element::isVisible() const
+{
+    bool bVisible = false;
+    if( ! m_bHidden )
+    {
+        if( m_pElement )
+            bVisible = m_pElement->IsVisible();
+        else if( m_pChild )
+            bVisible = m_pChild->isVisible();
+    }
+    return bVisible;
+}
+
+sal_Int32 WindowArranger::Element::getExpandPriority() const
+{
+    sal_Int32 nPrio = m_nExpandPriority;
+    if( m_pChild && m_nExpandPriority >= 0 )
+    {
+        size_t nElements = m_pChild->countElements();
+        for( size_t i = 0; i < nElements; i++ )
+        {
+            sal_Int32 nCPrio = m_pChild->getExpandPriority( i );
+            if( nCPrio > nPrio )
+                nPrio = nCPrio;
+        }
+    }
+    return nPrio;
+}
+
+Size WindowArranger::Element::getOptimalSize( WindowSizeType i_eType ) const
+{
+    Size aResult;
+    if( ! m_bHidden )
+    {
+        if( m_pElement && m_pElement->IsVisible() )
+            aResult = m_pElement->GetOptimalSize( i_eType );
+        else if( m_pChild )
+            aResult = m_pChild->getOptimalSize( i_eType );
+        if( aResult.Width() < m_aMinSize.Width() )
+            aResult.Width() = m_aMinSize.Width();
+        if( aResult.Height() < m_aMinSize.Height() )
+            aResult.Height() = m_aMinSize.Height();
+        aResult.Width() += m_nLeftBorder + m_nRightBorder;
+        aResult.Height() += m_nTopBorder + m_nBottomBorder;
+    }
+
+    return aResult;
+}
+
+void WindowArranger::Element::setPosSize( const Point& i_rPos, const Size& i_rSize )
+{
+    Point aPoint( i_rPos );
+    Size aSize( i_rSize );
+    aPoint.X() += m_nLeftBorder;
+    aPoint.Y() += m_nTopBorder;
+    aSize.Width() -= m_nLeftBorder + m_nRightBorder;
+    aSize.Height() -= m_nTopBorder + m_nBottomBorder;
+    if( m_pElement )
+        m_pElement->SetPosSizePixel( aPoint, aSize );
+    else if( m_pChild )
+        m_pChild->setManagedArea( Rectangle( aPoint, aSize ) );
+}
+
+// ----------------------------------------
+// vcl::RowOrColumn
+//-----------------------------------------
+
+RowOrColumn::~RowOrColumn()
+{
+    for( std::vector< WindowArranger::Element >::iterator it = m_aElements.begin();
+         it != m_aElements.end(); ++it )
+    {
+        it->deleteChild();
+    }
+}
+
+Size RowOrColumn::getOptimalSize( WindowSizeType i_eType ) const
+{
+    Size aRet( 0, 0 );
+    for( std::vector< WindowArranger::Element >::const_iterator it = m_aElements.begin();
+         it != m_aElements.end(); ++it )
+    {
+        if( it->isVisible() )
+        {
+            // get the size of type of the managed element
+            Size aElementSize( it->getOptimalSize( i_eType ) );
+            if( m_bColumn )
+            {
+                // add the distance between elements
+                aRet.Height() += m_nBorderWidth;
+                // check if the width needs adjustment
+                if( aRet.Width() < aElementSize.Width() )
+                    aRet.Width() = aElementSize.Width();
+                aRet.Height() += aElementSize.Height();
+            }
+            else
+            {
+                // add the distance between elements
+                aRet.Width() += m_nBorderWidth;
+                // check if the height needs adjustment
+                if( aRet.Height() < aElementSize.Height() )
+                    aRet.Height() = aElementSize.Height();
+                aRet.Width() += aElementSize.Width();
+            }
+        }
+    }
+
+    if( aRet.Width() != 0 || aRet.Height() != 0 )
+    {
+        // subtract the border for the first element
+        if( m_bColumn )
+            aRet.Height() -= m_nBorderWidth;
+        else
+            aRet.Width() -= m_nBorderWidth;
+
+        // add the outer border
+        aRet.Width() += 2*m_nOuterBorder;
+        aRet.Height() += 2*m_nOuterBorder;
+    }
+
+    return aRet;
+}
+
+void RowOrColumn::distributeRowWidth( std::vector<Size>& io_rSizes, long /*i_nUsedWidth*/, long i_nExtraWidth )
+{
+    if( ! io_rSizes.empty() && io_rSizes.size() == m_aElements.size() )
+    {
+        // find all elements with the highest expand priority
+        size_t nElements = m_aElements.size();
+        std::vector< size_t > aIndices;
+        sal_Int32 nHighPrio = 0;
+        for( size_t i = 0; i < nElements; i++ )
+        {
+            if( m_aElements[ i ].isVisible() )
+            {
+                sal_Int32 nCurPrio = m_aElements[ i ].getExpandPriority();
+                if( nCurPrio > nHighPrio )
+                {
+                    aIndices.clear();
+                    nHighPrio = nCurPrio;
+                }
+                if( nCurPrio == nHighPrio )
+                    aIndices.push_back( i );
+            }
+        }
+
+        // distribute extra space evenly among collected elements
+        nElements = aIndices.size();
+        if( nElements > 0 )
+        {
+            long nDelta = i_nExtraWidth / nElements;
+            for( size_t i = 0; i < nElements; i++ )
+            {
+                io_rSizes[ aIndices[i] ].Width() += nDelta;
+                i_nExtraWidth -= nDelta;
+            }
+            // add the last pixels to the last row element
+            if( i_nExtraWidth > 0 && nElements > 0 )
+                io_rSizes[aIndices.back()].Width() += i_nExtraWidth;
+        }
+    }
+}
+
+void RowOrColumn::distributeColumnHeight( std::vector<Size>& io_rSizes, long /*i_nUsedHeight*/, long i_nExtraHeight )
+{
+    if( ! io_rSizes.empty() && io_rSizes.size() == m_aElements.size() )
+    {
+        // find all elements with the highest expand priority
+        size_t nElements = m_aElements.size();
+        std::vector< size_t > aIndices;
+        sal_Int32 nHighPrio = 3;
+        for( size_t i = 0; i < nElements; i++ )
+        {
+            if( m_aElements[ i ].isVisible() )
+            {
+                sal_Int32 nCurPrio = m_aElements[ i ].getExpandPriority();
+                if( nCurPrio > nHighPrio )
+                {
+                    aIndices.clear();
+                    nHighPrio = nCurPrio;
+                }
+                if( nCurPrio == nHighPrio )
+                    aIndices.push_back( i );
+            }
+        }
+
+        // distribute extra space evenly among collected elements
+        nElements = aIndices.size();
+        if( nElements > 0 )
+        {
+            long nDelta = i_nExtraHeight / nElements;
+            for( size_t i = 0; i < nElements; i++ )
+            {
+                io_rSizes[ aIndices[i] ].Height() += nDelta;
+                i_nExtraHeight -= nDelta;
+            }
+            // add the last pixels to the last row element
+            if( i_nExtraHeight > 0 && nElements > 0 )
+                io_rSizes[aIndices.back()].Height() += i_nExtraHeight;
+        }
+    }
+}
+
+void RowOrColumn::resize()
+{
+    // check if we can get optimal size, else fallback to minimal size
+    Size aOptSize( getOptimalSize( WINDOWSIZE_PREFERRED ) );
+    WindowSizeType eType = WINDOWSIZE_PREFERRED;
+    if( m_bColumn )
+    {
+        if( aOptSize.Height() > m_aManagedArea.GetHeight() )
+            eType = WINDOWSIZE_MINIMUM;
+    }
+    else
+    {
+        if( aOptSize.Width() > m_aManagedArea.GetWidth() )
+            eType = WINDOWSIZE_MINIMUM;
+    }
+
+    size_t nElements = m_aElements.size();
+    // get all element sizes for sizing
+    std::vector<Size> aElementSizes( nElements );
+    long nUsedWidth = 2*m_nOuterBorder - (nElements ? m_nBorderWidth : 0);
+    for( size_t i = 0; i < nElements; i++ )
+    {
+        if( m_aElements[i].isVisible() )
+        {
+            aElementSizes[i] = m_aElements[i].getOptimalSize( eType );
+            if( m_bColumn )
+            {
+                aElementSizes[i].Width() = m_aManagedArea.GetWidth() - 2* m_nOuterBorder;
+                nUsedWidth += aElementSizes[i].Height() + m_nBorderWidth;
+            }
+            else
+            {
+                aElementSizes[i].Height() = m_aManagedArea.GetHeight() - 2* m_nOuterBorder;
+                nUsedWidth += aElementSizes[i].Width() + m_nBorderWidth;
+            }
+        }
+    }
+
+    long nExtraWidth = (m_bColumn ? m_aManagedArea.GetHeight() : m_aManagedArea.GetWidth()) - nUsedWidth;
+    if( nExtraWidth > 0 )
+    {
+        if( m_bColumn )
+            distributeColumnHeight( aElementSizes, nUsedWidth, nExtraWidth );
+        else
+            distributeRowWidth( aElementSizes, nUsedWidth, nExtraWidth );
+    }
+
+    // get starting position
+    Point aElementPos( m_aManagedArea.TopLeft() );
+    // outer border
+    aElementPos.X() += m_nOuterBorder;
+    aElementPos.Y() += m_nOuterBorder;
+
+    // position managed windows
+    for( size_t i = 0; i < nElements; i++ )
+    {
+        // get the size of type of the managed element
+        if( m_aElements[i].isVisible() )
+        {
+            m_aElements[i].setPosSize( aElementPos, aElementSizes[i] );
+            if( m_bColumn )
+                aElementPos.Y() += m_nBorderWidth + aElementSizes[i].Height();
+            else
+                aElementPos.X() += m_nBorderWidth + aElementSizes[i].Width();
+        }
+    }
+}
+
+size_t RowOrColumn::addWindow( Window* i_pWindow, sal_Int32 i_nExpandPrio, size_t i_nIndex )
+{
+    size_t nIndex = i_nIndex;
+    if( i_nIndex >= m_aElements.size() )
+    {
+        nIndex = m_aElements.size();
+        m_aElements.push_back( WindowArranger::Element( i_pWindow, boost::shared_ptr<WindowArranger>(), i_nExpandPrio ) );
+    }
+    else
+    {
+        std::vector< WindowArranger::Element >::iterator it = m_aElements.begin();
+        while( i_nIndex-- )
+            ++it;
+        m_aElements.insert( it, WindowArranger::Element( i_pWindow, boost::shared_ptr<WindowArranger>(), i_nExpandPrio ) );
+    }
+    return nIndex;
+}
+
+size_t RowOrColumn::addChild( boost::shared_ptr<WindowArranger> const & i_pChild, sal_Int32 i_nExpandPrio, size_t i_nIndex )
+{
+    size_t nIndex = i_nIndex;
+    if( i_nIndex >= m_aElements.size() )
+    {
+        nIndex = m_aElements.size();
+        m_aElements.push_back( WindowArranger::Element( NULL, i_pChild, i_nExpandPrio ) );
+    }
+    else
+    {
+        std::vector< WindowArranger::Element >::iterator it = m_aElements.begin();
+        while( i_nIndex-- )
+            ++it;
+        m_aElements.insert( it, WindowArranger::Element( NULL, i_pChild, i_nExpandPrio ) );
+    }
+    return nIndex;
+}
+
+void RowOrColumn::remove( Window* i_pWindow )
+{
+    if( i_pWindow )
+    {
+        for( std::vector< WindowArranger::Element >::iterator it = m_aElements.begin();
+            it != m_aElements.end(); ++it )
+        {
+            if( it->m_pElement == i_pWindow )
+            {
+                m_aElements.erase( it );
+                return;
+            }
+        }
+    }
+}
+
+void RowOrColumn::remove( boost::shared_ptr<WindowArranger> const & i_pChild )
+{
+    if( i_pChild )
+    {
+        for( std::vector< WindowArranger::Element >::iterator it = m_aElements.begin();
+            it != m_aElements.end(); ++it )
+        {
+            if( it->m_pChild == i_pChild )
+            {
+                m_aElements.erase( it );
+                return;
+            }
+        }
+    }
+}
+
+// ----------------------------------------
+// vcl::LabeledElement
+//-----------------------------------------
+
+LabeledElement::~LabeledElement()
+{
+    m_aLabel.deleteChild();
+    m_aElement.deleteChild();
+}
+
+Size LabeledElement::getOptimalSize( WindowSizeType i_eType ) const
+{
+    Size aRet( m_aLabel.getOptimalSize( WINDOWSIZE_MINIMUM ) );
+    if( aRet.Width() != 0 )
+    {
+        if( m_nLabelColumnWidth != 0 )
+            aRet.Width() = m_nLabelColumnWidth;
+        else
+            aRet.Width() += m_nDistance;
+    }
+    Size aElementSize( m_aElement.getOptimalSize( i_eType ) );
+    aRet.Width() += aElementSize.Width();
+    if( aElementSize.Height() > aRet.Height() )
+        aRet.Height() = aElementSize.Height();
+    if( aRet.Height() != 0 )
+        aRet.Height() += 2*m_nOuterBorder;
+
+    return aRet;
+}
+
+void LabeledElement::resize()
+{
+    Size aLabelSize( m_aLabel.getOptimalSize( WINDOWSIZE_MINIMUM ) );
+    Size aElementSize( m_aElement.getOptimalSize( WINDOWSIZE_PREFERRED ) );
+    if( m_nDistance + aLabelSize.Width() + aElementSize.Width() > m_aManagedArea.GetWidth() )
+        aElementSize = m_aElement.getOptimalSize( WINDOWSIZE_MINIMUM );
+
+    // align label and element vertically in LabeledElement
+    long nYOff = (m_aManagedArea.GetHeight() - 2*m_nOuterBorder - aLabelSize.Height()) / 2;
+    Point aPos( m_aManagedArea.Left(),
+                m_aManagedArea.Top() + m_nOuterBorder + nYOff );
+    Size aSize( aLabelSize );
+    if( m_nLabelColumnWidth != 0 )
+        aSize.Width() = m_nLabelColumnWidth;
+    m_aLabel.setPosSize( aPos, aSize );
+
+    aPos.X() += aSize.Width() + m_nDistance;
+    nYOff = (m_aManagedArea.GetHeight() - 2*m_nOuterBorder - aElementSize.Height()) / 2;
+    aPos.Y() = m_aManagedArea.Top() + m_nOuterBorder + nYOff;
+    aSize.Width() = aElementSize.Width();
+    aSize.Height() = m_aManagedArea.GetHeight() - 2*m_nOuterBorder;
+
+    // label style
+    // 0: position left and right
+    // 1: keep the element close to label and grow it
+    // 2: keep the element close and don't grow it
+    if( m_nLabelStyle == 0)
+    {
+        if( aPos.X() + aSize.Width() < m_aManagedArea.Right() )
+            aPos.X() = m_aManagedArea.Right() - aSize.Width();
+    }
+    else if( m_nLabelStyle == 1 )
+    {
+        if( aPos.X() + aSize.Width() < m_aManagedArea.Right() )
+            aSize.Width() = m_aManagedArea.Right() - aPos.X();
+    }
+    m_aElement.setPosSize( aPos, aSize );
+}
+
+void LabeledElement::setLabel( Window* i_pLabel )
+{
+    m_aLabel.m_pElement = i_pLabel;
+    m_aLabel.m_pChild.reset();
+}
+
+void LabeledElement::setLabel( boost::shared_ptr<WindowArranger> const & i_pLabel )
+{
+    m_aLabel.m_pElement = NULL;
+    m_aLabel.m_pChild = i_pLabel;
+}
+
+void LabeledElement::setElement( Window* i_pElement )
+{
+    m_aElement.m_pElement = i_pElement;
+    m_aElement.m_pChild.reset();
+}
+
+void LabeledElement::setElement( boost::shared_ptr<WindowArranger> const & i_pElement )
+{
+    m_aElement.m_pElement = NULL;
+    m_aElement.m_pChild = i_pElement;
+}
+
+// ----------------------------------------
+// vcl::LabelColumn
+//-----------------------------------------
+LabelColumn::~LabelColumn()
+{
+}
+
+long LabelColumn::getLabelWidth() const
+{
+    long nWidth = 0;
+
+    size_t nEle = countElements();
+    for( size_t i = 0; i < nEle; i++ )
+    {
+        const Element* pEle = getConstElement( i );
+        if( pEle && pEle->m_pChild.get() )
+        {
+            const LabeledElement* pLabel = dynamic_cast< const LabeledElement* >(pEle->m_pChild.get());
+            if( pLabel )
+            {
+                Window* pLW = pLabel->getWindow( 0 );
+                if( pLW )
+                {
+                    Size aLabSize( pLW->GetOptimalSize( WINDOWSIZE_MINIMUM ) );
+                    if( aLabSize.Width() > nWidth )
+                        nWidth = aLabSize.Width();
+                }
+            }
+        }
+    }
+    return nWidth + getBorderWidth();
+}
+
+Size LabelColumn::getOptimalSize( WindowSizeType i_eType ) const
+{
+    long nWidth = getLabelWidth();
+    Size aColumnSize;
+
+    // every child is a LabeledElement
+    size_t nEle = countElements();
+    for( size_t i = 0; i < nEle; i++ )
+    {
+        Size aElementSize;
+        const Element* pEle = getConstElement( i );
+        if( pEle && pEle->m_pChild.get() )
+        {
+            const LabeledElement* pLabel = dynamic_cast< const LabeledElement* >(pEle->m_pChild.get());
+            if( pLabel ) // we have a label
+            {
+                aElementSize = pLabel->getLabelSize( WINDOWSIZE_MINIMUM );
+                if( aElementSize.Width() )
+                    aElementSize.Width() = nWidth;
+                Size aSize( pLabel->getElementSize( i_eType ) );
+                aElementSize.Width() += aSize.Width();
+                if( aSize.Height() > aElementSize.Height() )
+                    aElementSize.Height() = aSize.Height();
+            }
+            else // a non label, just treat it as a row
+            {
+                aElementSize = pEle->getOptimalSize( i_eType );
+            }
+        }
+        else if( pEle && pEle->m_pElement ) // a general window, treat is as a row
+        {
+            aElementSize = pEle->getOptimalSize( i_eType );
+        }
+        if( aElementSize.Width() )
+        {
+            aElementSize.Width() += 2*m_nOuterBorder;
+            if( aElementSize.Width() > aColumnSize.Width() )
+                aColumnSize.Width() = aElementSize.Width();
+        }
+        if( aElementSize.Height() )
+        {
+            aColumnSize.Height() += getBorderWidth() + aElementSize.Height();
+        }
+    }
+    if( nEle > 0 && aColumnSize.Height() )
+    {
+        aColumnSize.Height() -= getBorderWidth(); // for the first element
+        aColumnSize.Height() += 2*m_nOuterBorder;
+    }
+    return aColumnSize;
+}
+
+void LabelColumn::resize()
+{
+    long nWidth = getLabelWidth();
+    size_t nEle = countElements();
+    for( size_t i = 0; i < nEle; i++ )
+    {
+        Element* pEle = getElement( i );
+        if( pEle && pEle->m_pChild.get() )
+        {
+            LabeledElement* pLabel = dynamic_cast< LabeledElement* >(pEle->m_pChild.get());
+            if( pLabel )
+                pLabel->setLabelColumnWidth( nWidth );
+        }
+    }
+    RowOrColumn::resize();
+}
+
+size_t LabelColumn::addRow( Window* i_pLabel, boost::shared_ptr<WindowArranger> const& i_rElement, long i_nIndent )
+{
+    boost::shared_ptr< LabeledElement > xLabel( new LabeledElement( this, 1 ) );
+    xLabel->setLabel( i_pLabel );
+    xLabel->setBorders( 0, i_nIndent, 0, 0, 0 );
+    xLabel->setElement( i_rElement );
+    size_t nIndex = addChild( xLabel );
+    resize();
+    return nIndex;
+}
+
+size_t LabelColumn::addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent )
+{
+    boost::shared_ptr< LabeledElement > xLabel( new LabeledElement( this, 1 ) );
+    xLabel->setLabel( i_pLabel );
+    xLabel->setBorders( 0, i_nIndent, 0, 0, 0 );
+    xLabel->setElement( i_pElement );
+    size_t nIndex = addChild( xLabel );
+    resize();
+    return nIndex;
+}
+
+// ----------------------------------------
+// vcl::Indenter
+//-----------------------------------------
+
+Indenter::~Indenter()
+{
+    m_aElement.deleteChild();
+}
+
+Size Indenter::getOptimalSize( WindowSizeType i_eType ) const
+{
+    Size aSize( m_aElement.getOptimalSize( i_eType ) );
+    aSize.Width()  += 2*m_nOuterBorder + m_nIndent;
+    aSize.Height() += 2*m_nOuterBorder;
+    return aSize;
+}
+
+void Indenter::resize()
+{
+    Point aPt( m_aManagedArea.TopLeft() );
+    aPt.X() += m_nOuterBorder + m_nIndent;
+    aPt.Y() += m_nOuterBorder;
+    Size aSz( m_aManagedArea.GetSize() );
+    aSz.Width()  -= 2*m_nOuterBorder + m_nIndent;
+    aSz.Height() -= 2*m_nOuterBorder;
+    m_aElement.setPosSize( aPt, aSz );
+}
+
+void Indenter::setWindow( Window* i_pWindow, sal_Int32 i_nExpandPrio )
+{
+    OSL_VERIFY( (m_aElement.m_pElement == 0 && m_aElement.m_pChild == 0) || i_pWindow == 0 );
+    OSL_VERIFY( i_pWindow == 0 || i_pWindow->GetParent() == m_pParentWindow );
+    m_aElement.m_pElement = i_pWindow;
+    m_aElement.m_nExpandPriority = i_nExpandPrio;
+}
+
+void Indenter::setChild( boost::shared_ptr<WindowArranger> const & i_pChild, sal_Int32 i_nExpandPrio )
+{
+    OSL_VERIFY( (m_aElement.m_pElement == 0 && m_aElement.m_pChild == 0 ) || i_pChild == 0 );
+    m_aElement.m_pChild = i_pChild;
+    m_aElement.m_nExpandPriority = i_nExpandPrio;
+}
+
+// ----------------------------------------
+// vcl::MatrixArranger
+//-----------------------------------------
+MatrixArranger::~MatrixArranger()
+{
+}
+
+Size MatrixArranger::getOptimalSize( WindowSizeType i_eType, std::vector<long>& o_rColumnWidths, std::vector<long>& o_rRowHeights ) const
+{
+    Size aMatrixSize( 2*m_nOuterBorder, 2*m_nOuterBorder );
+
+    // first find out the current number of rows and columns
+    sal_uInt32 nRows = 0, nColumns = 0;
+    for( std::vector< MatrixElement >::const_iterator it = m_aElements.begin();
+            it != m_aElements.end(); ++it )
+    {
+        if( it->m_nX >= nColumns )
+            nColumns = it->m_nX+1;
+        if( it->m_nY >= nRows )
+            nRows = it->m_nY+1;
+    }
+
+    // now allocate row and column depth vectors
+    o_rColumnWidths = std::vector< long >( nColumns, 0 );
+    o_rRowHeights   = std::vector< long >( nRows, 0 );
+
+    // get sizes an allocate them into rows/columns
+    for( std::vector< MatrixElement >::const_iterator it = m_aElements.begin();
+            it != m_aElements.end(); ++it )
+    {
+        Size aSize( it->getOptimalSize( i_eType ) );
+        if( aSize.Width() > o_rColumnWidths[ it->m_nX ] )
+            o_rColumnWidths[ it->m_nX ] = aSize.Width();
+        if( aSize.Height() > o_rRowHeights[ it->m_nY ] )
+            o_rRowHeights[ it->m_nY ] = aSize.Height();
+    }
+
+    // add up sizes
+    for( sal_uInt32 i = 0; i < nColumns; i++ )
+        aMatrixSize.Width() += o_rColumnWidths[i] + m_nBorderX;
+    if( nColumns > 0 )
+        aMatrixSize.Width() -= m_nBorderX;
+
+    for( sal_uInt32 i = 0; i < nRows; i++ )
+        aMatrixSize.Height() += o_rRowHeights[i] + m_nBorderY;
+    if( nRows > 0 )
+        aMatrixSize.Height() -= m_nBorderY;
+
+    return aMatrixSize;
+}
+
+Size MatrixArranger::getOptimalSize( WindowSizeType i_eType ) const
+{
+    std::vector<long> aColumnWidths, aRowHeights;
+    return getOptimalSize( i_eType, aColumnWidths, aRowHeights );
+}
+
+void MatrixArranger::resize()
+{
+    // assure that we have at least one row and column
+    if( m_aElements.empty() )
+        return;
+
+    // check if we can get optimal size, else fallback to minimal size
+    std::vector<long> aColumnWidths, aRowHeights;
+    Size aOptSize( getOptimalSize( WINDOWSIZE_PREFERRED, aColumnWidths, aRowHeights ) );
+    if( aOptSize.Height() > m_aManagedArea.GetHeight() ||
+        aOptSize.Width() > m_aManagedArea.GetWidth() )
+    {
+        std::vector<long> aMinColumnWidths, aMinRowHeights;
+        getOptimalSize( WINDOWSIZE_MINIMUM, aMinColumnWidths, aMinRowHeights );
+        if( aOptSize.Height() > m_aManagedArea.GetHeight() )
+            aRowHeights = aMinRowHeights;
+        if( aOptSize.Width() > m_aManagedArea.GetWidth() )
+            aColumnWidths = aMinColumnWidths;
+    }
+
+    // FIXME: distribute extra space available
+
+    // prepare offsets
+    std::vector<long> aColumnX( aColumnWidths.size() );
+    aColumnX[0] = m_aManagedArea.Left() + m_nOuterBorder;
+    for( size_t i = 1; i < aColumnX.size(); i++ )
+        aColumnX[i] = aColumnX[i-1] + aColumnWidths[i-1] + m_nBorderX;
+
+    std::vector<long> aRowY( aRowHeights.size() );
+    aRowY[0] = m_aManagedArea.Top() + m_nOuterBorder;
+    for( size_t i = 1; i < aRowY.size(); i++ )
+        aRowY[i] = aRowY[i-1] + aRowHeights[i-1] + m_nBorderY;
+
+    // now iterate over the elements and assign their positions
+    for( std::vector< MatrixElement >::iterator it = m_aElements.begin();
+         it != m_aElements.end(); ++it )
+    {
+        Point aCellPos( aColumnX[it->m_nX], aRowY[it->m_nY] );
+        Size  aCellSize( aColumnWidths[it->m_nX], aRowHeights[it->m_nY] );
+        it->setPosSize( aCellPos, aCellSize );
+    }
+}
+
+size_t MatrixArranger::addWindow( Window* i_pWindow, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio )
+{
+    sal_uInt64 nMapValue = getMap( i_nX, i_nY );
+    std::map< sal_uInt64, size_t >::const_iterator it = m_aMatrixMap.find( nMapValue );
+    size_t nIndex = 0;
+    if( it == m_aMatrixMap.end() )
+    {
+        m_aMatrixMap[ nMapValue ] = nIndex = m_aElements.size();
+        m_aElements.push_back( MatrixElement( i_pWindow, i_nX, i_nY, boost::shared_ptr<WindowArranger>(), i_nExpandPrio ) );
+    }
+    else
+    {
+        MatrixElement& rEle( m_aElements[ it->second ] );
+        rEle.m_pElement = i_pWindow;
+        rEle.m_pChild.reset();
+        rEle.m_nExpandPriority = i_nExpandPrio;
+        rEle.m_nX = i_nX;
+        rEle.m_nY = i_nY;
+        nIndex = it->second;
+    }
+    return nIndex;
+}
+
+void MatrixArranger::remove( Window* i_pWindow )
+{
+    if( i_pWindow )
+    {
+        for( std::vector< MatrixElement >::iterator it = m_aElements.begin();
+            it != m_aElements.end(); ++it )
+        {
+            if( it->m_pElement == i_pWindow )
+            {
+                m_aMatrixMap.erase( getMap( it->m_nX, it->m_nY ) );
+                m_aElements.erase( it );
+                return;
+            }
+        }
+    }
+}
+
+size_t MatrixArranger::addChild( boost::shared_ptr<WindowArranger> const &i_pChild, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio )
+{
+    sal_uInt64 nMapValue = getMap( i_nX, i_nY );
+    std::map< sal_uInt64, size_t >::const_iterator it = m_aMatrixMap.find( nMapValue );
+    size_t nIndex = 0;
+    if( it == m_aMatrixMap.end() )
+    {
+        m_aMatrixMap[ nMapValue ] = nIndex = m_aElements.size();
+        m_aElements.push_back( MatrixElement( NULL, i_nX, i_nY, i_pChild, i_nExpandPrio ) );
+    }
+    else
+    {
+        MatrixElement& rEle( m_aElements[ it->second ] );
+        rEle.m_pElement = 0;
+        rEle.m_pChild = i_pChild;
+        rEle.m_nExpandPriority = i_nExpandPrio;
+        rEle.m_nX = i_nX;
+        rEle.m_nY = i_nY;
+        nIndex = it->second;
+    }
+    return nIndex;
+}
+
+void MatrixArranger::remove( boost::shared_ptr<WindowArranger> const &i_pChild )
+{
+    if( i_pChild )
+    {
+        for( std::vector< MatrixElement >::iterator it = m_aElements.begin();
+            it != m_aElements.end(); ++it )
+        {
+            if( it->m_pChild == i_pChild )
+            {
+                m_aMatrixMap.erase( getMap( it->m_nX, it->m_nY ) );
+                m_aElements.erase( it );
+                return;
+            }
+        }
+    }
+}
+
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index c9e8d11557e8..8eedf76043da 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.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: brdwin.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/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 63035096bf05..e835fe749ed1 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.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: btndlg.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/vcl/source/window/cmdevt.cxx b/vcl/source/window/cmdevt.cxx
index c9514e8d95ba..03e01c96742b 100644
--- a/vcl/source/window/cmdevt.cxx
+++ b/vcl/source/window/cmdevt.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: cmdevt.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/vcl/source/window/cursor.cxx b/vcl/source/window/cursor.cxx
index 53450647f0c6..5725189e10c3 100644
--- a/vcl/source/window/cursor.cxx
+++ b/vcl/source/window/cursor.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: cursor.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/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 8c6bb2b76463..03675ccf69ca 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.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: decoview.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/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 997e63d8b22e..3b5585d3bc63 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.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: dialog.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/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx
index c6f64d74c5fc..daa26e2c7782 100644
--- a/vcl/source/window/dlgctrl.cxx
+++ b/vcl/source/window/dlgctrl.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: dlgctrl.cxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,6 +33,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/tabpage.hxx>
 #include <vcl/tabctrl.hxx>
+#include <vcl/tabdlg.hxx>
 #include <vcl/button.hxx>
 #include <vcl/window.h>
 
@@ -888,6 +886,20 @@ BOOL Window::ImplDlgCtrl( const KeyEvent& rKEvt, BOOL bKeyInput )
         return TRUE;
     }
 
+    // if we have come here (and therefore the strange "formular" logic above
+    // turned up no result, then let's try to find a customer for Ctrl-TAB
+    if ( nKeyCode == KEY_TAB && aKeyCode.IsMod1() && ! aKeyCode.IsMod2() )
+    {
+        TabDialog* pDlg = dynamic_cast<TabDialog*>(this);
+        if( pDlg )
+        {
+            TabControl* pTabCtrl = pDlg->ImplGetFirstTabControl();
+            NotifyEvent aEvt( bKeyInput ? EVENT_KEYINPUT : EVENT_KEYUP,
+                              pTabCtrl, &rKEvt );
+            return pTabCtrl->ImplHandleNotifyEvent( aEvt );
+        }
+    }
+
     return FALSE;
 }
 
diff --git a/vcl/source/window/dndevdis.cxx b/vcl/source/window/dndevdis.cxx
index 3b317ab18cae..efc49be6fbf8 100644
--- a/vcl/source/window/dndevdis.cxx
+++ b/vcl/source/window/dndevdis.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: dndevdis.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/vcl/source/window/dndevdis.hxx b/vcl/source/window/dndevdis.hxx
index f03d10a6ec71..5b91bd0713ec 100644
--- a/vcl/source/window/dndevdis.hxx
+++ b/vcl/source/window/dndevdis.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: dndevdis.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/vcl/source/window/dndlcon.cxx b/vcl/source/window/dndlcon.cxx
index 1cd8ba8555a1..c5d78dd6bae3 100644
--- a/vcl/source/window/dndlcon.cxx
+++ b/vcl/source/window/dndlcon.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: dndlcon.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/vcl/source/window/dndlcon.hxx b/vcl/source/window/dndlcon.hxx
index 6ec1fe106820..5a41a20e4271 100644
--- a/vcl/source/window/dndlcon.hxx
+++ b/vcl/source/window/dndlcon.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: dndlcon.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/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index 29c22722c93d..95e6c6113c45 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.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: dockingarea.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/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index c587b7ad8441..e3a8d2ce35de 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.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: dockmgr.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/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 4709c3b20c6f..c8e382bad982 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.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: dockwin.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 5f1578c4b9e2..323bbe3b0d74 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.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: floatwin.cxx,v $
- * $Revision: 1.40 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/window/introwin.cxx b/vcl/source/window/introwin.cxx
index 94cd8a34ccc5..02ccc2282a42 100644
--- a/vcl/source/window/introwin.cxx
+++ b/vcl/source/window/introwin.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: introwin.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/vcl/source/window/javachild.cxx b/vcl/source/window/javachild.cxx
index c66a49f4fe78..2cd18b897ff5 100644
--- a/vcl/source/window/javachild.cxx
+++ b/vcl/source/window/javachild.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: javachild.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/vcl/source/window/keycod.cxx b/vcl/source/window/keycod.cxx
index 21030b9422fb..bcc5536fd028 100644
--- a/vcl/source/window/keycod.cxx
+++ b/vcl/source/window/keycod.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: keycod.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/vcl/source/window/keyevent.cxx b/vcl/source/window/keyevent.cxx
index e8474c6efa5d..f4011b9be16e 100644
--- a/vcl/source/window/keyevent.cxx
+++ b/vcl/source/window/keyevent.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: keyevent.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/vcl/source/window/makefile.mk b/vcl/source/window/makefile.mk
index 169cf44b2b13..82ce26f8e78e 100644
--- a/vcl/source/window/makefile.mk
+++ b/vcl/source/window/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.25 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -45,6 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
 # --- Files --------------------------------------------------------
 
 SLOFILES= \
+            $(SLO)$/arrange.obj		\
             $(SLO)$/abstdlg.obj		\
             $(SLO)$/accel.obj		\
             $(SLO)$/accmgr.obj		\
@@ -69,7 +66,9 @@ SLOFILES= \
             $(SLO)$/mnemonic.obj	\
             $(SLO)$/mnemonicengine.obj  \
             $(SLO)$/msgbox.obj		\
+            $(SLO)$/popupmenuwindow.obj		\
             $(SLO)$/scrwnd.obj		\
+            $(SLO)$/printdlg.obj    \
             $(SLO)$/seleng.obj		\
             $(SLO)$/split.obj		\
             $(SLO)$/splitwin.obj	\
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index c9e0c23e7f16..ddfb1125d0d7 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.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: menu.cxx,v $
- * $Revision: 1.165 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -5578,6 +5575,17 @@ BOOL MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu
                     n = pMenu->GetItemCount()-1;
             }
 
+            // handling gtk like (aka mbOpenMenuOnF10)
+            // do not highlight an item when opening a sub menu
+            // unless there already was a higlighted sub menu item
+            bool bWasHighlight = false;
+            if( pActivePopup )
+            {
+                MenuFloatingWindow* pSubWindow = dynamic_cast<MenuFloatingWindow*>(pActivePopup->ImplGetWindow());
+                if( pSubWindow )
+                    bWasHighlight = (pSubWindow->GetHighlightedItem() != ITEMPOS_INVALID);
+            }
+
             USHORT nLoop = n;
 
             if( nCode == KEY_HOME )
@@ -5604,7 +5612,10 @@ BOOL MenuBarWindow::ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu
                 MenuItemData* pData = (MenuItemData*)pMenu->GetItemList()->GetDataFromPos( n );
                 if ( ( pData->eType != MENUITEM_SEPARATOR ) && pMenu->ImplIsVisible( n ) )
                 {
-                    ChangeHighlightItem( n, TRUE );
+                    BOOL bDoSelect = TRUE;
+                    if( ImplGetSVData()->maNWFData.mbOpenMenuOnF10 )
+                        bDoSelect = bWasHighlight;
+                    ChangeHighlightItem( n, bDoSelect );
                     break;
                 }
             } while ( n != nLoop );
diff --git a/vcl/source/window/mnemonic.cxx b/vcl/source/window/mnemonic.cxx
index 42e9b4aebdeb..74926ad3de4b 100644
--- a/vcl/source/window/mnemonic.cxx
+++ b/vcl/source/window/mnemonic.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: mnemonic.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/vcl/source/window/mnemonicengine.cxx b/vcl/source/window/mnemonicengine.cxx
index 7caf129b5b4f..241aea1cf336 100644
--- a/vcl/source/window/mnemonicengine.cxx
+++ b/vcl/source/window/mnemonicengine.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: mnemonicengine.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/vcl/source/window/mouseevent.cxx b/vcl/source/window/mouseevent.cxx
index a95b90f5e1d0..4bfe08b3f3d8 100644
--- a/vcl/source/window/mouseevent.cxx
+++ b/vcl/source/window/mouseevent.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: mouseevent.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/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 3d3245af831f..7f7a65cd7fb9 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.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: msgbox.cxx,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/goodies/source/filter.vcl/idxf/idxf.cxx b/vcl/source/window/popupmenuwindow.cxx
index 9d11a1e29ad0..78ef0bcf1068 100644
--- a/goodies/source/filter.vcl/idxf/idxf.cxx
+++ b/vcl/source/window/popupmenuwindow.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: idxf.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -29,57 +26,54 @@
  ************************************************************************/
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_goodies.hxx"
+#include "precompiled_vcl.hxx"
 
-#include <string.h>
-#include <vcl/gdimtf.hxx>
-#include <vcl/graph.hxx>
-#include <vcl/virdev.hxx>
-#include "dxf2mtf.hxx"
-#include <math.h>
+#include "vcl/popupmenuwindow.hxx"
 
-//================== GraphicImport - die exportierte Funktion ================
+#include <limits>
 
-extern "C" BOOL __LOADONCALLAPI GraphicImport(SvStream & rStream, Graphic & rGraphic, FilterConfigItem*, BOOL )
+struct PopupMenuFloatingWindow::ImplData
 {
-    DXFRepresentation aDXF;
-    DXF2GDIMetaFile aConverter;
-    GDIMetaFile aMTF;
+    sal_uInt16      mnMenuStackLevel;  // Store the stack level of a popup menu.  0 = top-level menu.
 
-    if ( aDXF.Read( rStream, 0, 60 ) == FALSE )
-        return FALSE;
-    if ( aConverter.Convert( aDXF, aMTF, 60, 100 ) == FALSE )
-        return FALSE;
-    rGraphic=Graphic(aMTF);
+    ImplData();
+    ~ImplData();
+};
 
-    return TRUE;
+PopupMenuFloatingWindow::ImplData::ImplData() :
+    mnMenuStackLevel( ::std::numeric_limits<sal_uInt16>::max() )
+{
 }
 
-//============================= fuer Windows ==================================
-#ifndef GCC
-#endif
-
-#ifdef WIN
+PopupMenuFloatingWindow::ImplData::~ImplData()
+{
+}
 
-static HINSTANCE hDLLInst = 0;      // HANDLE der DLL
+// ============================================================================
 
-extern "C" int CALLBACK LibMain( HINSTANCE hDLL, WORD, WORD nHeap, LPSTR )
+PopupMenuFloatingWindow::PopupMenuFloatingWindow( Window* pParent, WinBits nStyle ) :
+    FloatingWindow(pParent, nStyle),
+    mpImplData(new ImplData)
 {
-#ifndef WNT
-    if ( nHeap )
-        UnlockData( 0 );
-#endif
-
-    hDLLInst = hDLL;
+}
 
-    return TRUE;
+PopupMenuFloatingWindow::~PopupMenuFloatingWindow()
+{
+    delete mpImplData;
 }
 
-extern "C" int CALLBACK WEP( int )
+sal_uInt16 PopupMenuFloatingWindow::GetMenuStackLevel() const
 {
-    return 1;
+    return mpImplData->mnMenuStackLevel;
 }
 
-#endif
+void PopupMenuFloatingWindow::SetMenuStackLevel( sal_uInt16 nLevel )
+{
+    mpImplData->mnMenuStackLevel = nLevel;
+}
 
+bool PopupMenuFloatingWindow::IsPopupMenu() const
+{
+    return mpImplData->mnMenuStackLevel != ::std::numeric_limits<sal_uInt16>::max();
+}
 
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
new file mode 100644
index 000000000000..caf5705cbcd9
--- /dev/null
+++ b/vcl/source/window/printdlg.cxx
@@ -0,0 +1,2486 @@
+/*************************************************************************
+ *
+ * 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_vcl.hxx"
+
+#include "vcl/print.hxx"
+#include "vcl/prndlg.hxx"
+#include "vcl/dialog.hxx"
+#include "vcl/button.hxx"
+#include "vcl/svdata.hxx"
+#include "vcl/svids.hrc"
+#include "vcl/wall.hxx"
+#include "vcl/jobset.h"
+#include "vcl/status.hxx"
+#include "vcl/decoview.hxx"
+#include "vcl/arrange.hxx"
+#include "vcl/configsettings.hxx"
+#include "vcl/help.hxx"
+#include "vcl/decoview.hxx"
+#include "vcl/svapp.hxx"
+
+#include "unotools/localedatawrapper.hxx"
+
+#include "rtl/ustrbuf.hxx"
+
+#include "com/sun/star/awt/Size.hpp"
+
+using namespace vcl;
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::beans;
+
+#define HELPID_PREFIX ".HelpId:vcl:PrintDialog"
+#define SMHID2( a, b ) SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ":" a ":" b ) ), HID_PRINTDLG ) )
+#define SMHID1( a ) SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX  ":" a ) ), HID_PRINTDLG ) )
+
+PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent, const ResId& i_rId )
+    : Window( i_pParent, i_rId )
+    , maOrigSize( 10, 10 )
+    , maPageVDev( *this )
+    , maToolTipString( String( VclResId( SV_PRINT_PRINTPREVIEW_TXT ) ) )
+{
+    SetPaintTransparent( TRUE );
+    SetBackground();
+    if( GetSettings().GetStyleSettings().GetHighContrastMode() )
+        maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() );
+    else
+        maPageVDev.SetBackground( Color( COL_WHITE ) );
+}
+
+PrintDialog::PrintPreviewWindow::~PrintPreviewWindow()
+{
+}
+
+void PrintDialog::PrintPreviewWindow::DataChanged( const DataChangedEvent& i_rDCEvt )
+{
+    // react on settings changed
+    if( i_rDCEvt.GetType() == DATACHANGED_SETTINGS )
+    {
+        if( GetSettings().GetStyleSettings().GetHighContrastMode() )
+            maPageVDev.SetBackground( GetSettings().GetStyleSettings().GetWindowColor() );
+        else
+            maPageVDev.SetBackground( Color( COL_WHITE ) );
+    }
+    Window::DataChanged( i_rDCEvt );
+}
+
+void PrintDialog::PrintPreviewWindow::Resize()
+{
+    Size aNewSize( GetSizePixel() );
+    // leave small space for decoration
+    aNewSize.Width() -= 2;
+    aNewSize.Height() -= 2;
+    Size aScaledSize;
+    double fScale = 1.0;
+
+    // #i106435# catch corner case of Size(0,0)
+    Size aOrigSize( maOrigSize );
+    if( aOrigSize.Width() < 1 )
+        aOrigSize.Width() = aNewSize.Width();
+    if( aOrigSize.Height() < 1 )
+        aOrigSize.Height() = aNewSize.Height();
+    if( aOrigSize.Width() > aOrigSize.Height() )
+    {
+        aScaledSize = Size( aNewSize.Width(), aNewSize.Width() * aOrigSize.Height() / aOrigSize.Width() );
+        if( aScaledSize.Height() > aNewSize.Height() )
+            fScale = double(aNewSize.Height())/double(aScaledSize.Height());
+    }
+    else
+    {
+        aScaledSize = Size( aNewSize.Height() * aOrigSize.Width() / aOrigSize.Height(), aNewSize.Height() );
+        if( aScaledSize.Width() > aNewSize.Width() )
+            fScale = double(aNewSize.Width())/double(aScaledSize.Width());
+    }
+    aScaledSize.Width() = long(aScaledSize.Width()*fScale);
+    aScaledSize.Height() = long(aScaledSize.Height()*fScale);
+    maPageVDev.SetOutputSizePixel( aScaledSize, FALSE );
+}
+
+void PrintDialog::PrintPreviewWindow::Paint( const Rectangle& )
+{
+    Size aSize( GetSizePixel() );
+    if( maReplacementString.getLength() != 0 )
+    {
+        // replacement is active
+        Push();
+        Rectangle aTextRect( Point( 0, 0 ), aSize );
+        Font aFont( GetSettings().GetStyleSettings().GetFieldFont() );
+        aFont.SetSize( Size( 0, aSize.Height()/12 ) );
+        SetFont( aFont );
+        DrawText( aTextRect, maReplacementString,
+                  TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER | TEXT_DRAW_WORDBREAK | TEXT_DRAW_MULTILINE
+                 );
+        Pop();
+    }
+    else
+    {
+        GDIMetaFile aMtf( maMtf );
+
+        Size aPreviewSize = maPageVDev.GetOutputSizePixel();
+        Point aOffset( (aSize.Width() - aPreviewSize.Width()) / 2,
+                       (aSize.Height() - aPreviewSize.Height()) / 2 );
+
+        const Size aLogicSize( maPageVDev.PixelToLogic( aPreviewSize, MapMode( MAP_100TH_MM ) ) );
+        Size aOrigSize( maOrigSize );
+        if( aOrigSize.Width() < 1 )
+            aOrigSize.Width() = aLogicSize.Width();
+        if( aOrigSize.Height() < 1 )
+            aOrigSize.Height() = aLogicSize.Height();
+        double fScale = double(aLogicSize.Width())/double(aOrigSize.Width());
+
+
+        maPageVDev.Erase();
+        maPageVDev.Push();
+        maPageVDev.SetMapMode( MAP_100TH_MM );
+        aMtf.WindStart();
+        aMtf.Scale( fScale, fScale );
+        aMtf.WindStart();
+        aMtf.Play( &maPageVDev, Point( 0, 0 ), aLogicSize );
+        maPageVDev.Pop();
+
+        SetMapMode( MAP_PIXEL );
+        maPageVDev.SetMapMode( MAP_PIXEL );
+        DrawOutDev( aOffset, aPreviewSize, Point( 0, 0 ), aPreviewSize, maPageVDev );
+
+        DecorationView aVw( this );
+        aOffset.X() -= 1; aOffset.Y() -=1; aPreviewSize.Width() += 2; aPreviewSize.Height() += 2;
+        aVw.DrawFrame( Rectangle( aOffset, aPreviewSize ), FRAME_DRAW_GROUP );
+    }
+}
+
+void PrintDialog::PrintPreviewWindow::Command( const CommandEvent& rEvt )
+{
+    if( rEvt.GetCommand() == COMMAND_WHEEL )
+    {
+        const CommandWheelData* pWheelData = rEvt.GetWheelData();
+        PrintDialog* pDlg = dynamic_cast<PrintDialog*>(GetParent());
+        if( pDlg )
+        {
+            if( pWheelData->GetDelta() > 0 )
+                pDlg->previewForward();
+            else if( pWheelData->GetDelta() < 0 )
+                pDlg->previewBackward();
+            /*
+            else
+                huh ?
+            */
+        }
+    }
+}
+
+void PrintDialog::PrintPreviewWindow::setPreview( const GDIMetaFile& i_rNewPreview,
+                                                  const Size& i_rOrigSize,
+                                                  const rtl::OUString& i_rReplacement,
+                                                  sal_Int32 i_nDPIX,
+                                                  sal_Int32 i_nDPIY
+                                                 )
+{
+    rtl::OUStringBuffer aBuf( 256 );
+    aBuf.append( maToolTipString );
+    #if OSL_DEBUG_LEVEL > 0
+    aBuf.appendAscii( "\n---\nPageSize: " );
+    aBuf.append( sal_Int32( i_rOrigSize.Width()/100) );
+    aBuf.appendAscii( "mm x " );
+    aBuf.append( sal_Int32( i_rOrigSize.Height()/100) );
+    aBuf.appendAscii( "mm" );
+    #endif
+    SetQuickHelpText( aBuf.makeStringAndClear() );
+    maMtf = i_rNewPreview;
+    if( GetSettings().GetStyleSettings().GetHighContrastMode() &&
+        GetSettings().GetStyleSettings().GetWindowColor().IsDark()
+        )
+    {
+        maMtf.ReplaceColors( Color( COL_BLACK ), Color( COL_WHITE ), 30 );
+    }
+
+    maOrigSize = i_rOrigSize;
+    maReplacementString = i_rReplacement;
+    maPageVDev.SetReferenceDevice( i_nDPIX, i_nDPIY );
+    maPageVDev.EnableOutput( TRUE );
+    Resize();
+    Invalidate();
+}
+
+PrintDialog::ShowNupOrderWindow::ShowNupOrderWindow( Window* i_pParent )
+    : Window( i_pParent, WB_NOBORDER )
+    , mnOrderMode( 0 )
+    , mnRows( 1 )
+    , mnColumns( 1 )
+{
+    ImplInitSettings();
+}
+
+PrintDialog::ShowNupOrderWindow::~ShowNupOrderWindow()
+{
+}
+
+void PrintDialog::ShowNupOrderWindow::ImplInitSettings()
+{
+    SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetFieldColor() ) );
+}
+
+void PrintDialog::ShowNupOrderWindow::Paint( const Rectangle& i_rRect )
+{
+    Window::Paint( i_rRect );
+    SetMapMode( MAP_PIXEL );
+    SetTextColor( GetSettings().GetStyleSettings().GetFieldTextColor() );
+
+    int nPages = mnRows * mnColumns;
+    Font aFont( GetSettings().GetStyleSettings().GetFieldFont() );
+    aFont.SetSize( Size( 0, 24 ) );
+    SetFont( aFont );
+    Size aSampleTextSize( GetTextWidth( rtl::OUString::valueOf( sal_Int32(nPages+1) ) ), GetTextHeight() );
+
+    Size aOutSize( GetOutputSizePixel() );
+    Size aSubSize( aOutSize.Width() / mnColumns, aOutSize.Height() / mnRows );
+    // calculate font size: shrink the sample text so it fits
+    double fX = double(aSubSize.Width())/double(aSampleTextSize.Width());
+    double fY = double(aSubSize.Height())/double(aSampleTextSize.Height());
+    double fScale = (fX < fY) ? fX : fY;
+    long nFontHeight = long(24.0*fScale) - 3;
+    if( nFontHeight < 5 )
+        nFontHeight = 5;
+    aFont.SetSize( Size( 0, nFontHeight ) );
+    SetFont( aFont );
+    long nTextHeight = GetTextHeight();
+    for( int i = 0; i < nPages; i++ )
+    {
+        rtl::OUString aPageText( rtl::OUString::valueOf( sal_Int32(i+1) ) );
+        int nX = 0, nY = 0;
+        switch( mnOrderMode )
+        {
+        case SV_PRINT_PRT_NUP_ORDER_LRTD:
+            nX = (i % mnColumns); nY = (i / mnColumns);
+            break;
+        case SV_PRINT_PRT_NUP_ORDER_TDLR:
+            nX = (i / mnRows); nY = (i % mnRows);
+            break;
+        }
+        Size aTextSize( GetTextWidth( aPageText ), nTextHeight );
+        int nDeltaX = (aSubSize.Width() - aTextSize.Width()) / 2;
+        int nDeltaY = (aSubSize.Height() - aTextSize.Height()) / 2;
+        DrawText( Point( nX * aSubSize.Width() + nDeltaX,
+                         nY * aSubSize.Height() + nDeltaY ),
+                  aPageText );
+    }
+    DecorationView aVw( this );
+    aVw.DrawFrame( Rectangle( Point( 0, 0), aOutSize ), FRAME_DRAW_GROUP );
+}
+
+PrintDialog::NUpTabPage::NUpTabPage( Window* i_pParent, const ResId& rResId )
+    : TabPage( i_pParent, rResId )
+    , maNupLine( this, VclResId( SV_PRINT_PRT_NUP_LAYOUT_FL ) )
+    , maPagesBtn( this, VclResId( SV_PRINT_PRT_NUP_PAGES_BTN ) )
+    , maBrochureBtn( this, VclResId( SV_PRINT_PRT_NUP_BROCHURE_BTN ) )
+    , maPagesBoxTitleTxt( this, 0 )
+    , maNupPagesBox( this, VclResId( SV_PRINT_PRT_NUP_PAGES_BOX ) )
+    , maNupNumPagesTxt( this, VclResId( SV_PRINT_PRT_NUP_NUM_PAGES_TXT ) )
+    , maNupColEdt( this, VclResId( SV_PRINT_PRT_NUP_COLS_EDT ) )
+    , maNupTimesTxt( this, VclResId( SV_PRINT_PRT_NUP_TIMES_TXT ) )
+    , maNupRowsEdt( this, VclResId( SV_PRINT_PRT_NUP_ROWS_EDT ) )
+    , maPageMarginTxt1( this, VclResId( SV_PRINT_PRT_NUP_MARGINS_PAGES_1_TXT ) )
+    , maPageMarginEdt( this, VclResId( SV_PRINT_PRT_NUP_MARGINS_PAGES_EDT ) )
+    , maPageMarginTxt2( this, VclResId( SV_PRINT_PRT_NUP_MARGINS_PAGES_2_TXT ) )
+    , maSheetMarginTxt1( this, VclResId( SV_PRINT_PRT_NUP_MARGINS_SHEET_1_TXT ) )
+    , maSheetMarginEdt( this, VclResId( SV_PRINT_PRT_NUP_MARGINS_SHEET_EDT ) )
+    , maSheetMarginTxt2( this, VclResId( SV_PRINT_PRT_NUP_MARGINS_SHEET_2_TXT ) )
+    , maNupOrientationTxt( this, VclResId( SV_PRINT_PRT_NUP_ORIENTATION_TXT ) )
+    , maNupOrientationBox( this, VclResId( SV_PRINT_PRT_NUP_ORIENTATION_BOX ) )
+    , maNupOrderTxt( this, VclResId( SV_PRINT_PRT_NUP_ORDER_TXT ) )
+    , maNupOrderBox( this, VclResId( SV_PRINT_PRT_NUP_ORDER_BOX ) )
+    , maNupOrderWin( this )
+    , maBorderCB( this, VclResId( SV_PRINT_PRT_NUP_BORDER_CB ) )
+{
+    FreeResource();
+
+    maNupOrderWin.Show();
+    maPagesBtn.Check( TRUE );
+    maBrochureBtn.Show( FALSE );
+
+    // setup field units for metric fields
+    const LocaleDataWrapper& rLocWrap( maPageMarginEdt.GetLocaleDataWrapper() );
+    FieldUnit eUnit = FUNIT_MM;
+    USHORT nDigits = 0;
+    if( rLocWrap.getMeasurementSystemEnum() == MEASURE_US )
+    {
+        eUnit = FUNIT_INCH;
+        nDigits = 2;
+    }
+    // set units
+    maPageMarginEdt.SetUnit( eUnit );
+    maSheetMarginEdt.SetUnit( eUnit );
+
+    // set precision
+    maPageMarginEdt.SetDecimalDigits( nDigits );
+    maSheetMarginEdt.SetDecimalDigits( nDigits );
+
+    SMHID1( "NUpPage" );
+    maNupLine.SMHID2("NUpPage", "Layout");
+    maBrochureBtn.SMHID2("NUpPage", "Brochure" );
+    maPagesBtn.SMHID2( "NUpPage", "PagesPerSheet" );
+    maPagesBoxTitleTxt.SMHID2( "NUpPage", "PagesPerSheetLabel" );
+    maNupPagesBox.SMHID2( "NUpPage", "PagesPerSheetBox" );
+    maNupNumPagesTxt.SMHID2( "NUpPage", "Columns" );
+    maNupColEdt.SMHID2( "NUpPage", "ColumnsBox" );
+    maNupTimesTxt.SMHID2( "NUpPage", "Rows" );
+    maNupRowsEdt.SMHID2( "NUpPage", "RowsBox" );
+    maPageMarginTxt1.SMHID2( "NUpPage", "PageMargin" );
+    maPageMarginEdt.SMHID2( "NUpPage", "PageMarginBox" );
+    maPageMarginTxt2.SMHID2( "NUpPage", "PageMarginCont" );
+    maSheetMarginTxt1.SMHID2( "NUpPage", "SheetMargin" );
+    maSheetMarginEdt.SMHID2( "NUpPage", "SheetMarginBox" );
+    maSheetMarginTxt2.SMHID2( "NUpPage", "SheetMarginCont" );
+    maNupOrientationTxt.SMHID2( "NUpPage", "Orientation" );
+    maNupOrientationBox.SMHID2( "NUpPage", "OrientationBox" );
+    maNupOrderTxt.SMHID2( "NUpPage", "Order" );
+    maNupOrderBox.SMHID2( "NUpPage", "OrderBox" );
+    maBorderCB.SMHID2( "NUpPage", "BorderBox" );
+
+    setupLayout();
+}
+
+PrintDialog::NUpTabPage::~NUpTabPage()
+{
+}
+
+void PrintDialog::NUpTabPage::enableNupControls( bool bEnable )
+{
+    maNupPagesBox.Enable( TRUE );
+    maNupNumPagesTxt.Enable( bEnable );
+    maNupColEdt.Enable( bEnable );
+    maNupTimesTxt.Enable( bEnable );
+    maNupRowsEdt.Enable( bEnable );
+    maPageMarginTxt1.Enable( bEnable );
+    maPageMarginEdt.Enable( bEnable );
+    maPageMarginTxt2.Enable( bEnable );
+    maSheetMarginTxt1.Enable( bEnable );
+    maSheetMarginEdt.Enable( bEnable );
+    maSheetMarginTxt2.Enable( bEnable );
+    maNupOrientationTxt.Enable( bEnable );
+    maNupOrientationBox.Enable( bEnable );
+    maNupOrderTxt.Enable( bEnable );
+    maNupOrderBox.Enable( bEnable );
+    maNupOrderWin.Enable( bEnable );
+    maBorderCB.Enable( bEnable );
+}
+
+void PrintDialog::NUpTabPage::showAdvancedControls( bool i_bShow )
+{
+    maNupNumPagesTxt.Show( i_bShow );
+    maNupColEdt.Show( i_bShow );
+    maNupTimesTxt.Show( i_bShow );
+    maNupRowsEdt.Show( i_bShow );
+    maPageMarginTxt1.Show( i_bShow );
+    maPageMarginEdt.Show( i_bShow );
+    maPageMarginTxt2.Show( i_bShow );
+    maSheetMarginTxt1.Show( i_bShow );
+    maSheetMarginEdt.Show( i_bShow );
+    maSheetMarginTxt2.Show( i_bShow );
+    maNupOrientationTxt.Show( i_bShow );
+    maNupOrientationBox.Show( i_bShow );
+    maLayout.resize();
+}
+
+void PrintDialog::NUpTabPage::setupLayout()
+{
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+    long nIndent = 3*aBorder.Width();
+
+    maLayout.setParentWindow( this );
+    maLayout.setOuterBorder( aBorder.Width() );
+
+    maLayout.addWindow( &maNupLine );
+    boost::shared_ptr< vcl::RowOrColumn > xRow( new vcl::RowOrColumn( &maLayout, false ) );
+    maLayout.addChild( xRow );
+    boost::shared_ptr< vcl::Indenter > xIndent( new vcl::Indenter( xRow.get() ) );
+    xRow->addChild( xIndent );
+
+    boost::shared_ptr< vcl::RowOrColumn > xShowNupCol( new vcl::RowOrColumn( xRow.get() ) );
+    xRow->addChild( xShowNupCol, -1 );
+    xShowNupCol->setMinimumSize( xShowNupCol->addWindow( &maNupOrderWin ), Size( 70, 70 ) );
+    boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( xShowNupCol.get() ) );
+    xShowNupCol->addChild( xSpacer );
+
+    boost::shared_ptr< vcl::LabelColumn > xMainCol( new vcl::LabelColumn( xIndent.get() ) );
+    xIndent->setChild( xMainCol );
+
+    size_t nPagesIndex = xMainCol->addRow( &maPagesBtn, &maNupPagesBox );
+    mxPagesBtnLabel = boost::dynamic_pointer_cast<vcl::LabeledElement>( xMainCol->getChild( nPagesIndex ) );
+
+    xRow.reset( new vcl::RowOrColumn( xMainCol.get(), false ) );
+    xMainCol->addRow( &maNupNumPagesTxt, xRow, nIndent );
+    xRow->addWindow( &maNupColEdt );
+    xRow->addWindow( &maNupTimesTxt );
+    xRow->addWindow( &maNupRowsEdt );
+
+    boost::shared_ptr< vcl::LabeledElement > xLab( new vcl::LabeledElement( xMainCol.get(), 2 ) );
+    xLab->setLabel( &maPageMarginEdt );
+    xLab->setElement( &maPageMarginTxt2 );
+    xMainCol->addRow( &maPageMarginTxt1, xLab, nIndent );
+
+    xLab.reset( new vcl::LabeledElement( xMainCol.get(), 2 ) );
+    xLab->setLabel( &maSheetMarginEdt );
+    xLab->setElement( &maSheetMarginTxt2 );
+    xMainCol->addRow( &maSheetMarginTxt1, xLab, nIndent );
+
+    xMainCol->addRow( &maNupOrientationTxt, &maNupOrientationBox, nIndent );
+    xMainCol->addRow( &maNupOrderTxt, &maNupOrderBox, nIndent );
+    xMainCol->setBorders( xMainCol->addWindow( &maBorderCB ), nIndent, 0, 0, 0 );
+
+    xSpacer.reset( new vcl::Spacer( xMainCol.get(), 0, Size( 10, aBorder.Width() ) ) );
+    xMainCol->addChild( xSpacer );
+
+    xRow.reset( new vcl::RowOrColumn( xMainCol.get(), false ) );
+    xMainCol->addRow( &maBrochureBtn, xRow );
+    // remember brochure row for dependencies
+    mxBrochureDep = xRow;
+
+    // initially advanced controls are not shown, rows=columns=1
+    showAdvancedControls( false );
+}
+
+void PrintDialog::NUpTabPage::Resize()
+{
+    maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetOutputSizePixel() ) );
+}
+
+void PrintDialog::NUpTabPage::initFromMultiPageSetup( const vcl::PrinterController::MultiPageSetup& i_rMPS )
+{
+    maSheetMarginEdt.SetValue( maSheetMarginEdt.Normalize( i_rMPS.nLeftMargin ), FUNIT_100TH_MM );
+    maPageMarginEdt.SetValue( maPageMarginEdt.Normalize( i_rMPS.nHorizontalSpacing ), FUNIT_100TH_MM );
+    maBorderCB.Check( i_rMPS.bDrawBorder );
+    maNupRowsEdt.SetValue( i_rMPS.nRows );
+    maNupColEdt.SetValue( i_rMPS.nColumns );
+}
+
+void PrintDialog::NUpTabPage::readFromSettings()
+{
+}
+
+void PrintDialog::NUpTabPage::storeToSettings()
+{
+}
+
+PrintDialog::JobTabPage::JobTabPage( Window* i_pParent, const ResId& rResId )
+    : TabPage( i_pParent, rResId )
+    , maPrinterFL( this, VclResId( SV_PRINT_PRINTERS_FL ) )
+    , maPrinters( this, VclResId( SV_PRINT_PRINTERS ) )
+    , maDetailsBtn( this, VclResId( SV_PRINT_DETAILS_BTN ) )
+    , maStatusLabel( this, VclResId( SV_PRINT_STATUS_TXT ) )
+    , maStatusTxt( this, 0 )
+    , maLocationLabel( this, VclResId( SV_PRINT_LOCATION_TXT ) )
+    , maLocationTxt( this, 0 )
+    , maCommentLabel( this, VclResId( SV_PRINT_COMMENT_TXT ) )
+    , maCommentTxt( this, 0 )
+    , maSetupButton( this, VclResId( SV_PRINT_PRT_SETUP ) )
+    , maCopies( this, VclResId( SV_PRINT_COPIES ) )
+    , maCopySpacer( this, WB_VERT )
+    , maCopyCount( this, VclResId( SV_PRINT_COPYCOUNT ) )
+    , maCopyCountField( this, VclResId( SV_PRINT_COPYCOUNT_FIELD ) )
+    , maCollateBox( this, VclResId( SV_PRINT_COLLATE ) )
+    , maCollateImage( this, VclResId( SV_PRINT_COLLATE_IMAGE ) )
+    , maCollateImg( VclResId( SV_PRINT_COLLATE_IMG ) )
+    , maCollateHCImg( VclResId( SV_PRINT_COLLATE_HC_IMG ) )
+    , maNoCollateImg( VclResId( SV_PRINT_NOCOLLATE_IMG ) )
+    , maNoCollateHCImg( VclResId( SV_PRINT_NOCOLLATE_HC_IMG ) )
+    , mnCollateUIMode( 0 )
+    , maLayout( NULL, true )
+{
+    FreeResource();
+
+    SMHID1( "JobPage" );
+    maPrinterFL.SMHID2( "JobPage", "Printer" );
+    maPrinters.SMHID2( "JobPage", "PrinterList" );
+    maDetailsBtn.SMHID2( "JobPage", "DetailsBtn" );
+    maStatusLabel.SMHID2( "JobPage", "StatusLabel" );
+    maStatusTxt.SMHID2( "JobPage", "StatusText" );
+    maLocationLabel.SMHID2( "JobPage", "LocationLabel" );
+    maLocationTxt.SMHID2( "JobPage", "LocationText" );
+    maCommentLabel.SMHID2( "JobPage", "CommentLabel" );
+    maCommentTxt.SMHID2( "JobPage", "CommentText" );
+    maSetupButton.SMHID2( "JobPage", "Properties" );
+    maCopies.SMHID2( "JobPage", "CopiesLine" );
+    maCopySpacer.SMHID2( "JobPage", "CopySpacer" );
+    maCopyCount.SMHID2( "JobPage", "CopiesText" );
+    maCopyCountField.SMHID2( "JobPage", "Copies" );
+    maCollateBox.SMHID2( "JobPage", "Collate" );
+    maCollateImage.SMHID2( "JobPage", "CollateImage" );
+
+    maCopySpacer.Show();
+    maStatusTxt.Show();
+    maCommentTxt.Show();
+    maLocationTxt.Show();
+
+    setupLayout();
+}
+
+PrintDialog::JobTabPage::~JobTabPage()
+{
+}
+
+void PrintDialog::JobTabPage::setupLayout()
+{
+    // HACK: this is not a dropdown box, but the dropdown line count
+    // sets the results of GetOptimalSize in a normal ListBox
+    maPrinters.SetDropDownLineCount( 4 );
+
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+
+    maLayout.setParentWindow( this );
+    maLayout.setOuterBorder( aBorder.Width() );
+
+    // add printer fixed line
+    maLayout.addWindow( &maPrinterFL );
+    // add print LB
+    maLayout.addWindow( &maPrinters );
+
+    // create a row for details button/text and properties button
+    boost::shared_ptr< vcl::RowOrColumn > xDetRow( new vcl::RowOrColumn( &maLayout, false ) );
+    maLayout.addChild( xDetRow );
+    xDetRow->addWindow( &maDetailsBtn );
+    xDetRow->addChild( new vcl::Spacer( xDetRow.get(), 2 ) );
+    xDetRow->addWindow( &maSetupButton );
+
+    // create an indent for details
+    boost::shared_ptr< vcl::Indenter > xIndent( new vcl::Indenter( &maLayout ) );
+    maLayout.addChild( xIndent );
+    // remember details controls
+    mxDetails = xIndent;
+    // create a column for the details
+    boost::shared_ptr< vcl::LabelColumn > xLabelCol( new vcl::LabelColumn( xIndent.get(), aBorder.Height() ) );
+    xIndent->setChild( xLabelCol );
+    xLabelCol->addRow( &maStatusLabel, &maStatusTxt );
+    xLabelCol->addRow( &maLocationLabel, &maLocationTxt );
+    xLabelCol->addRow( &maCommentLabel, &maCommentTxt );
+
+    // add print range and copies columns
+    maLayout.addWindow( &maCopies );
+    boost::shared_ptr< vcl::RowOrColumn > xRangeRow( new vcl::RowOrColumn( &maLayout, false, aBorder.Width() ) );
+    maLayout.addChild( xRangeRow );
+
+    // create print range and add to range row
+    mxPrintRange.reset( new vcl::RowOrColumn( xRangeRow.get() ) );
+    xRangeRow->addChild( mxPrintRange );
+    xRangeRow->addWindow( &maCopySpacer );
+
+    boost::shared_ptr< vcl::RowOrColumn > xCopyCollateCol( new vcl::RowOrColumn( xRangeRow.get() ) );
+    xRangeRow->addChild( xCopyCollateCol );
+
+    // add copies row to copy/collate column
+    boost::shared_ptr< vcl::LabeledElement > xCopiesRow( new vcl::LabeledElement( xCopyCollateCol.get(), 2 ) );
+    xCopyCollateCol->addChild( xCopiesRow );
+    xCopiesRow->setLabel( &maCopyCount );
+    xCopiesRow->setElement( &maCopyCountField );
+    boost::shared_ptr< vcl::LabeledElement > xCollateRow( new vcl::LabeledElement( xCopyCollateCol.get(), 2 ) );
+    xCopyCollateCol->addChild( xCollateRow );
+    xCollateRow->setLabel( &maCollateBox );
+    xCollateRow->setElement( &maCollateImage );
+
+    // maDetailsBtn.SetStyle( maDetailsBtn.GetStyle() | (WB_SMALLSTYLE | WB_BEVELBUTTON) );
+    mxDetails->show( false, false );
+}
+
+void PrintDialog::JobTabPage::readFromSettings()
+{
+    SettingsConfigItem* pItem = SettingsConfigItem::get();
+    rtl::OUString aValue;
+
+    #if 0
+    // do not actually make copy count persistent
+    // the assumption is that this would lead to a lot of unwanted copies
+    aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CopyCount" ) ) );
+    sal_Int32 nVal = aValue.toInt32();
+    maCopyCountField.SetValue( sal_Int64(nVal > 1 ? nVal : 1) );
+    #endif
+
+    aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CollateBox" ) ) );
+    if( aValue.equalsIgnoreAsciiCaseAscii( "alwaysoff" ) )
+    {
+        mnCollateUIMode = 1;
+        maCollateBox.Check( FALSE );
+        maCollateBox.Enable( FALSE );
+    }
+    else
+    {
+        mnCollateUIMode = 0;
+        aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                                  rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ) );
+        maCollateBox.Check( aValue.equalsIgnoreAsciiCaseAscii( "true" ) );
+    }
+    Resize();
+}
+
+void PrintDialog::JobTabPage::storeToSettings()
+{
+    SettingsConfigItem* pItem = SettingsConfigItem::get();
+    pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CopyCount" ) ),
+                     maCopyCountField.GetText() );
+    pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ),
+                     rtl::OUString::createFromAscii( maCollateBox.IsChecked() ? "true" : "false" ) );
+}
+
+void PrintDialog::JobTabPage::Resize()
+{
+    maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) );
+}
+
+PrintDialog::OutputOptPage::OutputOptPage( Window* i_pParent, const ResId& i_rResId )
+    : TabPage( i_pParent, i_rResId )
+    , maOptionsLine( this, VclResId( SV_PRINT_OPT_PRINT_FL ) )
+    , maToFileBox( this, VclResId( SV_PRINT_OPT_TOFILE ) )
+    , maCollateSingleJobsBox( this, VclResId( SV_PRINT_OPT_SINGLEJOBS ) )
+    , maReverseOrderBox( this, VclResId( SV_PRINT_OPT_REVERSE ) )
+{
+    FreeResource();
+    SMHID1( "OptPage" );
+    maOptionsLine.SMHID2( "OptPage", "Options" );
+    maToFileBox.SMHID2( "OptPage", "ToFile" );
+    maCollateSingleJobsBox.SMHID2( "OptPage", "SingleJobs" );
+    maReverseOrderBox.SMHID2( "OptPage", "Reverse" );
+
+    setupLayout();
+}
+
+PrintDialog::OutputOptPage::~OutputOptPage()
+{
+}
+
+void PrintDialog::OutputOptPage::setupLayout()
+{
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+
+    maLayout.setParentWindow( this );
+    maLayout.setOuterBorder( aBorder.Width() );
+
+    maLayout.addWindow( &maOptionsLine );
+    boost::shared_ptr<vcl::Indenter> xIndent( new vcl::Indenter( &maLayout, aBorder.Width() ) );
+    maLayout.addChild( xIndent );
+    boost::shared_ptr<vcl::RowOrColumn> xCol( new vcl::RowOrColumn( xIndent.get(), aBorder.Height() ) );
+    xIndent->setChild( xCol );
+    mxOptGroup = xCol;
+    xCol->addWindow( &maToFileBox );
+    xCol->addWindow( &maCollateSingleJobsBox );
+    xCol->addWindow( &maReverseOrderBox );
+}
+
+void PrintDialog::OutputOptPage::readFromSettings()
+{
+    #if 0
+    SettingsConfigItem* pItem = SettingsConfigItem::get();
+    rtl::OUString aValue;
+
+    aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                              rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToFile" ) ) );
+    maToFileBox.Check( aValue.equalsIgnoreAsciiCaseAscii( "true" ) );
+    #endif
+}
+
+void PrintDialog::OutputOptPage::storeToSettings()
+{
+    SettingsConfigItem* pItem = SettingsConfigItem::get();
+    pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToFile" ) ),
+                     rtl::OUString::createFromAscii( maToFileBox.IsChecked() ? "true" : "false" ) );
+}
+
+void PrintDialog::OutputOptPage::Resize()
+{
+    maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) );
+}
+
+
+PrintDialog::PrintDialog( Window* i_pParent, const boost::shared_ptr<PrinterController>& i_rController )
+    : ModalDialog( i_pParent, VclResId( SV_DLG_PRINT ) )
+    , maOKButton( this, VclResId( SV_PRINT_OK ) )
+    , maCancelButton( this, VclResId( SV_PRINT_CANCEL ) )
+    , maHelpButton( this, VclResId( SV_PRINT_HELP ) )
+    , maPreviewWindow( this, VclResId( SV_PRINT_PAGE_PREVIEW ) )
+    , maPageEdit( this, VclResId( SV_PRINT_PAGE_EDIT ) )
+    , maNumPagesText( this, VclResId( SV_PRINT_PAGE_TXT ) )
+    , maBackwardBtn( this, VclResId( SV_PRINT_PAGE_BACKWARD ) )
+    , maForwardBtn( this, VclResId( SV_PRINT_PAGE_FORWARD ) )
+    , maTabCtrl( this, VclResId( SV_PRINT_TABCTRL ) )
+    , maNUpPage( &maTabCtrl, VclResId( SV_PRINT_TAB_NUP ) )
+    , maJobPage( &maTabCtrl, VclResId( SV_PRINT_TAB_JOB ) )
+    , maOptionsPage( &maTabCtrl, VclResId( SV_PRINT_TAB_OPT ) )
+    , maButtonLine( this, VclResId( SV_PRINT_BUTTONLINE ) )
+    , maPController( i_rController )
+    , maNoPageStr( String( VclResId( SV_PRINT_NOPAGES ) ) )
+    , mnCurPage( 0 )
+    , mnCachedPages( 0 )
+    , maPrintToFileText( String( VclResId( SV_PRINT_TOFILE_TXT ) ) )
+    , maDefPrtText( String( VclResId( SV_PRINT_DEFPRT_TXT ) ) )
+    , mbShowLayoutPage( sal_True )
+{
+    FreeResource();
+
+    // save printbutton text, gets exchanged occasionally with print to file
+    maPrintText = maOKButton.GetText();
+
+    // setup preview controls
+    maForwardBtn.SetStyle( maForwardBtn.GetStyle() | WB_BEVELBUTTON );
+    maBackwardBtn.SetStyle( maBackwardBtn.GetStyle() | WB_BEVELBUTTON );
+
+    // insert the job (general) tab page first
+    maTabCtrl.InsertPage( SV_PRINT_TAB_JOB, maJobPage.GetText() );
+    maTabCtrl.SetTabPage( SV_PRINT_TAB_JOB, &maJobPage );
+
+    // set symbols on forward and backward button
+    maBackwardBtn.SetSymbol( SYMBOL_PREV );
+    maForwardBtn.SetSymbol( SYMBOL_NEXT );
+    maBackwardBtn.ImplSetSmallSymbol( TRUE );
+    maForwardBtn.ImplSetSmallSymbol( TRUE );
+
+    maPageStr = maNumPagesText.GetText();
+
+    // init reverse print
+    maOptionsPage.maReverseOrderBox.Check( maPController->getReversePrint() );
+
+    // get the first page
+    preparePreview( true, true );
+
+    // fill printer listbox
+    const std::vector< rtl::OUString >& rQueues( Printer::GetPrinterQueues() );
+    for( std::vector< rtl::OUString >::const_iterator it = rQueues.begin();
+         it != rQueues.end(); ++it )
+    {
+        maJobPage.maPrinters.InsertEntry( *it );
+    }
+    // select current printer
+    if( maJobPage.maPrinters.GetEntryPos( maPController->getPrinter()->GetName() ) != LISTBOX_ENTRY_NOTFOUND )
+    {
+        maJobPage.maPrinters.SelectEntry( maPController->getPrinter()->GetName() );
+    }
+    else
+    {
+        // fall back to last printer
+        SettingsConfigItem* pItem = SettingsConfigItem::get();
+        String aValue( pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                                        rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPrinter" ) ) ) );
+        if( maJobPage.maPrinters.GetEntryPos( aValue ) != LISTBOX_ENTRY_NOTFOUND )
+        {
+            maJobPage.maPrinters.SelectEntry( aValue );
+            maPController->setPrinter( boost::shared_ptr<Printer>( new Printer( aValue ) ) );
+        }
+        else
+        {
+            // fall back to default printer
+            maJobPage.maPrinters.SelectEntry( Printer::GetDefaultPrinterName() );
+            maPController->setPrinter( boost::shared_ptr<Printer>( new Printer( Printer::GetDefaultPrinterName() ) ) );
+        }
+    }
+    // update the text fields for the printer
+    updatePrinterText();
+
+    // set a select handler
+    maJobPage.maPrinters.SetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
+
+    // setup sizes for N-Up
+    Size aNupSize( maPController->getPrinter()->PixelToLogic(
+                         maPController->getPrinter()->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) ) );
+    if( maPController->getPrinter()->GetOrientation() == ORIENTATION_LANDSCAPE )
+    {
+        maNupLandscapeSize = aNupSize;
+        maNupPortraitSize = Size( aNupSize.Height(), aNupSize.Width() );
+    }
+    else
+    {
+        maNupPortraitSize = aNupSize;
+        maNupLandscapeSize = Size( aNupSize.Height(), aNupSize.Width() );
+    }
+    maNUpPage.initFromMultiPageSetup( maPController->getMultipage() );
+
+
+    // setup click handler on the various buttons
+    maOKButton.SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
+    #if OSL_DEBUG_LEVEL > 1
+    maCancelButton.SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
+    #endif
+    maHelpButton.SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maForwardBtn.SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maBackwardBtn.SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maJobPage.maCollateBox.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maJobPage.maSetupButton.SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maJobPage.maDetailsBtn.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maNUpPage.maBorderCB.SetClickHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maOptionsPage.maToFileBox.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maOptionsPage.maReverseOrderBox.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+    maNUpPage.maPagesBtn.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+
+    // setup modify hdl
+    maPageEdit.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
+    maJobPage.maCopyCountField.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
+    maNUpPage.maNupRowsEdt.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
+    maNUpPage.maNupColEdt.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
+    maNUpPage.maPageMarginEdt.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
+    maNUpPage.maSheetMarginEdt.SetModifyHdl( LINK( this, PrintDialog, ModifyHdl ) );
+
+    // setup select hdl
+    maNUpPage.maNupPagesBox.SetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
+    maNUpPage.maNupOrientationBox.SetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
+    maNUpPage.maNupOrderBox.SetSelectHdl( LINK( this, PrintDialog, SelectHdl ) );
+
+    // setup the layout
+    setupLayout();
+
+    // setup optional UI options set by application
+    setupOptionalUI();
+
+    // set change handler for UI options
+    maPController->setOptionChangeHdl( LINK( this, PrintDialog, UIOptionsChanged ) );
+
+    // set min size pixel to current size
+    Size aOutSize( GetOutputSizePixel() );
+    SetMinOutputSizePixel( aOutSize );
+
+    // if there is space enough, enlarge the preview so it gets roughly as
+    // high as the tab control
+    if( aOutSize.Width() < 768 )
+    {
+        Size aJobPageSize( getJobPageSize() );
+        Size aTabSize( maTabCtrl.GetSizePixel() );
+        if( aJobPageSize.Width() < 1 )
+            aJobPageSize.Width() = aTabSize.Width();
+        if( aJobPageSize.Height() < 1 )
+            aJobPageSize.Height() = aTabSize.Height();
+        long nOptPreviewWidth = aTabSize.Height() * aJobPageSize.Width() / aJobPageSize.Height();
+        // add space for borders
+        nOptPreviewWidth += 15;
+        if( aOutSize.Width() - aTabSize.Width() < nOptPreviewWidth )
+        {
+            aOutSize.Width() = aTabSize.Width() + nOptPreviewWidth;
+            if( aOutSize.Width() > 768 ) // don't enlarge the dialog too much
+                aOutSize.Width() = 768;
+            SetOutputSizePixel( aOutSize );
+        }
+    }
+
+    // set HelpIDs
+    SMHID1( "Dialog" );
+    maOKButton.SMHID1( "OK" );
+    maCancelButton.SMHID1( "Cancel" );
+    maHelpButton.SMHID1( "Help" );
+    maPreviewWindow.SMHID1( "Preview" );
+    maNumPagesText.SMHID1( "NumPagesText" );
+    maPageEdit.SMHID1( "PageEdit" );
+    maForwardBtn.SMHID1( "ForwardBtn" );
+    maBackwardBtn.SMHID1( "BackwardBtn" );
+    maTabCtrl.SMHID1( "TabPages" );
+
+    // append further tab pages
+    if( mbShowLayoutPage )
+    {
+        maTabCtrl.InsertPage( SV_PRINT_TAB_NUP, maNUpPage.GetText() );
+        maTabCtrl.SetTabPage( SV_PRINT_TAB_NUP, &maNUpPage );
+    }
+    maTabCtrl.InsertPage( SV_PRINT_TAB_OPT, maOptionsPage.GetText() );
+    maTabCtrl.SetTabPage( SV_PRINT_TAB_OPT, &maOptionsPage );
+
+    // restore settings from last run
+    readFromSettings();
+
+    // setup dependencies
+    checkControlDependencies();
+
+}
+
+PrintDialog::~PrintDialog()
+{
+    while( ! maControls.empty() )
+    {
+        delete maControls.front();
+        maControls.pop_front();
+    }
+}
+
+void PrintDialog::setupLayout()
+{
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+
+    maLayout.setParentWindow( this );
+
+    boost::shared_ptr< vcl::RowOrColumn > xPreviewAndTab( new vcl::RowOrColumn( &maLayout, false ) );
+    size_t nIndex = maLayout.addChild( xPreviewAndTab, 5 );
+    maLayout.setBorders( nIndex, aBorder.Width(), aBorder.Width(), aBorder.Width(), 0 );
+
+    // setup column for preview and sub controls
+    boost::shared_ptr< vcl::RowOrColumn > xPreview( new vcl::RowOrColumn( xPreviewAndTab.get() ) );
+    xPreviewAndTab->addChild( xPreview, 5 );
+    xPreview->addWindow( &maPreviewWindow, 5 );
+    // get a row for the preview controls
+    mxPreviewCtrls.reset( new vcl::RowOrColumn( xPreview.get(), false ) );
+    nIndex = xPreview->addChild( mxPreviewCtrls );
+    boost::shared_ptr< vcl::Spacer > xSpacer( new vcl::Spacer( mxPreviewCtrls.get(), 2 ) );
+    mxPreviewCtrls->addChild( xSpacer );
+    mxPreviewCtrls->addWindow( &maPageEdit );
+    mxPreviewCtrls->addWindow( &maNumPagesText );
+    xSpacer.reset( new vcl::Spacer( mxPreviewCtrls.get(), 2 ) );
+    mxPreviewCtrls->addChild( xSpacer );
+    mxPreviewCtrls->addWindow( &maBackwardBtn );
+    mxPreviewCtrls->addWindow( &maForwardBtn );
+    xSpacer.reset( new vcl::Spacer( mxPreviewCtrls.get(), 2 ) );
+    mxPreviewCtrls->addChild( xSpacer );
+
+    // continue with the tab ctrl
+    xPreviewAndTab->addWindow( &maTabCtrl );
+
+    // add the button line
+    maLayout.addWindow( &maButtonLine );
+
+    // add the row for the buttons
+    boost::shared_ptr< vcl::RowOrColumn > xButtons( new vcl::RowOrColumn( &maLayout, false ) );
+    nIndex = maLayout.addChild( xButtons );
+    maLayout.setBorders( nIndex, aBorder.Width(), 0, aBorder.Width(), aBorder.Width() );
+
+    Size aMinSize( maCancelButton.GetSizePixel() );
+    // insert help button
+    xButtons->setMinimumSize( xButtons->addWindow( &maHelpButton ), aMinSize );
+    // insert a spacer, cancel and OK buttons are right aligned
+    xSpacer.reset( new vcl::Spacer( xButtons.get(), 2 ) );
+    xButtons->addChild( xSpacer );
+    xButtons->setMinimumSize( xButtons->addWindow( &maOKButton ), aMinSize );
+    xButtons->setMinimumSize( xButtons->addWindow( &maCancelButton ), aMinSize );
+}
+
+void PrintDialog::readFromSettings()
+{
+    maJobPage.readFromSettings();
+    maNUpPage.readFromSettings();
+    maOptionsPage.readFromSettings();
+
+    // read last selected tab page; if it exists, actiavte it
+    SettingsConfigItem* pItem = SettingsConfigItem::get();
+    rtl::OUString aValue = pItem->getValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                                            rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPage" ) ) );
+    USHORT nCount = maTabCtrl.GetPageCount();
+    for( USHORT i = 0; i < nCount; i++ )
+    {
+        USHORT nPageId = maTabCtrl.GetPageId( i );
+        if( aValue.equals( maTabCtrl.GetPageText( nPageId ) ) )
+        {
+            maTabCtrl.SelectTabPage( nPageId );
+            break;
+        }
+    }
+    maOKButton.SetText( maOptionsPage.maToFileBox.IsChecked() ? maPrintToFileText : maPrintText );
+}
+
+void PrintDialog::storeToSettings()
+{
+    maJobPage.storeToSettings();
+    maNUpPage.storeToSettings();
+    maOptionsPage.storeToSettings();
+
+    // store last selected printer
+    SettingsConfigItem* pItem = SettingsConfigItem::get();
+    pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPrinter" ) ),
+                     maJobPage.maPrinters.GetSelectEntry() );
+
+    pItem->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintDialog" ) ),
+                     rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LastPage" ) ),
+                     maTabCtrl.GetPageText( maTabCtrl.GetCurPageId() ) );
+    pItem->Commit();
+}
+
+bool PrintDialog::isPrintToFile()
+{
+    return maOptionsPage.maToFileBox.IsChecked();
+}
+
+int PrintDialog::getCopyCount()
+{
+    return static_cast<int>(maJobPage.maCopyCountField.GetValue());
+}
+
+bool PrintDialog::isCollate()
+{
+    return maJobPage.maCopyCountField.GetValue() > 1 ? maJobPage.maCollateBox.IsChecked() : FALSE;
+}
+
+static void setSmartId( Window* i_pWindow, const char* i_pType, sal_Int32 i_nId = -1, const rtl::OUString& i_rPropName = rtl::OUString() )
+{
+    rtl::OUStringBuffer aBuf( 256 );
+    aBuf.appendAscii( HELPID_PREFIX );
+    if( i_rPropName.getLength() )
+    {
+        aBuf.append( sal_Unicode( ':' ) );
+        aBuf.append( i_rPropName );
+    }
+    if( i_pType )
+    {
+        aBuf.append( sal_Unicode( ':' ) );
+        aBuf.appendAscii( i_pType );
+    }
+    if( i_nId >= 0 )
+    {
+        aBuf.append( sal_Unicode( ':' ) );
+        aBuf.append( i_nId );
+    }
+    i_pWindow->SetSmartHelpId( SmartId( aBuf.makeStringAndClear(), HID_PRINTDLG ) );
+}
+
+static void setHelpText( Window* i_pWindow, const Sequence< rtl::OUString >& i_rHelpTexts, sal_Int32 i_nIndex )
+{
+    if( i_nIndex >= 0 && i_nIndex < i_rHelpTexts.getLength() )
+        i_pWindow->SetHelpText( i_rHelpTexts.getConstArray()[i_nIndex] );
+}
+
+void updateMaxSize( const Size& i_rCheckSize, Size& o_rMaxSize )
+{
+    if( i_rCheckSize.Width() > o_rMaxSize.Width() )
+        o_rMaxSize.Width() = i_rCheckSize.Width();
+    if( i_rCheckSize.Height() > o_rMaxSize.Height() )
+        o_rMaxSize.Height() = i_rCheckSize.Height();
+}
+
+void PrintDialog::setupOptionalUI()
+{
+    Size aBorder( LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ) );
+
+    std::vector<vcl::RowOrColumn*> aDynamicColumns;
+    vcl::RowOrColumn* pCurColumn = 0;
+
+    Window* pCurParent = 0, *pDynamicPageParent = 0;
+    USHORT nOptPageId = 9, nCurSubGroup = 0;
+    bool bOnStaticPage = false;
+    bool bSubgroupOnStaticPage = false;
+
+    std::multimap< rtl::OUString, vcl::RowOrColumn* > aPropertyToDependencyRowMap;
+
+    const Sequence< PropertyValue >& rOptions( maPController->getUIOptions() );
+    for( int i = 0; i < rOptions.getLength(); i++ )
+    {
+        Sequence< beans::PropertyValue > aOptProp;
+        rOptions[i].Value >>= aOptProp;
+
+        // extract ui element
+        bool bEnabled = true;
+        rtl::OUString aCtrlType;
+        rtl::OUString aText;
+        rtl::OUString aPropertyName;
+        Sequence< rtl::OUString > aChoices;
+        Sequence< rtl::OUString > aHelpTexts;
+        sal_Int64 nMinValue = 0, nMaxValue = 0;
+        sal_Int32 nCurHelpText = 0;
+        rtl::OUString aGroupingHint;
+        rtl::OUString aDependsOnName;
+        sal_Int32 nDependsOnValue = 0;
+        sal_Bool bUseDependencyRow = sal_False;
+
+        for( int n = 0; n < aOptProp.getLength(); n++ )
+        {
+            const beans::PropertyValue& rEntry( aOptProp[ n ] );
+            if( rEntry.Name.equalsAscii( "Text" ) )
+            {
+                rEntry.Value >>= aText;
+            }
+            else if( rEntry.Name.equalsAscii( "ControlType" ) )
+            {
+                rEntry.Value >>= aCtrlType;
+            }
+            else if( rEntry.Name.equalsAscii( "Choices" ) )
+            {
+                rEntry.Value >>= aChoices;
+            }
+            else if( rEntry.Name.equalsAscii( "Property" ) )
+            {
+                PropertyValue aVal;
+                rEntry.Value >>= aVal;
+                aPropertyName = aVal.Name;
+            }
+            else if( rEntry.Name.equalsAscii( "Enabled" ) )
+            {
+                sal_Bool bValue = sal_True;
+                rEntry.Value >>= bValue;
+                bEnabled = bValue;
+            }
+            else if( rEntry.Name.equalsAscii( "GroupingHint" ) )
+            {
+                rEntry.Value >>= aGroupingHint;
+            }
+            else if( rEntry.Name.equalsAscii( "DependsOnName" ) )
+            {
+                rEntry.Value >>= aDependsOnName;
+            }
+            else if( rEntry.Name.equalsAscii( "DependsOnEntry" ) )
+            {
+                rEntry.Value >>= nDependsOnValue;
+            }
+            else if( rEntry.Name.equalsAscii( "AttachToDependency" ) )
+            {
+                rEntry.Value >>= bUseDependencyRow;
+            }
+            else if( rEntry.Name.equalsAscii( "MinValue" ) )
+            {
+                rEntry.Value >>= nMinValue;
+            }
+            else if( rEntry.Name.equalsAscii( "MaxValue" ) )
+            {
+                rEntry.Value >>= nMaxValue;
+            }
+            else if( rEntry.Name.equalsAscii( "HelpText" ) )
+            {
+                if( ! (rEntry.Value >>= aHelpTexts) )
+                {
+                    rtl::OUString aHelpText;
+                    if( (rEntry.Value >>= aHelpText) )
+                    {
+                        aHelpTexts.realloc( 1 );
+                        *aHelpTexts.getArray() = aHelpText;
+                    }
+                }
+            }
+            else if( rEntry.Name.equalsAscii( "HintNoLayoutPage" ) )
+            {
+                sal_Bool bNoLayoutPage = sal_False;
+                rEntry.Value >>= bNoLayoutPage;
+                mbShowLayoutPage = ! bNoLayoutPage;
+            }
+        }
+
+        // bUseDependencyRow should only be true if a dependency exists
+        bUseDependencyRow = bUseDependencyRow && (aDependsOnName.getLength() != 0);
+
+        // is it necessary to switch between static and dynamic pages ?
+        bool bSwitchPage = false;
+        if( aGroupingHint.getLength() )
+            bSwitchPage = true;
+        else if( aCtrlType.equalsAscii( "Subgroup" ) || (bOnStaticPage && ! bSubgroupOnStaticPage )  )
+            bSwitchPage = true;
+        if( bSwitchPage )
+        {
+            // restore to dynamic
+            pCurParent = pDynamicPageParent;
+            pCurColumn = aDynamicColumns.empty() ? NULL : aDynamicColumns.back();
+            bOnStaticPage = false;
+            bSubgroupOnStaticPage = false;
+
+            if( aGroupingHint.equalsAscii( "PrintRange" ) )
+            {
+                pCurColumn = maJobPage.mxPrintRange.get();
+                pCurParent = &maJobPage;            // set job page as current parent
+                bOnStaticPage = true;
+            }
+            else if( aGroupingHint.equalsAscii( "OptionsPage" ) )
+            {
+                pCurColumn = &maOptionsPage.maLayout;
+                pCurParent = &maOptionsPage;        // set options page as current parent
+                bOnStaticPage = true;
+            }
+            else if( aGroupingHint.equalsAscii( "OptionsPageOptGroup" ) )
+            {
+                pCurColumn = maOptionsPage.mxOptGroup.get();
+                pCurParent = &maOptionsPage;        // set options page as current parent
+                bOnStaticPage = true;
+            }
+            else if( aGroupingHint.equalsAscii( "LayoutPage" ) )
+            {
+                pCurColumn = &maNUpPage.maLayout;
+                pCurParent = &maNUpPage;            // set layout page as current parent
+                bOnStaticPage = true;
+            }
+            else if( aGroupingHint.getLength() )
+            {
+                pCurColumn = &maJobPage.maLayout;
+                pCurParent = &maJobPage;            // set job page as current parent
+                bOnStaticPage = true;
+            }
+        }
+
+        if( aCtrlType.equalsAscii( "Group" ) ||
+            ( ! pCurParent && ! (bOnStaticPage || aGroupingHint.getLength() ) ) )
+        {
+            // add new tab page
+            TabPage* pNewGroup = new TabPage( &maTabCtrl );
+            maControls.push_front( pNewGroup );
+            pDynamicPageParent = pCurParent = pNewGroup;
+            pNewGroup->SetText( aText );
+            maTabCtrl.InsertPage( ++nOptPageId, aText );
+            maTabCtrl.SetTabPage( nOptPageId, pNewGroup );
+
+            // set help id
+            setSmartId( pNewGroup, "TabPage", nOptPageId );
+            // set help text
+            setHelpText( pNewGroup, aHelpTexts, 0 );
+
+            // reset subgroup counter
+            nCurSubGroup = 0;
+
+            aDynamicColumns.push_back( new vcl::RowOrColumn( NULL, true, aBorder.Width() ) );
+            pCurColumn = aDynamicColumns.back();
+            pCurColumn->setParentWindow( pNewGroup );
+            pCurColumn->setOuterBorder( aBorder.Width() );
+            bSubgroupOnStaticPage = false;
+            bOnStaticPage = false;
+        }
+        else if( aCtrlType.equalsAscii( "Subgroup" ) && (pCurParent || aGroupingHint.getLength() ) )
+        {
+            bSubgroupOnStaticPage = (aGroupingHint.getLength() != 0);
+            // create group FixedLine
+            if( ! aGroupingHint.equalsAscii( "PrintRange" ) ||
+                ! pCurColumn->countElements() == 0
+               )
+            {
+                Window* pNewSub = NULL;
+                if( aGroupingHint.equalsAscii( "PrintRange" ) )
+                    pNewSub = new FixedText( pCurParent, WB_VCENTER );
+                else
+                    pNewSub = new FixedLine( pCurParent );
+                maControls.push_front( pNewSub );
+                pNewSub->SetText( aText );
+                pNewSub->Show();
+
+                // set help id
+                setSmartId( pNewSub, "FixedLine", sal_Int32( nCurSubGroup++ ) );
+                // set help text
+                setHelpText( pNewSub, aHelpTexts, 0 );
+                // add group to current column
+                pCurColumn->addWindow( pNewSub );
+            }
+
+            // add an indent to the current column
+            vcl::Indenter* pIndent = new vcl::Indenter( pCurColumn, aBorder.Width() );
+            pCurColumn->addChild( pIndent );
+            // and create a column inside the indent
+            pCurColumn = new vcl::RowOrColumn( pIndent );
+            pIndent->setChild( pCurColumn );
+        }
+        // EVIL
+        else if( aCtrlType.equalsAscii( "Bool" ) &&
+                 aGroupingHint.equalsAscii( "LayoutPage" ) &&
+                 aPropertyName.equalsAscii( "PrintProspect" )
+                 )
+        {
+            maNUpPage.maBrochureBtn.SetText( aText );
+            maNUpPage.maBrochureBtn.Show();
+            setHelpText( &maNUpPage.maBrochureBtn, aHelpTexts, 0 );
+
+            sal_Bool bVal = sal_False;
+            PropertyValue* pVal = maPController->getValue( aPropertyName );
+            if( pVal )
+                pVal->Value >>= bVal;
+            maNUpPage.maBrochureBtn.Check( bVal );
+            maNUpPage.maBrochureBtn.Enable( maPController->isUIOptionEnabled( aPropertyName ) && pVal != NULL );
+            maNUpPage.maBrochureBtn.SetToggleHdl( LINK( this, PrintDialog, ClickHdl ) );
+
+            maPropertyToWindowMap[ aPropertyName ].push_back( &maNUpPage.maBrochureBtn );
+            maControlToPropertyMap[&maNUpPage.maBrochureBtn] = aPropertyName;
+
+            aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, maNUpPage.mxBrochureDep.get() ) );
+        }
+        else
+        {
+            vcl::RowOrColumn* pSaveCurColumn = pCurColumn;
+
+            if( bUseDependencyRow )
+            {
+                // find the correct dependency row (if any)
+                std::pair< std::multimap< rtl::OUString, vcl::RowOrColumn* >::iterator,
+                           std::multimap< rtl::OUString, vcl::RowOrColumn* >::iterator > aDepRange;
+                aDepRange = aPropertyToDependencyRowMap.equal_range( aDependsOnName );
+                if( aDepRange.first != aDepRange.second )
+                {
+                    while( nDependsOnValue && aDepRange.first != aDepRange.second )
+                    {
+                        nDependsOnValue--;
+                        ++aDepRange.first;
+                    }
+                    if( aDepRange.first != aPropertyToDependencyRowMap.end() )
+                    {
+                        pCurColumn = aDepRange.first->second;
+                        maReverseDependencySet.insert( aPropertyName );
+                    }
+                }
+            }
+            if( aCtrlType.equalsAscii( "Bool" ) && pCurParent )
+            {
+                // add a check box
+                CheckBox* pNewBox = new CheckBox( pCurParent );
+                maControls.push_front( pNewBox );
+                pNewBox->SetText( aText );
+                pNewBox->Show();
+
+                sal_Bool bVal = sal_False;
+                PropertyValue* pVal = maPController->getValue( aPropertyName );
+                if( pVal )
+                    pVal->Value >>= bVal;
+                pNewBox->Check( bVal );
+                pNewBox->SetToggleHdl( LINK( this, PrintDialog, UIOption_CheckHdl ) );
+
+                maPropertyToWindowMap[ aPropertyName ].push_back( pNewBox );
+                maControlToPropertyMap[pNewBox] = aPropertyName;
+
+                // set help id
+                setSmartId( pNewBox, "CheckBox", -1, aPropertyName );
+                // set help text
+                setHelpText( pNewBox, aHelpTexts, 0 );
+
+                vcl::RowOrColumn* pDependencyRow = new vcl::RowOrColumn( pCurColumn, false );
+                pCurColumn->addChild( pDependencyRow );
+                aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, pDependencyRow ) );
+
+                // add checkbox to current column
+                pDependencyRow->addWindow( pNewBox );
+            }
+            else if( aCtrlType.equalsAscii( "Radio" ) && pCurParent )
+            {
+                vcl::RowOrColumn* pRadioColumn = pCurColumn;
+                if( aText.getLength() )
+                {
+                    // add a FixedText:
+                    FixedText* pHeading = new FixedText( pCurParent );
+                    maControls.push_front( pHeading );
+                    pHeading->SetText( aText );
+                    pHeading->Show();
+
+                    // set help id
+                    setSmartId( pHeading, "FixedText", -1, aPropertyName );
+                    // set help text
+                    setHelpText( pHeading, aHelpTexts, nCurHelpText++ );
+                    // add fixed text to current column
+                    pCurColumn->addWindow( pHeading );
+                    // add an indent to the current column
+                    vcl::Indenter* pIndent = new vcl::Indenter( pCurColumn, 15 );
+                    pCurColumn->addChild( pIndent );
+                    // and create a column inside the indent
+                    pRadioColumn = new vcl::RowOrColumn( pIndent );
+                    pIndent->setChild( pRadioColumn );
+                }
+                // iterate options
+                sal_Int32 nSelectVal = 0;
+                PropertyValue* pVal = maPController->getValue( aPropertyName );
+                if( pVal && pVal->Value.hasValue() )
+                    pVal->Value >>= nSelectVal;
+                for( sal_Int32 m = 0; m < aChoices.getLength(); m++ )
+                {
+                    boost::shared_ptr<vcl::LabeledElement> pLabel( new vcl::LabeledElement( pRadioColumn, 1 ) );
+                    pRadioColumn->addChild( pLabel );
+                    boost::shared_ptr<vcl::RowOrColumn> pDependencyRow( new vcl::RowOrColumn( pLabel.get(), false ) );
+                    pLabel->setElement( pDependencyRow );
+                    aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, pDependencyRow.get() ) );
+
+                    RadioButton* pBtn = new RadioButton( pCurParent, m == 0 ? WB_GROUP : 0 );
+                    maControls.push_front( pBtn );
+                    pBtn->SetText( aChoices[m] );
+                    pBtn->Check( m == nSelectVal );
+                    pBtn->SetToggleHdl( LINK( this, PrintDialog, UIOption_RadioHdl ) );
+                    pBtn->Show();
+                    maPropertyToWindowMap[ aPropertyName ].push_back( pBtn );
+                    maControlToPropertyMap[pBtn] = aPropertyName;
+                    maControlToNumValMap[pBtn] = m;
+
+                    // set help id
+                    setSmartId( pBtn, "RadioButton", m, aPropertyName );
+                    // set help text
+                    setHelpText( pBtn, aHelpTexts, nCurHelpText++ );
+                    // add the radio button to the column
+                    pLabel->setLabel( pBtn );
+                }
+            }
+            else if( ( aCtrlType.equalsAscii( "List" )   ||
+                       aCtrlType.equalsAscii( "Range" )  ||
+                       aCtrlType.equalsAscii( "Edit" )
+                     ) && pCurParent )
+            {
+                // create a row in the current column
+                vcl::RowOrColumn* pFieldColumn = new vcl::RowOrColumn( pCurColumn, false );
+                pCurColumn->addChild( pFieldColumn );
+                aPropertyToDependencyRowMap.insert( std::pair< rtl::OUString, vcl::RowOrColumn* >( aPropertyName, pFieldColumn ) );
+
+                vcl::LabeledElement* pLabel = NULL;
+                if( aText.getLength() )
+                {
+                    // add a FixedText:
+                    FixedText* pHeading = new FixedText( pCurParent, WB_VCENTER );
+                    maControls.push_front( pHeading );
+                    pHeading->SetText( aText );
+                    pHeading->Show();
+
+                    // set help id
+                    setSmartId( pHeading, "FixedText", -1, aPropertyName );
+
+                    // add to row
+                    pLabel = new vcl::LabeledElement( pFieldColumn, 2 );
+                    pFieldColumn->addChild( pLabel );
+                    pLabel->setLabel( pHeading );
+                }
+
+                if( aCtrlType.equalsAscii( "List" ) )
+                {
+                    ListBox* pList = new ListBox( pCurParent, WB_DROPDOWN | WB_BORDER );
+                    maControls.push_front( pList );
+
+                    // iterate options
+                    for( sal_Int32 m = 0; m < aChoices.getLength(); m++ )
+                    {
+                        pList->InsertEntry( aChoices[m] );
+                    }
+                    sal_Int32 nSelectVal = 0;
+                    PropertyValue* pVal = maPController->getValue( aPropertyName );
+                    if( pVal && pVal->Value.hasValue() )
+                        pVal->Value >>= nSelectVal;
+                    pList->SelectEntryPos( static_cast<USHORT>(nSelectVal) );
+                    pList->SetSelectHdl( LINK( this, PrintDialog, UIOption_SelectHdl ) );
+                    pList->SetDropDownLineCount( static_cast<USHORT>(aChoices.getLength()) );
+                    pList->Show();
+
+                    // set help id
+                    setSmartId( pList, "ListBox", -1, aPropertyName );
+                    // set help text
+                    setHelpText( pList, aHelpTexts, 0 );
+
+                    maPropertyToWindowMap[ aPropertyName ].push_back( pList );
+                    maControlToPropertyMap[pList] = aPropertyName;
+
+                    // finish the pair
+                    if( pLabel )
+                        pLabel->setElement( pList );
+                    else
+                        pFieldColumn->addWindow( pList );
+                }
+                else if( aCtrlType.equalsAscii( "Range" ) )
+                {
+                    NumericField* pField = new NumericField( pCurParent, WB_BORDER | WB_SPIN );
+                    maControls.push_front( pField );
+
+                    // set min/max and current value
+                    if( nMinValue != nMaxValue )
+                    {
+                        pField->SetMin( nMinValue );
+                        pField->SetMax( nMaxValue );
+                    }
+                    sal_Int64 nCurVal = 0;
+                    PropertyValue* pVal = maPController->getValue( aPropertyName );
+                    if( pVal && pVal->Value.hasValue() )
+                        pVal->Value >>= nCurVal;
+                    pField->SetValue( nCurVal );
+                    pField->SetModifyHdl( LINK( this, PrintDialog, UIOption_ModifyHdl ) );
+                    pField->Show();
+
+                    // set help id
+                    setSmartId( pField, "NumericField", -1, aPropertyName );
+                    // set help text
+                    setHelpText( pField, aHelpTexts, 0 );
+
+                    maPropertyToWindowMap[ aPropertyName ].push_back( pField );
+                    maControlToPropertyMap[pField] = aPropertyName;
+
+                    // add to row
+                    if( pLabel )
+                        pLabel->setElement( pField );
+                    else
+                        pFieldColumn->addWindow( pField );
+                }
+                else if( aCtrlType.equalsAscii( "Edit" ) )
+                {
+                    Edit* pField = new Edit( pCurParent, WB_BORDER );
+                    maControls.push_front( pField );
+
+                    rtl::OUString aCurVal;
+                    PropertyValue* pVal = maPController->getValue( aPropertyName );
+                    if( pVal && pVal->Value.hasValue() )
+                        pVal->Value >>= aCurVal;
+                    pField->SetText( aCurVal );
+                    pField->SetModifyHdl( LINK( this, PrintDialog, UIOption_ModifyHdl ) );
+                    pField->Show();
+
+                    // set help id
+                    setSmartId( pField, "Edit", -1, aPropertyName );
+                    // set help text
+                    setHelpText( pField, aHelpTexts, 0 );
+
+                    maPropertyToWindowMap[ aPropertyName ].push_back( pField );
+                    maControlToPropertyMap[pField] = aPropertyName;
+
+                    // add to row
+                    if( pLabel )
+                        pLabel->setElement( pField );
+                    else
+                        pFieldColumn->addWindow( pField, 2 );
+                }
+            }
+            else
+            {
+                DBG_ERROR( "Unsupported UI option" );
+            }
+
+            pCurColumn = pSaveCurColumn;
+        }
+    }
+
+    // #i106506# if no brochure button, then the singular Pages radio button
+    // makes no sense, so replace it by a FixedText label
+    if( ! maNUpPage.maBrochureBtn.IsVisible() )
+    {
+        if( maNUpPage.mxPagesBtnLabel.get() )
+        {
+            maNUpPage.maPagesBoxTitleTxt.SetText( maNUpPage.maPagesBtn.GetText() );
+            maNUpPage.maPagesBoxTitleTxt.Show( TRUE );
+            maNUpPage.mxPagesBtnLabel->setLabel( &maNUpPage.maPagesBoxTitleTxt );
+            maNUpPage.maPagesBtn.Show( FALSE );
+        }
+    }
+
+    // update enable states
+    checkOptionalControlDependencies();
+
+    // print range empty (currently math only) -> hide print range and spacer line
+    if( maJobPage.mxPrintRange->countElements() == 0 )
+    {
+        maJobPage.mxPrintRange->show( false, false );
+        maJobPage.maCopySpacer.Show( FALSE );
+    }
+
+#ifdef WNT
+    // FIXME: the GetNativeControlRegion call on Windows has some issues
+    // (which skew the results of GetOptimalSize())
+    // however fixing this thoroughly needs to take interaction with paint into
+    // acoount, making the right fix less simple. Fix this the right way
+    // at some point. For now simply add some space at the lowest element
+    size_t nIndex = maJobPage.maLayout.countElements();
+    if( nIndex > 0 ) // sanity check
+        maJobPage.maLayout.setBorders( nIndex-1, 0, 0, 0, aBorder.Width()  );
+#endif
+
+    // calculate job page
+    Size aMaxSize = maJobPage.maLayout.getOptimalSize( WINDOWSIZE_PREFERRED );
+    // and layout page
+    updateMaxSize( maNUpPage.maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ), aMaxSize );
+    // and options page
+    updateMaxSize( maOptionsPage.maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ), aMaxSize );
+
+    for( std::vector< vcl::RowOrColumn* >::iterator it = aDynamicColumns.begin();
+         it != aDynamicColumns.end(); ++it )
+    {
+        Size aPageSize( (*it)->getOptimalSize( WINDOWSIZE_PREFERRED ) );
+        updateMaxSize( aPageSize, aMaxSize );
+    }
+
+    // resize dialog if necessary
+    Size aTabSize = maTabCtrl.GetTabPageSizePixel();
+    maTabCtrl.SetMinimumSizePixel( maTabCtrl.GetSizePixel() );
+    if( aMaxSize.Height() > aTabSize.Height() || aMaxSize.Width() > aTabSize.Width() )
+    {
+        Size aCurSize( GetOutputSizePixel() );
+        if( aMaxSize.Height() > aTabSize.Height() )
+        {
+            aCurSize.Height() += aMaxSize.Height() - aTabSize.Height();
+            aTabSize.Height() = aMaxSize.Height();
+        }
+        if( aMaxSize.Width() > aTabSize.Width() )
+        {
+            aCurSize.Width() += aMaxSize.Width() - aTabSize.Width();
+            // and the tab ctrl needs more space, too
+            aTabSize.Width() = aMaxSize.Width();
+        }
+        maTabCtrl.SetTabPageSizePixel( aTabSize );
+        maTabCtrl.SetMinimumSizePixel( maTabCtrl.GetSizePixel() );
+    }
+
+    // and finally arrange controls
+    for( std::vector< vcl::RowOrColumn* >::iterator it = aDynamicColumns.begin();
+         it != aDynamicColumns.end(); ++it )
+    {
+        (*it)->setManagedArea( Rectangle( Point(), aTabSize ) );
+        delete *it;
+        *it = NULL;
+    }
+    maJobPage.Resize();
+    maNUpPage.Resize();
+    maOptionsPage.Resize();
+
+    Size aSz = maLayout.getOptimalSize( WINDOWSIZE_PREFERRED );
+    SetOutputSizePixel( aSz );
+}
+
+void PrintDialog::DataChanged( const DataChangedEvent& i_rDCEvt )
+{
+    // react on settings changed
+    if( i_rDCEvt.GetType() == DATACHANGED_SETTINGS )
+        checkControlDependencies();
+    ModalDialog::DataChanged( i_rDCEvt );
+}
+
+void PrintDialog::checkControlDependencies()
+{
+    if( maJobPage.maCopyCountField.GetValue() > 1 )
+        maJobPage.maCollateBox.Enable( maJobPage.mnCollateUIMode == 0 );
+    else
+        maJobPage.maCollateBox.Enable( FALSE );
+
+    Image aImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateImg : maJobPage.maNoCollateImg );
+    Image aHCImg( maJobPage.maCollateBox.IsChecked() ? maJobPage.maCollateHCImg : maJobPage.maNoCollateHCImg );
+    bool bHC = GetSettings().GetStyleSettings().GetHighContrastMode();
+
+    Size aImgSize( aImg.GetSizePixel() );
+    Size aHCImgSize( aHCImg.GetSizePixel() );
+
+    if( aHCImgSize.Width() > aImgSize.Width() )
+        aImgSize.Width() = aHCImgSize.Width();
+    if( aHCImgSize.Height() > aImgSize.Height() )
+        aImgSize.Height() = aHCImgSize.Height();
+
+    // adjust size of image
+    maJobPage.maCollateImage.SetSizePixel( aImgSize );
+    maJobPage.maCollateImage.SetImage( bHC ? aHCImg : aImg );
+    maJobPage.maCollateImage.SetModeImage( aHCImg, BMP_COLOR_HIGHCONTRAST );
+
+    // enable setup button only for printers that can be setup
+    bool bHaveSetup = maPController->getPrinter()->HasSupport( SUPPORT_SETUPDIALOG );
+    maJobPage.maSetupButton.Enable( bHaveSetup );
+    if( bHaveSetup )
+    {
+        if( ! maJobPage.maSetupButton.IsVisible() )
+        {
+            Point aPrinterPos( maJobPage.maPrinters.GetPosPixel() );
+            Point aSetupPos( maJobPage.maSetupButton.GetPosPixel() );
+            Size aPrinterSize( maJobPage.maPrinters.GetSizePixel() );
+            aPrinterSize.Width() = aSetupPos.X() - aPrinterPos.X() - LogicToPixel( Size( 5, 5 ), MapMode( MAP_APPFONT ) ).Width();
+            maJobPage.maPrinters.SetSizePixel( aPrinterSize );
+            maJobPage.maSetupButton.Show();
+            maLayout.resize();
+        }
+    }
+    else
+    {
+        if( maJobPage.maSetupButton.IsVisible() )
+        {
+            Point aPrinterPos( maJobPage.maPrinters.GetPosPixel() );
+            Point aSetupPos( maJobPage.maSetupButton.GetPosPixel() );
+            Size aPrinterSize( maJobPage.maPrinters.GetSizePixel() );
+            Size aSetupSize( maJobPage.maSetupButton.GetSizePixel() );
+            aPrinterSize.Width() = aSetupPos.X() + aSetupSize.Width() - aPrinterPos.X();
+            maJobPage.maPrinters.SetSizePixel( aPrinterSize );
+            maJobPage.maSetupButton.Hide();
+            maLayout.resize();
+        }
+    }
+}
+
+void PrintDialog::checkOptionalControlDependencies()
+{
+    for( std::map< Window*, rtl::OUString >::iterator it = maControlToPropertyMap.begin();
+         it != maControlToPropertyMap.end(); ++it )
+    {
+        bool bShouldbeEnabled = maPController->isUIOptionEnabled( it->second );
+        if( ! bShouldbeEnabled )
+        {
+            // enable controls that are directly attached to a dependency anyway
+            // if the normally disabled controls get modified, change the dependency
+            // so the control would be enabled
+            // example: in print range "Print All" is selected, "Page Range" is then of course
+            // not selected and the Edit for the Page Range would be disabled
+            // as a convenience we should enable the Edit anyway and automatically select
+            // "Page Range" instead of "Print All" if the Edit gets modified
+            if( maReverseDependencySet.find( it->second ) != maReverseDependencySet.end() )
+            {
+                rtl::OUString aDep( maPController->getDependency( it->second ) );
+                // if the dependency is at least enabled, then enable this control anyway
+                if( aDep.getLength() && maPController->isUIOptionEnabled( aDep ) )
+                    bShouldbeEnabled = true;
+            }
+        }
+
+        bool bIsEnabled = it->first->IsEnabled();
+        // Enable does not do a change check first, so can be less cheap than expected
+        if( bShouldbeEnabled != bIsEnabled )
+            it->first->Enable( bShouldbeEnabled );
+    }
+}
+
+static rtl::OUString searchAndReplace( const rtl::OUString& i_rOrig, const char* i_pRepl, sal_Int32 i_nReplLen, const rtl::OUString& i_rRepl )
+{
+    sal_Int32 nPos = i_rOrig.indexOfAsciiL( i_pRepl, i_nReplLen );
+    if( nPos != -1 )
+    {
+        rtl::OUStringBuffer aBuf( i_rOrig.getLength() );
+        aBuf.append( i_rOrig.getStr(), nPos );
+        aBuf.append( i_rRepl );
+        if( nPos + i_nReplLen < i_rOrig.getLength() )
+            aBuf.append( i_rOrig.getStr() + nPos + i_nReplLen );
+        return aBuf.makeStringAndClear();
+    }
+    return i_rOrig;
+}
+
+void PrintDialog::updatePrinterText()
+{
+    String aDefPrt( Printer::GetDefaultPrinterName() );
+    const QueueInfo* pInfo = Printer::GetQueueInfo( maJobPage.maPrinters.GetSelectEntry(), true );
+    if( pInfo )
+    {
+        maJobPage.maLocationTxt.SetText( pInfo->GetLocation() );
+        maJobPage.maCommentTxt.SetText( pInfo->GetComment() );
+        // FIXME: status text
+        rtl::OUString aStatus;
+        if( aDefPrt == pInfo->GetPrinterName() )
+            aStatus = maDefPrtText;
+        maJobPage.maStatusTxt.SetText( aStatus );
+    }
+    else
+    {
+        maJobPage.maLocationTxt.SetText( String() );
+        maJobPage.maCommentTxt.SetText( String() );
+        maJobPage.maStatusTxt.SetText( String() );
+    }
+}
+
+void PrintDialog::setPreviewText( sal_Int32 )
+{
+    rtl::OUString aNewText( searchAndReplace( maPageStr, "%n", 2, rtl::OUString::valueOf( mnCachedPages )  ) );
+    maNumPagesText.SetText( aNewText );
+
+    // if layout is already established the refresh layout of
+    // preview controls since text length may have changes
+    if( mxPreviewCtrls.get() )
+        mxPreviewCtrls->setManagedArea( mxPreviewCtrls->getManagedArea() );
+}
+
+void PrintDialog::preparePreview( bool i_bNewPage, bool i_bMayUseCache )
+{
+    // page range may have changed depending on options
+    sal_Int32 nPages = maPController->getFilteredPageCount();
+    mnCachedPages = nPages;
+
+    if( mnCurPage >= nPages )
+        mnCurPage = nPages-1;
+    if( mnCurPage < 0 )
+        mnCurPage = 0;
+
+    setPreviewText( mnCurPage );
+
+    maPageEdit.SetMin( 1 );
+    maPageEdit.SetMax( nPages );
+
+    if( i_bNewPage )
+    {
+        const MapMode aMapMode( MAP_100TH_MM );
+        GDIMetaFile aMtf;
+        boost::shared_ptr<Printer> aPrt( maPController->getPrinter() );
+        if( nPages > 0 )
+        {
+            PrinterController::PageSize aPageSize =
+                maPController->getFilteredPageFile( mnCurPage, aMtf, i_bMayUseCache );
+            if( ! aPageSize.bFullPaper )
+            {
+                Point aOff( aPrt->PixelToLogic( aPrt->GetPageOffsetPixel(), aMapMode ) );
+                aMtf.Move( aOff.X(), aOff.Y() );
+            }
+        }
+
+        Size aCurPageSize = aPrt->PixelToLogic( aPrt->GetPaperSizePixel(), MapMode( MAP_100TH_MM ) );
+        maPreviewWindow.setPreview( aMtf, aCurPageSize, nPages > 0 ? rtl::OUString() : maNoPageStr,
+                                    aPrt->ImplGetDPIX(), aPrt->ImplGetDPIY()
+                                   );
+
+        maForwardBtn.Enable( mnCurPage < nPages-1 );
+        maBackwardBtn.Enable( mnCurPage != 0 );
+        maPageEdit.Enable( nPages > 1 );
+    }
+}
+
+Size PrintDialog::getJobPageSize()
+{
+    if( maFirstPageSize.Width() == 0 && maFirstPageSize.Height() == 0)
+    {
+        maFirstPageSize = maNupPortraitSize;
+        GDIMetaFile aMtf;
+        if( maPController->getPageCountProtected() > 0 )
+        {
+            PrinterController::PageSize aPageSize = maPController->getPageFile( 0, aMtf, true );
+            maFirstPageSize = aPageSize.aSize;
+        }
+    }
+    return maFirstPageSize;
+}
+
+void PrintDialog::updateNupFromPages()
+{
+    long nPages = long(maNUpPage.maNupPagesBox.GetEntryData(maNUpPage.maNupPagesBox.GetSelectEntryPos()));
+    int nRows   = int(maNUpPage.maNupRowsEdt.GetValue());
+    int nCols   = int(maNUpPage.maNupColEdt.GetValue());
+    long nPageMargin  = long(maNUpPage.maPageMarginEdt.Denormalize(maNUpPage.maPageMarginEdt.GetValue( FUNIT_100TH_MM )));
+    long nSheetMargin = long(maNUpPage.maSheetMarginEdt.Denormalize(maNUpPage.maSheetMarginEdt.GetValue( FUNIT_100TH_MM )));
+    bool bCustom = false;
+
+    if( nPages == 1 )
+    {
+        nRows = nCols = 1;
+        nSheetMargin = 0;
+        nPageMargin = 0;
+    }
+    else if( nPages == 2 || nPages == 4 || nPages == 6 || nPages == 9 || nPages == 16 )
+    {
+        Size aJobPageSize( getJobPageSize() );
+        bool bPortrait = aJobPageSize.Width() < aJobPageSize.Height();
+        if( nPages == 2 )
+        {
+            if( bPortrait )
+                nRows = 1, nCols = 2;
+            else
+                nRows = 2, nCols = 1;
+        }
+        else if( nPages == 4 )
+            nRows = nCols = 2;
+        else if( nPages == 6 )
+        {
+            if( bPortrait )
+                nRows = 2, nCols = 3;
+            else
+                nRows = 3, nCols = 2;
+        }
+        else if( nPages == 9 )
+            nRows = nCols = 3;
+        else if( nPages == 16 )
+            nRows = nCols = 4;
+        nPageMargin = 0;
+        nSheetMargin = 0;
+    }
+    else
+        bCustom = true;
+
+    if( nPages > 1 )
+    {
+        // set upper limits for margins based on job page size and rows/columns
+        Size aSize( getJobPageSize() );
+
+        // maximum sheet distance: 1/2 sheet
+        long nHorzMax = aSize.Width()/2;
+        long nVertMax = aSize.Height()/2;
+        if( nSheetMargin > nHorzMax )
+            nSheetMargin = nHorzMax;
+        if( nSheetMargin > nVertMax )
+            nSheetMargin = nVertMax;
+
+        maNUpPage.maSheetMarginEdt.SetMax(
+                  maNUpPage.maSheetMarginEdt.Normalize(
+                           nHorzMax > nVertMax ? nVertMax : nHorzMax ), FUNIT_100TH_MM );
+
+        // maximum page distance
+        nHorzMax = (aSize.Width() - 2*nSheetMargin);
+        if( nCols > 1 )
+            nHorzMax /= (nCols-1);
+        nVertMax = (aSize.Height() - 2*nSheetMargin);
+        if( nRows > 1 )
+            nHorzMax /= (nRows-1);
+
+        if( nPageMargin > nHorzMax )
+            nPageMargin = nHorzMax;
+        if( nPageMargin > nVertMax )
+            nPageMargin = nVertMax;
+
+        maNUpPage.maPageMarginEdt.SetMax(
+                 maNUpPage.maSheetMarginEdt.Normalize(
+                           nHorzMax > nVertMax ? nVertMax : nHorzMax ), FUNIT_100TH_MM );
+    }
+
+    maNUpPage.maNupRowsEdt.SetValue( nRows );
+    maNUpPage.maNupColEdt.SetValue( nCols );
+    maNUpPage.maPageMarginEdt.SetValue( maNUpPage.maPageMarginEdt.Normalize( nPageMargin ), FUNIT_100TH_MM );
+    maNUpPage.maSheetMarginEdt.SetValue( maNUpPage.maSheetMarginEdt.Normalize( nSheetMargin ), FUNIT_100TH_MM );
+
+    maNUpPage.showAdvancedControls( bCustom );
+    if( bCustom )
+    {
+        // see if we have to enlarge the dialog to make the tab page fit
+        Size aCurSize( maNUpPage.maLayout.getOptimalSize( WINDOWSIZE_PREFERRED ) );
+        Size aTabSize( maTabCtrl.GetTabPageSizePixel() );
+        if( aTabSize.Height() < aCurSize.Height() )
+        {
+            Size aDlgSize( GetSizePixel() );
+            aDlgSize.Height() += aCurSize.Height() - aTabSize.Height();
+            SetSizePixel( aDlgSize );
+        }
+    }
+
+    updateNup();
+}
+
+void PrintDialog::updateNup()
+{
+    int nRows         = int(maNUpPage.maNupRowsEdt.GetValue());
+    int nCols         = int(maNUpPage.maNupColEdt.GetValue());
+    long nPageMargin  = long(maNUpPage.maPageMarginEdt.Denormalize(maNUpPage.maPageMarginEdt.GetValue( FUNIT_100TH_MM )));
+    long nSheetMargin = long(maNUpPage.maSheetMarginEdt.Denormalize(maNUpPage.maSheetMarginEdt.GetValue( FUNIT_100TH_MM )));
+
+    PrinterController::MultiPageSetup aMPS;
+    aMPS.nRows         = nRows;
+    aMPS.nColumns      = nCols;
+    aMPS.nRepeat       = 1;
+    aMPS.nLeftMargin   =
+    aMPS.nTopMargin    =
+    aMPS.nRightMargin  =
+    aMPS.nBottomMargin = nSheetMargin;
+
+    aMPS.nHorizontalSpacing =
+    aMPS.nVerticalSpacing   = nPageMargin;
+
+    aMPS.bDrawBorder        = maNUpPage.maBorderCB.IsChecked();
+
+    int nOrderMode = int(sal_IntPtr(maNUpPage.maNupOrderBox.GetEntryData(
+                           maNUpPage.maNupOrderBox.GetSelectEntryPos() )));
+    if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_LRTD )
+        aMPS.nOrder = PrinterController::LRTB;
+    else if( nOrderMode == SV_PRINT_PRT_NUP_ORDER_TDLR )
+        aMPS.nOrder = PrinterController::TBLR;
+
+    int nOrientationMode = int(sal_IntPtr(maNUpPage.maNupOrientationBox.GetEntryData(
+                                 maNUpPage.maNupOrientationBox.GetSelectEntryPos() )));
+    if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE )
+        aMPS.aPaperSize = maNupLandscapeSize;
+    else if( nOrientationMode == SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT )
+        aMPS.aPaperSize = maNupPortraitSize;
+    else // automatic mode
+    {
+        // get size of first real page to see if it is portrait or landscape
+        // we assume same page sizes for all the pages for this
+        Size aPageSize = getJobPageSize();
+
+        Size aMultiSize( aPageSize.Width() * nCols, aPageSize.Height() * nRows );
+        if( aMultiSize.Width() > aMultiSize.Height() ) // fits better on landscape
+            aMPS.aPaperSize = maNupLandscapeSize;
+        else
+            aMPS.aPaperSize = maNupPortraitSize;
+    }
+
+    maPController->setMultipage( aMPS );
+
+    maNUpPage.maNupOrderWin.setValues( nOrderMode, nCols, nRows );
+
+    preparePreview( true, true );
+}
+
+IMPL_LINK( PrintDialog, SelectHdl, ListBox*, pBox )
+{
+    if(  pBox == &maJobPage.maPrinters )
+    {
+        String aNewPrinter( pBox->GetSelectEntry() );
+        // set new printer
+        maPController->setPrinter( boost::shared_ptr<Printer>( new Printer( aNewPrinter ) ) );
+        // update text fields
+        updatePrinterText();
+    }
+    else if( pBox == &maNUpPage.maNupOrientationBox || pBox == &maNUpPage.maNupOrderBox )
+    {
+        updateNup();
+    }
+    else if( pBox == &maNUpPage.maNupPagesBox )
+    {
+        if( !maNUpPage.maPagesBtn.IsChecked() )
+            maNUpPage.maPagesBtn.Check();
+        updateNupFromPages();
+    }
+
+    return 0;
+}
+
+IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton )
+{
+    if( pButton == &maOKButton || pButton == &maCancelButton )
+    {
+        storeToSettings();
+        EndDialog( pButton == &maOKButton );
+    }
+    else if( pButton == &maHelpButton )
+    {
+        // start help system
+        Help* pHelp = Application::GetHelp();
+        if( pHelp )
+        {
+            // FIXME: find out proper help URL and use here
+            pHelp->Start( HID_PRINTDLG, GetParent() );
+        }
+    }
+    else if( pButton == &maForwardBtn )
+    {
+        previewForward();
+    }
+    else if( pButton == &maBackwardBtn )
+    {
+        previewBackward();
+    }
+    else if( pButton == &maOptionsPage.maToFileBox )
+    {
+        maOKButton.SetText( maOptionsPage.maToFileBox.IsChecked() ? maPrintToFileText : maPrintText );
+        maLayout.resize();
+    }
+    else if( pButton == &maNUpPage.maBrochureBtn )
+    {
+        PropertyValue* pVal = getValueForWindow( pButton );
+        if( pVal )
+        {
+            sal_Bool bVal = maNUpPage.maBrochureBtn.IsChecked();
+            pVal->Value <<= bVal;
+
+            checkOptionalControlDependencies();
+
+            // update preview and page settings
+            preparePreview();
+        }
+        if( maNUpPage.maBrochureBtn.IsChecked() )
+        {
+            maNUpPage.maNupPagesBox.SelectEntryPos( 0 );
+            updateNupFromPages();
+            maNUpPage.showAdvancedControls( false );
+            maNUpPage.enableNupControls( false );
+        }
+    }
+    else if( pButton == &maNUpPage.maPagesBtn )
+    {
+        maNUpPage.enableNupControls( true );
+        updateNupFromPages();
+    }
+    else if( pButton == &maJobPage.maDetailsBtn )
+    {
+        bool bShow = maJobPage.maDetailsBtn.IsChecked();
+        maJobPage.mxDetails->show( bShow );
+        if( bShow )
+        {
+            maDetailsCollapsedSize = GetOutputSizePixel();
+            // enlarge dialog if necessary
+            Size aMinSize( maJobPage.maLayout.getOptimalSize( WINDOWSIZE_MINIMUM ) );
+            Size aCurSize( maJobPage.GetSizePixel() );
+            if( aCurSize.Height() < aMinSize.Height() )
+            {
+                Size aDlgSize( GetOutputSizePixel() );
+                aDlgSize.Height() += aMinSize.Height() - aCurSize.Height();
+                SetOutputSizePixel( aDlgSize );
+            }
+            maDetailsExpandedSize = GetOutputSizePixel();
+        }
+        else if( maDetailsCollapsedSize.Width() > 0   &&
+                 maDetailsCollapsedSize.Height() > 0 )
+        {
+            // if the user did not resize the dialog
+            // make it smaller again on collapsing the details
+            Size aDlgSize( GetOutputSizePixel() );
+            if( aDlgSize == maDetailsExpandedSize &&
+                aDlgSize.Height() > maDetailsCollapsedSize.Height() )
+            {
+                SetOutputSizePixel( maDetailsCollapsedSize );
+            }
+        }
+    }
+    else if( pButton == &maJobPage.maCollateBox )
+    {
+        maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ),
+                                 makeAny( sal_Bool(isCollate()) ) );
+        checkControlDependencies();
+    }
+    else if( pButton == &maOptionsPage.maReverseOrderBox )
+    {
+        sal_Bool bChecked = maOptionsPage.maReverseOrderBox.IsChecked();
+        maPController->setReversePrint( bChecked );
+        maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PrintReverse" ) ),
+                                 makeAny( bChecked ) );
+        preparePreview( true, true );
+    }
+    else if( pButton == &maNUpPage.maBorderCB )
+    {
+        updateNup();
+    }
+    else
+    {
+        if( pButton == &maJobPage.maSetupButton )
+        {
+            maPController->setupPrinter( this );
+            preparePreview( true, true );
+        }
+        checkControlDependencies();
+    }
+    return 0;
+}
+
+IMPL_LINK( PrintDialog, ModifyHdl, Edit*, pEdit )
+{
+    checkControlDependencies();
+    if( pEdit == &maNUpPage.maNupRowsEdt || pEdit == &maNUpPage.maNupColEdt ||
+        pEdit == &maNUpPage.maSheetMarginEdt || pEdit == &maNUpPage.maPageMarginEdt
+       )
+    {
+        updateNupFromPages();
+    }
+    else if( pEdit == &maPageEdit )
+    {
+        mnCurPage = sal_Int32( maPageEdit.GetValue() - 1 );
+        preparePreview( true, true );
+    }
+    else if( pEdit == &maJobPage.maCopyCountField )
+    {
+        maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CopyCount" ) ),
+                               makeAny( sal_Int32(maJobPage.maCopyCountField.GetValue()) ) );
+        maPController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ),
+                               makeAny( sal_Bool(isCollate()) ) );
+    }
+    return 0;
+}
+
+IMPL_LINK( PrintDialog, UIOptionsChanged, void*, EMPTYARG )
+{
+    checkOptionalControlDependencies();
+    return 0;
+}
+
+PropertyValue* PrintDialog::getValueForWindow( Window* i_pWindow ) const
+{
+    PropertyValue* pVal = NULL;
+    std::map< Window*, rtl::OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow );
+    if( it != maControlToPropertyMap.end() )
+    {
+        pVal = maPController->getValue( it->second );
+        DBG_ASSERT( pVal, "property value not found" );
+    }
+    else
+    {
+        DBG_ERROR( "changed control not in property map" );
+    }
+    return pVal;
+}
+
+void PrintDialog::updateWindowFromProperty( const rtl::OUString& i_rProperty )
+{
+    beans::PropertyValue* pValue = maPController->getValue( i_rProperty );
+    std::map< rtl::OUString, std::vector< Window* > >::const_iterator it = maPropertyToWindowMap.find( i_rProperty );
+    if( pValue && it != maPropertyToWindowMap.end() )
+    {
+        const std::vector< Window* >& rWindows( it->second );
+        if( ! rWindows.empty() )
+        {
+            sal_Bool bVal = sal_False;
+            sal_Int32 nVal = -1;
+            if( pValue->Value >>= bVal )
+            {
+                // we should have a CheckBox for this one
+                CheckBox* pBox = dynamic_cast< CheckBox* >( rWindows.front() );
+                if( pBox )
+                {
+                    pBox->Check( bVal );
+                }
+                else if( i_rProperty.equalsAscii( "PrintProspect" ) )
+                {
+                    // EVIL special case
+                    if( bVal )
+                        maNUpPage.maBrochureBtn.Check();
+                    else
+                        maNUpPage.maPagesBtn.Check();
+                }
+                else
+                {
+                    DBG_ASSERT( 0, "missing a checkbox" );
+                }
+            }
+            else if( pValue->Value >>= nVal )
+            {
+                // this could be a ListBox or a RadioButtonGroup
+                ListBox* pList = dynamic_cast< ListBox* >( rWindows.front() );
+                if( pList )
+                {
+                    pList->SelectEntryPos( static_cast< USHORT >(nVal) );
+                }
+                else if( nVal >= 0 && nVal < sal_Int32(rWindows.size() ) )
+                {
+                    RadioButton* pBtn = dynamic_cast< RadioButton* >( rWindows[nVal] );
+                    DBG_ASSERT( pBtn, "unexpected control for property" );
+                    if( pBtn )
+                        pBtn->Check();
+                }
+            }
+        }
+    }
+}
+
+void PrintDialog::makeEnabled( Window* i_pWindow )
+{
+    std::map< Window*, rtl::OUString >::const_iterator it = maControlToPropertyMap.find( i_pWindow );
+    if( it != maControlToPropertyMap.end() )
+    {
+        rtl::OUString aDependency( maPController->makeEnabled( it->second ) );
+        if( aDependency.getLength() )
+            updateWindowFromProperty( aDependency );
+    }
+}
+
+IMPL_LINK( PrintDialog, UIOption_CheckHdl, CheckBox*, i_pBox )
+{
+    PropertyValue* pVal = getValueForWindow( i_pBox );
+    if( pVal )
+    {
+        makeEnabled( i_pBox );
+
+        sal_Bool bVal = i_pBox->IsChecked();
+        pVal->Value <<= bVal;
+
+        checkOptionalControlDependencies();
+
+        // update preview and page settings
+        preparePreview();
+    }
+    return 0;
+}
+
+IMPL_LINK( PrintDialog, UIOption_RadioHdl, RadioButton*, i_pBtn )
+{
+    // this handler gets called for all radiobuttons that get unchecked, too
+    // however we only want one notificaction for the new value (that is for
+    // the button that gets checked)
+    if( i_pBtn->IsChecked() )
+    {
+        PropertyValue* pVal = getValueForWindow( i_pBtn );
+        std::map< Window*, sal_Int32 >::const_iterator it = maControlToNumValMap.find( i_pBtn );
+        if( pVal && it != maControlToNumValMap.end() )
+        {
+            makeEnabled( i_pBtn );
+
+            sal_Int32 nVal = it->second;
+            pVal->Value <<= nVal;
+
+            checkOptionalControlDependencies();
+
+            // update preview and page settings
+            preparePreview();
+        }
+    }
+    return 0;
+}
+
+IMPL_LINK( PrintDialog, UIOption_SelectHdl, ListBox*, i_pBox )
+{
+    PropertyValue* pVal = getValueForWindow( i_pBox );
+    if( pVal )
+    {
+        makeEnabled( i_pBox );
+
+        sal_Int32 nVal( i_pBox->GetSelectEntryPos() );
+        pVal->Value <<= nVal;
+
+        checkOptionalControlDependencies();
+
+        // update preview and page settings
+        preparePreview();
+    }
+    return 0;
+}
+
+IMPL_LINK( PrintDialog, UIOption_ModifyHdl, Edit*, i_pBox )
+{
+    PropertyValue* pVal = getValueForWindow( i_pBox );
+    if( pVal )
+    {
+        makeEnabled( i_pBox );
+
+        NumericField* pNum = dynamic_cast<NumericField*>(i_pBox);
+        MetricField* pMetric = dynamic_cast<MetricField*>(i_pBox);
+        if( pNum )
+        {
+            sal_Int64 nVal = pNum->GetValue();
+            pVal->Value <<= nVal;
+        }
+        else if( pMetric )
+        {
+            sal_Int64 nVal = pMetric->GetValue();
+            pVal->Value <<= nVal;
+        }
+        else
+        {
+            rtl::OUString aVal( i_pBox->GetText() );
+            pVal->Value <<= aVal;
+        }
+
+        checkOptionalControlDependencies();
+
+        // update preview and page settings
+        preparePreview();
+    }
+    return 0;
+}
+
+void PrintDialog::Command( const CommandEvent& rEvt )
+{
+    if( rEvt.GetCommand() == COMMAND_WHEEL )
+    {
+        const CommandWheelData* pWheelData = rEvt.GetWheelData();
+        if( pWheelData->GetDelta() > 0 )
+            previewForward();
+        else if( pWheelData->GetDelta() < 0 )
+            previewBackward();
+        /*
+        else
+            huh ?
+        */
+    }
+}
+
+void PrintDialog::Resize()
+{
+    maLayout.setManagedArea( Rectangle( Point( 0, 0 ), GetSizePixel() ) );
+    // and do the preview; however the metafile does not need to be gotten anew
+    preparePreview( false );
+
+    // do an invalidate for the benefit of the grouping elements
+    Invalidate();
+}
+
+void PrintDialog::previewForward()
+{
+    maPageEdit.Up();
+}
+
+void PrintDialog::previewBackward()
+{
+    maPageEdit.Down();
+}
+
+// -----------------------------------------------------------------------------
+//
+// PrintProgressDialog
+//
+// -----------------------------------------------------------------------------
+
+PrintProgressDialog::PrintProgressDialog( Window* i_pParent, int i_nMax ) :
+    ModelessDialog( i_pParent, VclResId( SV_DLG_PRINT_PROGRESS ) ),
+    maText( this, VclResId( SV_PRINT_PROGRESS_TEXT ) ),
+    maButton( this, VclResId( SV_PRINT_PROGRESS_CANCEL ) ),
+    mbCanceled( false ),
+    mnCur( 0 ),
+    mnMax( i_nMax ),
+    mnProgressHeight( 15 ),
+    mbNativeProgress( false )
+{
+    FreeResource();
+
+    if( mnMax < 1 )
+        mnMax = 1;
+
+    maStr = maText.GetText();
+
+    maButton.SetClickHdl( LINK( this, PrintProgressDialog, ClickHdl ) );
+
+}
+
+PrintProgressDialog::~PrintProgressDialog()
+{
+}
+
+IMPL_LINK( PrintProgressDialog, ClickHdl, Button*, pButton )
+{
+    if( pButton == &maButton )
+        mbCanceled = true;
+
+    return 0;
+}
+
+void PrintProgressDialog::implCalcProgressRect()
+{
+    if( IsNativeControlSupported( CTRL_PROGRESS, PART_ENTIRE_CONTROL ) )
+    {
+        ImplControlValue aValue;
+        Region aControlRegion( Rectangle( Point(), Size( 100, mnProgressHeight ) ) );
+        Region aNativeControlRegion, aNativeContentRegion;
+        if( GetNativeControlRegion( CTRL_PROGRESS, PART_ENTIRE_CONTROL, aControlRegion,
+                                    CTRL_STATE_ENABLED, aValue, rtl::OUString(),
+                                    aNativeControlRegion, aNativeContentRegion ) )
+        {
+            mnProgressHeight = aNativeControlRegion.GetBoundRect().GetHeight();
+        }
+        mbNativeProgress = true;
+    }
+    maProgressRect = Rectangle( Point( 10, maText.GetPosPixel().Y() + maText.GetSizePixel().Height() + 8 ),
+                                Size( GetSizePixel().Width() - 20, mnProgressHeight ) );
+}
+
+void PrintProgressDialog::setProgress( int i_nCurrent, int i_nMax )
+{
+    if( maProgressRect.IsEmpty() )
+        implCalcProgressRect();
+
+    mnCur = i_nCurrent;
+    if( i_nMax != -1 )
+        mnMax = i_nMax;
+
+    if( mnMax < 1 )
+        mnMax = 1;
+
+    rtl::OUString aNewText( searchAndReplace( maStr, "%p", 2, rtl::OUString::valueOf( mnCur ) ) );
+    aNewText = searchAndReplace( aNewText, "%n", 2, rtl::OUString::valueOf( mnMax ) );
+    maText.SetText( aNewText );
+
+    // update progress
+    Invalidate( maProgressRect, INVALIDATE_UPDATE );
+}
+
+void PrintProgressDialog::tick()
+{
+    if( mnCur < mnMax )
+        setProgress( ++mnCur );
+}
+
+void PrintProgressDialog::Paint( const Rectangle& )
+{
+    if( maProgressRect.IsEmpty() )
+        implCalcProgressRect();
+
+    Push( PUSH_LINECOLOR | PUSH_FILLCOLOR );
+    const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings();
+    Color aPrgsColor = rStyleSettings.GetHighlightColor();
+    if ( aPrgsColor == rStyleSettings.GetFaceColor() )
+        aPrgsColor = rStyleSettings.GetDarkShadowColor();
+    SetLineColor();
+    SetFillColor( aPrgsColor );
+
+    const long nOffset = 3;
+    const long nWidth = 3*mnProgressHeight/2;
+    const long nFullWidth = nWidth + nOffset;
+    const long nMaxCount = maProgressRect.GetWidth() / nFullWidth;
+    DrawProgress( this, maProgressRect.TopLeft(),
+                        nOffset,
+                        nWidth,
+                        mnProgressHeight,
+                        static_cast<USHORT>(0),
+                        static_cast<USHORT>(10000*mnCur/mnMax),
+                        static_cast<USHORT>(10000/nMaxCount),
+                        maProgressRect
+                        );
+    Pop();
+
+    if( ! mbNativeProgress )
+    {
+        DecorationView aDecoView( this );
+        Rectangle aFrameRect( maProgressRect );
+        aFrameRect.Left() -= nOffset;
+        aFrameRect.Right() += nOffset;
+        aFrameRect.Top() -= nOffset;
+        aFrameRect.Bottom() += nOffset;
+        aDecoView.DrawFrame( aFrameRect );
+    }
+}
+
diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx
index 4b77477976a9..735add842518 100644
--- a/vcl/source/window/scrwnd.cxx
+++ b/vcl/source/window/scrwnd.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: scrwnd.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/vcl/source/window/scrwnd.hxx b/vcl/source/window/scrwnd.hxx
index 6366d8322250..d808fa73e321 100644
--- a/vcl/source/window/scrwnd.hxx
+++ b/vcl/source/window/scrwnd.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: scrwnd.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/vcl/source/window/seleng.cxx b/vcl/source/window/seleng.cxx
index 136d8ad968b7..b4f4d0f2b6df 100644
--- a/vcl/source/window/seleng.cxx
+++ b/vcl/source/window/seleng.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: seleng.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/vcl/source/window/split.cxx b/vcl/source/window/split.cxx
index 1e9b0b17a631..b4553a4cf8a7 100644
--- a/vcl/source/window/split.cxx
+++ b/vcl/source/window/split.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: split.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/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 1e66849db73a..689c56cbe619 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.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: splitwin.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/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index ede3bcc107aa..9987dae32dbb 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.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: status.cxx,v $
- * $Revision: 1.30 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -156,6 +153,7 @@ void StatusBar::ImplInit( Window* pParent, WinBits nStyle )
     mbProgressMode  = FALSE;
     mbInUserDraw    = FALSE;
     mbBottomBorder  = FALSE;
+    mnItemsWidth    = STATUSBAR_OFFSET_X;
     mnDX            = 0;
     mnDY            = 0;
     mnCalcHeight    = 0;
diff --git a/vcl/source/window/syschild.cxx b/vcl/source/window/syschild.cxx
index 79cd0d18f8e4..ef71f83df1ee 100644
--- a/vcl/source/window/syschild.cxx
+++ b/vcl/source/window/syschild.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: syschild.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/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 2d99fbb20b65..056b55dc3b61 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.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: syswin.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/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index 95fb404d24af..02a8b6a5b717 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/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.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -276,3 +273,21 @@ void TabDialog::AdjustLayout()
 {
     ImplPosControls();
 }
+
+// -----------------------------------------------------------------------
+
+TabControl* TabDialog::ImplGetFirstTabControl() const
+{
+    Window* pChild = GetWindow( WINDOW_FIRSTCHILD );
+    while ( pChild )
+    {
+        if ( pChild->IsVisible() && (pChild != mpViewWindow) )
+        {
+            if ( pChild->GetType() == WINDOW_TABCONTROL )
+                return (TabControl*)pChild;
+        }
+        pChild = pChild->GetWindow( WINDOW_NEXT );
+    }
+    return NULL;
+}
+
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index e28026876fad..7bfd115af8f9 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.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: tabpage.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/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index d1e598532b88..c09dc464b809 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.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: taskpanelist.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/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 8aa4926f5e1a..9ad0b8734437 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.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: toolbox.cxx,v $
- * $Revision: 1.109 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -229,6 +226,22 @@ int ToolBox::ImplGetDragWidth( ToolBox* pThis )
     }
     return width;
 }
+
+ButtonType determineButtonType( ImplToolItem* pItem, ButtonType defaultType )
+{
+    ButtonType tmpButtonType = defaultType;
+    ToolBoxItemBits nBits( pItem->mnBits & 0x300 );
+    if ( nBits & TIB_TEXTICON ) // item has custom setting
+    {
+        tmpButtonType = BUTTON_SYMBOLTEXT;
+        if ( nBits == TIB_TEXT_ONLY )
+            tmpButtonType = BUTTON_TEXT;
+        else if ( nBits == TIB_ICON_ONLY )
+            tmpButtonType = BUTTON_SYMBOL;
+    }
+    return tmpButtonType;
+}
+
 // -----------------------------------------------------------------------
 
 void ToolBox::ImplUpdateDragArea( ToolBox *pThis )
@@ -1992,12 +2005,13 @@ BOOL ToolBox::ImplCalcItem()
                     bText = FALSE;
                 else
                     bText = TRUE;
-
+                ButtonType tmpButtonType = determineButtonType( &(*it), meButtonType ); // default to toolbox setting
                 if ( bImage || bText )
                 {
+
                     it->mbEmptyBtn = FALSE;
 
-                    if ( meButtonType == BUTTON_SYMBOL )
+                    if ( tmpButtonType == BUTTON_SYMBOL )
                     {
                         // we're drawing images only
                         if ( bImage || !bText )
@@ -2011,7 +2025,7 @@ BOOL ToolBox::ImplCalcItem()
                             it->mbVisibleText = TRUE;
                         }
                     }
-                    else if ( meButtonType == BUTTON_TEXT )
+                    else if ( tmpButtonType == BUTTON_TEXT )
                     {
                         // we're drawing text only
                         if ( bText || !bImage )
@@ -3625,7 +3639,8 @@ void ToolBox::ImplDrawItem( USHORT nPos, BOOL bHighlight, BOOL bPaint, BOOL bLay
     // determine what has to be drawn on the button: image, text or both
     BOOL bImage;
     BOOL bText;
-    pItem->DetermineButtonDrawStyle( meButtonType, bImage, bText );
+    ButtonType tmpButtonType = determineButtonType( pItem, meButtonType ); // default to toolbox setting
+    pItem->DetermineButtonDrawStyle( tmpButtonType, bImage, bText );
 
     // compute output values
     long    nBtnWidth = aBtnSize.Width()-SMALLBUTTON_HSIZE;
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index ecc335420f18..334cdd2d0a64 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.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: toolbox2.cxx,v $
- * $Revision: 1.55 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index bcf86c749673..516bc53d8920 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.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: window.cxx,v $
- * $Revision: 1.285.38.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -698,6 +695,8 @@ void Window::ImplInitWindowData( WindowType nType )
     mpWindowImpl->mbCallHandlersDuringInputDisabled = FALSE; // TRUE: call event handlers even if input is disabled
     mpWindowImpl->mbDisableAccessibleLabelForRelation = FALSE; // TRUE: do not set LabelFor relation on accessible objects
     mpWindowImpl->mbDisableAccessibleLabeledByRelation = FALSE; // TRUE: do not set LabeledBy relation on accessible objects
+    mpWindowImpl->mbHelpTextDynamic = FALSE;          // TRUE: append help id in HELP_DEBUG case
+    mpWindowImpl->mbFakeFocusSet = FALSE; // TRUE: pretend as if the window has focus.
 
     mbEnableRTL         = Application::GetSettings().GetLayoutRTL();         // TRUE: this outdev will be mirrored if RTL window layout (UI mirroring) is globally active
 }
@@ -1279,7 +1278,10 @@ void Window::ImplLoadRes( const ResId& rResId )
     if ( nObjMask & WINDOW_TEXT )
         SetText( ReadStringRes() );
     if ( nObjMask & WINDOW_HELPTEXT )
+    {
         SetHelpText( ReadStringRes() );
+        mpWindowImpl->mbHelpTextDynamic = TRUE;
+    }
     if ( nObjMask & WINDOW_QUICKTEXT )
         SetQuickHelpText( ReadStringRes() );
     if ( nObjMask & WINDOW_EXTRALONG )
@@ -3911,6 +3913,20 @@ void Window::ImplCallFocusChangeActivate( Window* pNewOverlapWindow,
     }
 }
 
+static bool IsWindowFocused(const WindowImpl& rWinImpl)
+{
+    if (rWinImpl.mpSysObj)
+        return true;
+
+    if (rWinImpl.mpFrameData->mbHasFocus)
+        return true;
+
+    if (rWinImpl.mbFakeFocusSet)
+        return true;
+
+    return false;
+}
+
 // -----------------------------------------------------------------------
 void Window::ImplGrabFocus( USHORT nFlags )
 {
@@ -3982,9 +3998,7 @@ void Window::ImplGrabFocus( USHORT nFlags )
         pFrame = pFrame->mpWindowImpl->mpFrameData->mpNextFrame;
     }
 
-    BOOL bHasFocus = TRUE;
-        if ( !mpWindowImpl->mpSysObj && !mpWindowImpl->mpFrameData->mbHasFocus )
-            bHasFocus = FALSE;
+    bool bHasFocus = IsWindowFocused(*mpWindowImpl);
 
     BOOL bMustNotGrabFocus = FALSE;
     // #100242#, check parent hierarchy if some floater prohibits grab focus
@@ -4755,7 +4769,10 @@ void Window::doLazyDelete()
     SystemWindow* pSysWin = dynamic_cast<SystemWindow*>(this);
     DockingWindow* pDockWin = dynamic_cast<DockingWindow*>(this);
     if( pSysWin || ( pDockWin && pDockWin->IsFloatingMode() ) )
+    {
+        Show( FALSE );
         SetParent( ImplGetDefaultWindow() );
+    }
     vcl::LazyDeletor<Window>::Delete( this );
 }
 
@@ -5377,6 +5394,11 @@ void Window::CallEventListeners( ULONG nEvent, void* pData )
     }
 }
 
+void Window::FireVclEvent( VclSimpleEvent* pEvent )
+{
+    ImplGetSVData()->mpApp->ImplCallEventListeners(pEvent);
+}
+
 // -----------------------------------------------------------------------
 
 void Window::AddEventListener( const Link& rEventListener )
@@ -7752,6 +7774,11 @@ void Window::GrabFocusToDocument()
     }
 }
 
+void Window::SetFakeFocus( bool bFocus )
+{
+    ImplGetWindowImpl()->mbFakeFocusSet = bFocus;
+}
+
 // -----------------------------------------------------------------------
 
 BOOL Window::HasChildPathFocus( BOOL bSystemWindow ) const
@@ -8109,9 +8136,26 @@ const XubString& Window::GetHelpText() const
                     ((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( aStrHelpId, this );
                 else
                     ((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( nNumHelpId, this );
+                mpWindowImpl->mbHelpTextDynamic = FALSE;
             }
         }
     }
+    else if( mpWindowImpl->mbHelpTextDynamic && (nNumHelpId || bStrHelpId) )
+    {
+        static const char* pEnv = getenv( "HELP_DEBUG" );
+        if( pEnv && *pEnv )
+        {
+            rtl::OUStringBuffer aTxt( 64+mpWindowImpl->maHelpText.Len() );
+            aTxt.append( mpWindowImpl->maHelpText );
+            aTxt.appendAscii( "\n+++++++++++++++\n" );
+            if( bStrHelpId )
+                aTxt.append( rtl::OUString( aStrHelpId ) );
+            else
+                aTxt.append( sal_Int32( nNumHelpId ) );
+            mpWindowImpl->maHelpText = aTxt.makeStringAndClear();
+        }
+        mpWindowImpl->mbHelpTextDynamic = FALSE;
+    }
 
     return mpWindowImpl->maHelpText;
 }
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index d70f607a6cc6..02b2713b01cc 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.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: window2.cxx,v $
- * $Revision: 1.29 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1459,7 +1456,6 @@ ULONG Window::GetHelpId() const
 
 void Window::SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode )
 {
-    mpWindowImpl->maHelpText = String();
     // create SmartId if required
     if ( (aMode == SMART_SET_STR) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasString() ) )
     {
@@ -2000,6 +1996,7 @@ BOOL Window::IsZoom() const
 void Window::SetHelpText( const XubString& rHelpText )
 {
     mpWindowImpl->maHelpText = rHelpText;
+    mpWindowImpl->mbHelpTextDynamic = TRUE;
 }
 
 void Window::SetQuickHelpText( const XubString& rHelpText )
diff --git a/vcl/source/window/window3.cxx b/vcl/source/window/window3.cxx
index 4c875c24fc25..9c10c5f131bf 100644
--- a/vcl/source/window/window3.cxx
+++ b/vcl/source/window/window3.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: window3.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/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 8c69c2a45daf..93e1b0837429 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.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: winproc.cxx,v $
- * $Revision: 1.127 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index c1f80bb061e5..8fb2f2f8346a 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.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: wrkwin.cxx,v $
- * $Revision: 1.21.138.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/test/canvasbitmaptest.cxx b/vcl/test/canvasbitmaptest.cxx
index ae0e79f0959f..1b70161d6cb0 100644
--- a/vcl/test/canvasbitmaptest.cxx
+++ b/vcl/test/canvasbitmaptest.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: canvasbitmaptest.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/vcl/test/dndtest.cxx b/vcl/test/dndtest.cxx
index 2d426acf84b5..c52d6d3e9589 100755
--- a/vcl/test/dndtest.cxx
+++ b/vcl/test/dndtest.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: dndtest.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/vcl/test/makefile.mk b/vcl/test/makefile.mk
index 4f10be112d2c..8691d0bcb626 100644
--- a/vcl/test/makefile.mk
+++ b/vcl/test/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/gtk/a11y/atkaction.cxx b/vcl/unx/gtk/a11y/atkaction.cxx
index 66251d721faa..4329dd345d14 100644
--- a/vcl/unx/gtk/a11y/atkaction.cxx
+++ b/vcl/unx/gtk/a11y/atkaction.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: atkaction.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/vcl/unx/gtk/a11y/atkbridge.cxx b/vcl/unx/gtk/a11y/atkbridge.cxx
index c8db1538a3a0..9498c4570ae0 100644
--- a/vcl/unx/gtk/a11y/atkbridge.cxx
+++ b/vcl/unx/gtk/a11y/atkbridge.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: atkbridge.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/vcl/unx/gtk/a11y/atkcomponent.cxx b/vcl/unx/gtk/a11y/atkcomponent.cxx
index 5c35191ee7dc..24cf335ebeb0 100644
--- a/vcl/unx/gtk/a11y/atkcomponent.cxx
+++ b/vcl/unx/gtk/a11y/atkcomponent.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: atkcomponent.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/vcl/unx/gtk/a11y/atkeditabletext.cxx b/vcl/unx/gtk/a11y/atkeditabletext.cxx
index a78e5bf8405a..c0399145b07c 100644
--- a/vcl/unx/gtk/a11y/atkeditabletext.cxx
+++ b/vcl/unx/gtk/a11y/atkeditabletext.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: atkeditabletext.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/vcl/unx/gtk/a11y/atkfactory.cxx b/vcl/unx/gtk/a11y/atkfactory.cxx
index 530a11b03681..d2574f616539 100644
--- a/vcl/unx/gtk/a11y/atkfactory.cxx
+++ b/vcl/unx/gtk/a11y/atkfactory.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: atkfactory.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/vcl/unx/gtk/a11y/atkfactory.hxx b/vcl/unx/gtk/a11y/atkfactory.hxx
index 0246fe1695c1..82be08cfad1b 100644
--- a/vcl/unx/gtk/a11y/atkfactory.hxx
+++ b/vcl/unx/gtk/a11y/atkfactory.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: atkfactory.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/vcl/unx/gtk/a11y/atkhypertext.cxx b/vcl/unx/gtk/a11y/atkhypertext.cxx
index 68993922a8de..90d735890655 100644
--- a/vcl/unx/gtk/a11y/atkhypertext.cxx
+++ b/vcl/unx/gtk/a11y/atkhypertext.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: atkhypertext.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/vcl/unx/gtk/a11y/atkimage.cxx b/vcl/unx/gtk/a11y/atkimage.cxx
index f6fd2cbe20ba..b48c59555a29 100644
--- a/vcl/unx/gtk/a11y/atkimage.cxx
+++ b/vcl/unx/gtk/a11y/atkimage.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: atkimage.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/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index f083e7cc584e..e02478ac8ad8 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.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: atklistener.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/vcl/unx/gtk/a11y/atklistener.hxx b/vcl/unx/gtk/a11y/atklistener.hxx
index 9936643a5d36..d2889caa3e24 100644
--- a/vcl/unx/gtk/a11y/atklistener.hxx
+++ b/vcl/unx/gtk/a11y/atklistener.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: atklistener.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/vcl/unx/gtk/a11y/atkregistry.cxx b/vcl/unx/gtk/a11y/atkregistry.cxx
index 008cefd56f51..81ec22dc4ce1 100644
--- a/vcl/unx/gtk/a11y/atkregistry.cxx
+++ b/vcl/unx/gtk/a11y/atkregistry.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: atkregistry.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/vcl/unx/gtk/a11y/atkregistry.hxx b/vcl/unx/gtk/a11y/atkregistry.hxx
index 6b2b138a0294..f4de3b2e4c1e 100644
--- a/vcl/unx/gtk/a11y/atkregistry.hxx
+++ b/vcl/unx/gtk/a11y/atkregistry.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: atkregistry.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/vcl/unx/gtk/a11y/atkselection.cxx b/vcl/unx/gtk/a11y/atkselection.cxx
index a508ce8dc61a..172faac4c704 100644
--- a/vcl/unx/gtk/a11y/atkselection.cxx
+++ b/vcl/unx/gtk/a11y/atkselection.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: atkselection.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/vcl/unx/gtk/a11y/atktable.cxx b/vcl/unx/gtk/a11y/atktable.cxx
index 6de075e1b892..78571ff11c34 100644
--- a/vcl/unx/gtk/a11y/atktable.cxx
+++ b/vcl/unx/gtk/a11y/atktable.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: atktable.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/vcl/unx/gtk/a11y/atktext.cxx b/vcl/unx/gtk/a11y/atktext.cxx
index 0a97e5ba1ca6..f346a6a5a02c 100644
--- a/vcl/unx/gtk/a11y/atktext.cxx
+++ b/vcl/unx/gtk/a11y/atktext.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: atktext.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/vcl/unx/gtk/a11y/atktextattributes.cxx b/vcl/unx/gtk/a11y/atktextattributes.cxx
index 58dd5f200bbd..02624a9628cf 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.cxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.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: atktextattributes.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/vcl/unx/gtk/a11y/atktextattributes.hxx b/vcl/unx/gtk/a11y/atktextattributes.hxx
index ca67fd946a20..e363460bb578 100644
--- a/vcl/unx/gtk/a11y/atktextattributes.hxx
+++ b/vcl/unx/gtk/a11y/atktextattributes.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: atktextattributes.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/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx
index c92a69d3fb49..6ed99d0cf3a3 100644
--- a/vcl/unx/gtk/a11y/atkutil.cxx
+++ b/vcl/unx/gtk/a11y/atkutil.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: atkutil.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -666,7 +663,16 @@ long WindowEventHandler(void *, ::VclSimpleEvent const * pEvent)
             static_cast< ::VclWindowEvent const * >(pEvent)->GetWindow());
  */
     case VCLEVENT_MENU_HIGHLIGHT:
-        handle_menu_highlighted(static_cast< ::VclMenuEvent const * >(pEvent));
+        if (const VclMenuEvent* pMenuEvent = dynamic_cast<const VclMenuEvent*>(pEvent))
+        {
+            handle_menu_highlighted(pMenuEvent);
+        }
+        else if (const VclAccessibleEvent* pAccEvent = dynamic_cast<const VclAccessibleEvent*>(pEvent))
+        {
+            uno::Reference< accessibility::XAccessible > xAccessible = pAccEvent->GetAccessible();
+            if (xAccessible.is())
+                atk_wrapper_focus_tracker_notify_when_idle(xAccessible);
+        }
         break;
 
     case VCLEVENT_TOOLBOX_HIGHLIGHT:
diff --git a/vcl/unx/gtk/a11y/atkutil.hxx b/vcl/unx/gtk/a11y/atkutil.hxx
index e945160820b4..8c8ddf59c65f 100644
--- a/vcl/unx/gtk/a11y/atkutil.hxx
+++ b/vcl/unx/gtk/a11y/atkutil.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: atkutil.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/vcl/unx/gtk/a11y/atkvalue.cxx b/vcl/unx/gtk/a11y/atkvalue.cxx
index 5bb2c700b0c4..9b8e9743eb18 100644
--- a/vcl/unx/gtk/a11y/atkvalue.cxx
+++ b/vcl/unx/gtk/a11y/atkvalue.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: atkvalue.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/vcl/unx/gtk/a11y/atkwindow.cxx b/vcl/unx/gtk/a11y/atkwindow.cxx
index 5961556e85d7..f588c1e345e4 100644
--- a/vcl/unx/gtk/a11y/atkwindow.cxx
+++ b/vcl/unx/gtk/a11y/atkwindow.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: atkwindow.cxx,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -33,6 +30,7 @@
 
 #include <plugins/gtk/gtkframe.hxx>
 #include <vcl/window.hxx>
+#include "vcl/popupmenuwindow.hxx"
 
 #include "atkwindow.hxx"
 #include "atkwrapper.hxx"
@@ -108,6 +106,17 @@ init_from_window( AtkObject *accessible, Window *pWindow )
                     pChild->SetAccessibleRole( AccessibleRole::LABEL );
                     accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
                 }
+                else if ( pWindow->GetType() == WINDOW_BORDERWINDOW && pChild->GetType() == WINDOW_FLOATINGWINDOW )
+                {
+                    PopupMenuFloatingWindow* p = dynamic_cast<PopupMenuFloatingWindow*>(pChild);
+                    if (p && p->IsPopupMenu() && p->GetMenuStackLevel() == 0)
+                    {
+                        // This is a top-level menu popup.  Register it.
+                        role = ATK_ROLE_POPUP_MENU;
+                        pChild->SetAccessibleRole( AccessibleRole::POPUP_MENU );
+                        accessible->name = g_strdup( rtl::OUStringToOString( pChild->GetText(), RTL_TEXTENCODING_UTF8 ).getStr() );
+                    }
+                }
             }
             break;
         }
@@ -136,6 +145,23 @@ ooo_window_wrapper_real_focus_gtk (GtkWidget *, GdkEventFocus *)
 
 /*****************************************************************************/
 
+static bool
+isChildPopupMenu(Window* pWindow)
+{
+    Window* pChild = pWindow->GetAccessibleChildWindow(0);
+    if (!pChild)
+        return false;
+
+    if (WINDOW_FLOATINGWINDOW != pChild->GetType())
+        return false;
+
+    PopupMenuFloatingWindow* p = dynamic_cast<PopupMenuFloatingWindow*>(pChild);
+    if (!p)
+        return false;
+
+    return p->IsPopupMenu();
+}
+
 static void
 ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
 {
@@ -157,8 +183,16 @@ ooo_window_wrapper_real_initialize(AtkObject *obj, gpointer data)
              */
             if( WINDOW_BORDERWINDOW == pWindow->GetType() )
             {
-                ooo_wrapper_registry_add( xAccessible, obj );
-                g_object_set_data( G_OBJECT(obj), "ooo:atk-wrapper-key", xAccessible.get() );
+                if ( isChildPopupMenu(pWindow) )
+                {
+                    AtkObject *child = atk_object_wrapper_new( xAccessible, obj );
+                    ooo_wrapper_registry_add( xAccessible, child );
+                }
+                else
+                {
+                    ooo_wrapper_registry_add( xAccessible, obj );
+                    g_object_set_data( G_OBJECT(obj), "ooo:atk-wrapper-key", xAccessible.get() );
+                }
             }
             else
             {
diff --git a/vcl/unx/gtk/a11y/atkwindow.hxx b/vcl/unx/gtk/a11y/atkwindow.hxx
index a8787869de97..6a9862256999 100644
--- a/vcl/unx/gtk/a11y/atkwindow.hxx
+++ b/vcl/unx/gtk/a11y/atkwindow.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: atkwindow.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/vcl/unx/gtk/a11y/atkwrapper.cxx b/vcl/unx/gtk/a11y/atkwrapper.cxx
index 8854083e1509..5beb838c0e82 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.cxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.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: atkwrapper.cxx,v $
- * $Revision: 1.11.52.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -515,6 +512,60 @@ wrapper_ref_relation_set( AtkObject *atk_obj )
 
 /*****************************************************************************/
 
+#if 0
+struct {
+    sal_Int16       value;
+    const sal_Char* name;
+} aStateTypeTable[] = {
+    { accessibility::AccessibleStateType::INVALID, "INVALID" },
+    { accessibility::AccessibleStateType::ACTIVE, "ACTIVE" },
+    { accessibility::AccessibleStateType::ARMED, "ARMED" },
+    { accessibility::AccessibleStateType::BUSY, "BUSY" },
+    { accessibility::AccessibleStateType::CHECKED, "CHECKED" },
+    { accessibility::AccessibleStateType::DEFUNC, "DEFUNC" },
+    { accessibility::AccessibleStateType::EDITABLE, "EDITABLE" },
+    { accessibility::AccessibleStateType::ENABLED, "ENABLED" },
+    { accessibility::AccessibleStateType::EXPANDABLE, "EXPANDABLE" },
+    { accessibility::AccessibleStateType::EXPANDED, "EXPANDED" },
+    { accessibility::AccessibleStateType::FOCUSABLE, "FOCUSABLE" },
+    { accessibility::AccessibleStateType::FOCUSED, "FOCUSED" },
+    { accessibility::AccessibleStateType::HORIZONTAL, "HORIZONTAL" },
+    { accessibility::AccessibleStateType::ICONIFIED, "ICONIFIED" },
+    { accessibility::AccessibleStateType::INDETERMINATE, "INDETERMINATE" },
+    { accessibility::AccessibleStateType::MANAGES_DESCENDANTS, "MANAGES_DESCENDANTS" },
+    { accessibility::AccessibleStateType::MODAL, "MODAL" },
+    { accessibility::AccessibleStateType::MULTI_LINE, "MULTI_LINE" },
+    { accessibility::AccessibleStateType::MULTI_SELECTABLE, "MULTI_SELECTABLE" },
+    { accessibility::AccessibleStateType::OPAQUE, "OPAQUE" },
+    { accessibility::AccessibleStateType::PRESSED, "PRESSED" },
+    { accessibility::AccessibleStateType::RESIZABLE, "RESIZABLE" },
+    { accessibility::AccessibleStateType::SELECTABLE, "SELECTABLE" },
+    { accessibility::AccessibleStateType::SELECTED, "SELECTED" },
+    { accessibility::AccessibleStateType::SENSITIVE, "SENSITIVE" },
+    { accessibility::AccessibleStateType::SHOWING, "SHOWING" },
+    { accessibility::AccessibleStateType::SINGLE_LINE, "SINGLE_LINE" },
+    { accessibility::AccessibleStateType::STALE, "STALE" },
+    { accessibility::AccessibleStateType::TRANSIENT, "TRANSIENT" },
+    { accessibility::AccessibleStateType::VERTICAL, "VERTICAL" },
+    { accessibility::AccessibleStateType::VISIBLE, "VISIBLE" }
+};
+
+static void printStates(const uno::Sequence<sal_Int16>& rStates)
+{
+    sal_Int32 n = rStates.getLength();
+    size_t nTypes = sizeof(aStateTypeTable)/sizeof(aStateTypeTable[0]);
+    for (sal_Int32 i = 0; i < n; ++i)
+    {
+        for (size_t j = 0; j < nTypes; ++j)
+        {
+            if (aStateTypeTable[j].value == rStates[i])
+                printf("%s ", aStateTypeTable[j].name);
+        }
+    }
+    printf("\n");
+}
+#endif
+
 static AtkStateSet *
 wrapper_ref_state_set( AtkObject *atk_obj )
 {
diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index 95cf30096e7b..4252c0404833 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.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: atkwrapper.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/vcl/unx/gtk/a11y/makefile.mk b/vcl/unx/gtk/a11y/makefile.mk
index 6edb723d7100..14d3014ddf11 100644
--- a/vcl/unx/gtk/a11y/makefile.mk
+++ b/vcl/unx/gtk/a11y/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/gtk/app/gtkdata.cxx b/vcl/unx/gtk/app/gtkdata.cxx
index b55798608b37..b1529e060270 100644
--- a/vcl/unx/gtk/app/gtkdata.cxx
+++ b/vcl/unx/gtk/app/gtkdata.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: gtkdata.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/vcl/unx/gtk/app/gtkinst.cxx b/vcl/unx/gtk/app/gtkinst.cxx
index af3a1df97a8c..68617c8c16be 100644
--- a/vcl/unx/gtk/app/gtkinst.cxx
+++ b/vcl/unx/gtk/app/gtkinst.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: gtkinst.cxx,v $
- * $Revision: 1.19 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -144,11 +141,6 @@ extern "C"
         if( ! ( pNoXInitThreads && *pNoXInitThreads ) )
             XInitThreads();
 
-        #if OSL_DEBUG_LEVEL > 1
-        int nFd = open( "/home/pl93762/log.txt", O_CREAT | O_TRUNC | O_WRONLY, 0755 );
-        dup2( nFd, STDERR_FILENO );
-        #endif
-
         const gchar* pVersion = gtk_check_version( 2, 2, 0 );
         if( pVersion )
         {
diff --git a/vcl/unx/gtk/app/gtksys.cxx b/vcl/unx/gtk/app/gtksys.cxx
index 989ccdbb15f3..272af20d0886 100644
--- a/vcl/unx/gtk/app/gtksys.cxx
+++ b/vcl/unx/gtk/app/gtksys.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: gtksys.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/vcl/unx/gtk/app/makefile.mk b/vcl/unx/gtk/app/makefile.mk
index 22ebcea7b8c9..3e8cd750bf7a 100644
--- a/vcl/unx/gtk/app/makefile.mk
+++ b/vcl/unx/gtk/app/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/vcl/unx/gtk/gdi/makefile.mk b/vcl/unx/gtk/gdi/makefile.mk
index 02d507b645de..ec6b4e1d205e 100644
--- a/vcl/unx/gtk/gdi/makefile.mk
+++ b/vcl/unx/gtk/gdi/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index f922552ce923..372d10fa5aaf 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.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: salnativewidgets-gtk.cxx,v $
- * $Revision: 1.47.32.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1091,6 +1088,19 @@ BOOL GtkSalGraphics::getNativeControlRegion(  ControlType nType,
         rNativeContentRegion = Region( aIndicatorRect );
         returnVal = TRUE;
     }
+    if( (nType == CTRL_EDITBOX || nType == CTRL_SPINBOX) && nPart == PART_ENTIRE_CONTROL )
+    {
+        NWEnsureGTKEditBox( m_nScreen );
+        GtkWidget* widget = gWidgetData[m_nScreen].gEditBoxWidget;
+        GtkRequisition aReq;
+        gtk_widget_size_request( widget, &aReq );
+        Rectangle aEditRect = rControlRegion.GetBoundRect();
+        aEditRect = Rectangle( aEditRect.TopLeft(),
+                               Size( aEditRect.GetWidth(), aReq.height+1 ) );
+        rNativeBoundingRegion = Region( aEditRect );
+        rNativeContentRegion = rNativeBoundingRegion;
+        returnVal = TRUE;
+    }
 
     return( returnVal );
 }
diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index 92ff2d3b8d8e..5d7fcabb7c8f 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.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: gtkframe.cxx,v $
- * $Revision: 1.84.36.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1315,7 +1312,7 @@ void GtkSalFrame::Show( BOOL bVisible, BOOL bNoActivate )
             setMinMaxSize();
 
             // #i45160# switch to desktop where a dialog with parent will appear
-            if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea )
+            if( m_pParent && m_pParent->m_nWorkArea != m_nWorkArea && GTK_WIDGET_MAPPED(m_pParent->m_pWindow) )
                 getDisplay()->getWMAdaptor()->switchToWorkArea( m_pParent->m_nWorkArea );
 
             if( isFloatGrabWindow() &&
diff --git a/vcl/unx/gtk/window/gtkobject.cxx b/vcl/unx/gtk/window/gtkobject.cxx
index e79b73f5f4a8..2a2bbe78078a 100644
--- a/vcl/unx/gtk/window/gtkobject.cxx
+++ b/vcl/unx/gtk/window/gtkobject.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: gtkobject.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/vcl/unx/gtk/window/makefile.mk b/vcl/unx/gtk/window/makefile.mk
index d687c4f4e8da..ac23e9363eef 100644
--- a/vcl/unx/gtk/window/makefile.mk
+++ b/vcl/unx/gtk/window/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 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/headless/makefile.mk b/vcl/unx/headless/makefile.mk
index 3f681cab9323..a32f02838080 100644
--- a/vcl/unx/headless/makefile.mk
+++ b/vcl/unx/headless/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/headless/svpbmp.cxx b/vcl/unx/headless/svpbmp.cxx
index 59c614f30021..7c84c4a7a579 100644
--- a/vcl/unx/headless/svpbmp.cxx
+++ b/vcl/unx/headless/svpbmp.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: svpbmp.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/vcl/unx/headless/svpbmp.hxx b/vcl/unx/headless/svpbmp.hxx
index 0d957e5fac2d..dc775e66aaf1 100644
--- a/vcl/unx/headless/svpbmp.hxx
+++ b/vcl/unx/headless/svpbmp.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: svpbmp.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/vcl/unx/headless/svpdummies.cxx b/vcl/unx/headless/svpdummies.cxx
index 6be230fce38e..5983ff18c34f 100644
--- a/vcl/unx/headless/svpdummies.cxx
+++ b/vcl/unx/headless/svpdummies.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: svpdummies.cxx,v $
- * $Revision: 1.4.154.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/headless/svpdummies.hxx b/vcl/unx/headless/svpdummies.hxx
index 1ad43f6e5a83..febf7eef6bbe 100644
--- a/vcl/unx/headless/svpdummies.hxx
+++ b/vcl/unx/headless/svpdummies.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: svpdummies.hxx,v $
- * $Revision: 1.4.154.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/headless/svpelement.cxx b/vcl/unx/headless/svpelement.cxx
index 93c2e71244ad..4041e2f7739a 100644
--- a/vcl/unx/headless/svpelement.cxx
+++ b/vcl/unx/headless/svpelement.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: svpelement.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/vcl/unx/headless/svpelement.hxx b/vcl/unx/headless/svpelement.hxx
index 052d62597724..0706e75af9fe 100644
--- a/vcl/unx/headless/svpelement.hxx
+++ b/vcl/unx/headless/svpelement.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: svpelement.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/vcl/unx/headless/svpframe.cxx b/vcl/unx/headless/svpframe.cxx
index 04ab08b4cc91..37c5eeb846a4 100644
--- a/vcl/unx/headless/svpframe.cxx
+++ b/vcl/unx/headless/svpframe.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: svpframe.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/vcl/unx/headless/svpframe.hxx b/vcl/unx/headless/svpframe.hxx
index a8f9cd5e097c..de968bbf7a4a 100644
--- a/vcl/unx/headless/svpframe.hxx
+++ b/vcl/unx/headless/svpframe.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: svpframe.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/vcl/unx/headless/svpgdi.cxx b/vcl/unx/headless/svpgdi.cxx
index bd317c883b0b..114bd4c8a5bc 100644
--- a/vcl/unx/headless/svpgdi.cxx
+++ b/vcl/unx/headless/svpgdi.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: svpgdi.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/vcl/unx/headless/svpgdi.hxx b/vcl/unx/headless/svpgdi.hxx
index 1c71704c0031..9e25b67394e7 100644
--- a/vcl/unx/headless/svpgdi.hxx
+++ b/vcl/unx/headless/svpgdi.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: svpgdi.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/vcl/unx/headless/svpinst.cxx b/vcl/unx/headless/svpinst.cxx
index 7b93e59b6acd..485062bf0617 100644
--- a/vcl/unx/headless/svpinst.cxx
+++ b/vcl/unx/headless/svpinst.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: svpinst.cxx,v $
- * $Revision: 1.5.154.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/headless/svpinst.hxx b/vcl/unx/headless/svpinst.hxx
index e77debb53f1d..d37c1c7e126e 100644
--- a/vcl/unx/headless/svpinst.hxx
+++ b/vcl/unx/headless/svpinst.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: svpinst.hxx,v $
- * $Revision: 1.6.116.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/headless/svpprn.cxx b/vcl/unx/headless/svpprn.cxx
index 1882b50e6ad7..5b461bb996ef 100644
--- a/vcl/unx/headless/svpprn.cxx
+++ b/vcl/unx/headless/svpprn.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
  *
@@ -123,6 +123,32 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
             pJobSetup->mnPaperBin = 0xffff;
     }
 
+    // copy duplex
+    pKey = NULL;
+    pValue = NULL;
+
+    pJobSetup->meDuplexMode = DUPLEX_UNKNOWN;
+    if( rData.m_pParser )
+        pKey = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
+    if( pKey )
+        pValue = rData.m_aContext.getValue( pKey );
+    if( pKey && pValue )
+    {
+        if( pValue->m_aOption.EqualsIgnoreCaseAscii( "None" ) ||
+            pValue->m_aOption.EqualsIgnoreCaseAscii( "Simplex", 0, 7 )
+           )
+        {
+            pJobSetup->meDuplexMode = DUPLEX_OFF;
+        }
+        else if( pValue->m_aOption.EqualsIgnoreCaseAscii( "DuplexNoTumble" ) )
+        {
+            pJobSetup->meDuplexMode = DUPLEX_LONGEDGE;
+        }
+        else if( pValue->m_aOption.EqualsIgnoreCaseAscii( "DuplexTumble" ) )
+        {
+            pJobSetup->meDuplexMode = DUPLEX_SHORTEDGE;
+        }
+    }
 
     // copy the whole context
     if( pJobSetup->mpDriverData )
@@ -455,34 +481,6 @@ void PspSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
 
 // -----------------------------------------------------------------------
 
-DuplexMode PspSalInfoPrinter::GetDuplexMode( const ImplJobSetup* pJobSetup )
-{
-    DuplexMode aRet = DUPLEX_UNKNOWN;
-    PrinterInfo aInfo( PrinterInfoManager::get().getPrinterInfo( pJobSetup->maPrinterName ) );
-    if ( pJobSetup->mpDriverData )
-        JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aInfo );
-    if( aInfo.m_pParser )
-    {
-        const PPDKey * pKey = aInfo.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
-        if( pKey )
-        {
-            const PPDValue* pVal = aInfo.m_aContext.getValue( pKey );
-            if( pVal && (
-                pVal->m_aOption.EqualsIgnoreCaseAscii( "None" )          ||
-                pVal->m_aOption.EqualsIgnoreCaseAscii( "Simplex", 0, 7 )
-                ) )
-            {
-                aRet = DUPLEX_OFF;
-            }
-            else
-                aRet = DUPLEX_ON;
-        }
-    }
-    return aRet;
-}
-
-// -----------------------------------------------------------------------
-
 int PspSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* )
 {
     return 900;
@@ -624,6 +622,37 @@ BOOL PspSalInfoPrinter::SetData(
         if( nSetDataFlags & SAL_JOBSET_ORIENTATION )
             aData.m_eOrientation = pJobSetup->meOrientation == ORIENTATION_LANDSCAPE ? orientation::Landscape : orientation::Portrait;
 
+        // merge duplex if necessary
+        if( nSetDataFlags & SAL_JOBSET_DUPLEXMODE )
+        {
+            pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
+            if( pKey )
+            {
+                pValue = NULL;
+                switch( pJobSetup->meDuplexMode )
+                {
+                case DUPLEX_OFF:
+                    pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "None" ) ) );
+                    if( pValue == NULL )
+                        pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "SimplexNoTumble" ) ) );
+                    break;
+                case DUPLEX_SHORTEDGE:
+                    pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "DuplexTumble" ) ) );
+                    break;
+                case DUPLEX_LONGEDGE:
+                    pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "DuplexNoTumble" ) ) );
+                    break;
+                case DUPLEX_UNKNOWN:
+                default:
+                    pValue = 0;
+                    break;
+                }
+                if( ! pValue )
+                    pValue = pKey->getDefaultValue();
+                aData.m_aContext.setValue( pKey, pValue );
+            }
+        }
+
         m_aJobData = aData;
         copyJobDataToJobSetup( pJobSetup, aData );
         return TRUE;
@@ -707,7 +736,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG
         {
             const PPDValue* pValue = pKey->getValue( nPaperBin );
             if( pValue )
-                aRet = pValue->m_aOptionTranslation.Len() ? pValue->m_aOptionTranslation : pValue->m_aOption;
+                aRet = aData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption );
         }
     }
 
@@ -725,9 +754,22 @@ ULONG PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT
         case PRINTER_CAPABILITIES_COPIES:
             return 0xffff;
         case PRINTER_CAPABILITIES_COLLATECOPIES:
-            return 0;
+        {
+            // see if the PPD contains a value to set Collate to True
+            JobData aData;
+            JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
+
+            const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ) ) : NULL;
+            const PPDValue* pVal = pKey ? pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "True" ) ) ) : NULL;
+
+            // PPDs don't mention the number of possible collated copies.
+            // so let's guess as many as we want ?
+            return pVal ? 0xffff : 0;
+        }
         case PRINTER_CAPABILITIES_SETORIENTATION:
             return 1;
+        case PRINTER_CAPABILITIES_SETDUPLEX:
+            return 1;
         case PRINTER_CAPABILITIES_SETPAPERBIN:
             return 1;
         case PRINTER_CAPABILITIES_SETPAPERSIZE:
@@ -777,6 +819,7 @@ PspSalPrinter::PspSalPrinter( SalInfoPrinter* pInfoPrinter )
    m_bSwallowFaxNo( false ),
    m_pGraphics( NULL ),
    m_nCopies( 1 ),
+   m_bCollate( false ),
    m_pInfoPrinter( pInfoPrinter )
 {
 }
@@ -802,7 +845,9 @@ BOOL PspSalPrinter::StartJob(
     const XubString* pFileName,
     const XubString& rJobName,
     const XubString& rAppName,
-    ULONG nCopies, BOOL /*bCollate*/,
+    ULONG nCopies,
+    bool bCollate,
+    bool /*bDirect*/,
     ImplJobSetup* pJobSetup )
 {
     vcl_sal::PrinterUpdate::jobStarted();
@@ -811,13 +856,17 @@ BOOL PspSalPrinter::StartJob(
     m_bPdf      = false;
     m_aFileName = pFileName ? *pFileName : String();
     m_aTmpFile  = String();
-    m_nCopies       = nCopies;
+    m_nCopies   = nCopies;
+    m_bCollate  = bCollate;
 
     JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData );
     if( m_nCopies > 1 )
+    {
         // in case user did not do anything (m_nCopies=1)
         // take the default from jobsetup
         m_aJobData.m_nCopies = m_nCopies;
+        m_aJobData.setCollate( bCollate );
+    }
 
     // check wether this printer is configured as fax
     int nMode = 0;
@@ -917,9 +966,12 @@ SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, BOOL )
     m_pGraphics = new PspGraphics( &m_aJobData, &m_aPrinterGfx, m_bFax ? &m_aFaxNr : NULL, m_bSwallowFaxNo, m_pInfoPrinter  );
     m_pGraphics->SetLayout( 0 );
     if( m_nCopies > 1 )
+    {
         // in case user did not do anything (m_nCopies=1)
         // take the default from jobsetup
         m_aJobData.m_nCopies = m_nCopies;
+        m_aJobData.setCollate( m_nCopies > 1 && m_bCollate );
+    }
 
     m_aPrintJob.StartPage( m_aJobData );
     m_aPrinterGfx.Init( m_aPrintJob );
diff --git a/vcl/unx/headless/svpprn.hxx b/vcl/unx/headless/svpprn.hxx
index c2d85c054fce..0da506076908 100644
--- a/vcl/unx/headless/svpprn.hxx
+++ b/vcl/unx/headless/svpprn.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: svpprn.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -63,7 +60,6 @@ public:
     virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
     virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
-    virtual DuplexMode          GetDuplexMode( const ImplJobSetup* pSetupData );
 };
 
 class PspSalPrinter : public SalPrinter
@@ -80,6 +76,7 @@ public:
     psp::JobData            m_aJobData;
     psp::PrinterGfx         m_aPrinterGfx;
     ULONG                   m_nCopies;
+    bool                    m_bCollate;
     SalInfoPrinter*         m_pInfoPrinter;
 
     PspSalPrinter( SalInfoPrinter* );
@@ -90,7 +87,9 @@ public:
     virtual BOOL                    StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
-                                              ULONG nCopies, BOOL bCollate,
+                                              ULONG nCopies,
+                                              bool bCollate,
+                                              bool bDirect,
                                               ImplJobSetup* pSetupData );
     virtual BOOL                    EndJob();
     virtual BOOL                    AbortJob();
diff --git a/vcl/unx/headless/svppspgraphics.cxx b/vcl/unx/headless/svppspgraphics.cxx
index 1311aaed4ee4..353b10467d40 100644
--- a/vcl/unx/headless/svppspgraphics.cxx
+++ b/vcl/unx/headless/svppspgraphics.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/vcl/unx/headless/svppspgraphics.hxx b/vcl/unx/headless/svppspgraphics.hxx
index 7e5ff051f27b..8addbc3de5f7 100644
--- a/vcl/unx/headless/svppspgraphics.hxx
+++ b/vcl/unx/headless/svppspgraphics.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: svppspgraphics.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/vcl/unx/headless/svptext.cxx b/vcl/unx/headless/svptext.cxx
index eac9e46c2348..ecb8b11b7e04 100644
--- a/vcl/unx/headless/svptext.cxx
+++ b/vcl/unx/headless/svptext.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/vcl/unx/headless/svpvd.cxx b/vcl/unx/headless/svpvd.cxx
index 6220af0b28b8..1c2ab01ccca2 100644
--- a/vcl/unx/headless/svpvd.cxx
+++ b/vcl/unx/headless/svpvd.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: svpvd.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/vcl/unx/headless/svpvd.hxx b/vcl/unx/headless/svpvd.hxx
index 034391403f0b..083547cf19a9 100644
--- a/vcl/unx/headless/svpvd.hxx
+++ b/vcl/unx/headless/svpvd.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: svpvd.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/vcl/unx/inc/XIM.h b/vcl/unx/inc/XIM.h
index 39bcd852746b..b00634090b5d 100644
--- a/vcl/unx/inc/XIM.h
+++ b/vcl/unx/inc/XIM.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: XIM.h,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/vcl/unx/inc/Xproto.h b/vcl/unx/inc/Xproto.h
index 553c32221406..804b3ffa98cc 100644
--- a/vcl/unx/inc/Xproto.h
+++ b/vcl/unx/inc/Xproto.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: Xproto.h,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/vcl/unx/inc/cdeint.hxx b/vcl/unx/inc/cdeint.hxx
index 54710e96d282..91cbf33caf47 100644
--- a/vcl/unx/inc/cdeint.hxx
+++ b/vcl/unx/inc/cdeint.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: cdeint.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/vcl/unx/inc/dtint.hxx b/vcl/unx/inc/dtint.hxx
index e65e41a73af5..75f197c81e13 100644
--- a/vcl/unx/inc/dtint.hxx
+++ b/vcl/unx/inc/dtint.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: dtint.hxx,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/vcl/unx/inc/i18n_cb.hxx b/vcl/unx/inc/i18n_cb.hxx
index 82682de303df..d2301c26a3b0 100644
--- a/vcl/unx/inc/i18n_cb.hxx
+++ b/vcl/unx/inc/i18n_cb.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: i18n_cb.hxx,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/vcl/unx/inc/i18n_ic.hxx b/vcl/unx/inc/i18n_ic.hxx
index 82f3c591667f..2fb97a00b6f2 100644
--- a/vcl/unx/inc/i18n_ic.hxx
+++ b/vcl/unx/inc/i18n_ic.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: i18n_ic.hxx,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/vcl/unx/inc/i18n_im.hxx b/vcl/unx/inc/i18n_im.hxx
index ca8c5a3a25b9..297bc8edec17 100644
--- a/vcl/unx/inc/i18n_im.hxx
+++ b/vcl/unx/inc/i18n_im.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: i18n_im.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/vcl/unx/inc/i18n_keysym.hxx b/vcl/unx/inc/i18n_keysym.hxx
index d61100f3f6a4..641d00dc02c0 100644
--- a/vcl/unx/inc/i18n_keysym.hxx
+++ b/vcl/unx/inc/i18n_keysym.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: i18n_keysym.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/vcl/unx/inc/i18n_status.hxx b/vcl/unx/inc/i18n_status.hxx
index 01960ddd0d53..7202cf6e0eef 100644
--- a/vcl/unx/inc/i18n_status.hxx
+++ b/vcl/unx/inc/i18n_status.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: i18n_status.hxx,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/vcl/unx/inc/i18n_xkb.hxx b/vcl/unx/inc/i18n_xkb.hxx
index 6a13c5dd1fab..db6517cbea0b 100644
--- a/vcl/unx/inc/i18n_xkb.hxx
+++ b/vcl/unx/inc/i18n_xkb.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: i18n_xkb.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/vcl/unx/inc/plugins/gtk/atkbridge.hxx b/vcl/unx/inc/plugins/gtk/atkbridge.hxx
index 5e1cb58d33c7..959b3aec1fb1 100644
--- a/vcl/unx/inc/plugins/gtk/atkbridge.hxx
+++ b/vcl/unx/inc/plugins/gtk/atkbridge.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: atkbridge.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/vcl/unx/inc/plugins/gtk/gtkdata.hxx b/vcl/unx/inc/plugins/gtk/gtkdata.hxx
index da0f95e8623f..d4dec957a6b3 100644
--- a/vcl/unx/inc/plugins/gtk/gtkdata.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkdata.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: gtkdata.hxx,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/vcl/unx/inc/plugins/gtk/gtkframe.hxx b/vcl/unx/inc/plugins/gtk/gtkframe.hxx
index c2a147517ac8..0a91d99fd839 100644
--- a/vcl/unx/inc/plugins/gtk/gtkframe.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkframe.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: gtkframe.hxx,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/vcl/unx/inc/plugins/gtk/gtkgdi.hxx b/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
index 5bc7ab40b98e..9db81aa30a4d 100644
--- a/vcl/unx/inc/plugins/gtk/gtkgdi.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkgdi.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: gtkgdi.hxx,v $
- * $Revision: 1.15.50.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/inc/plugins/gtk/gtkinst.hxx b/vcl/unx/inc/plugins/gtk/gtkinst.hxx
index 16dce4688ede..ee07199cb266 100644
--- a/vcl/unx/inc/plugins/gtk/gtkinst.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkinst.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: gtkinst.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/vcl/unx/inc/plugins/gtk/gtkobject.hxx b/vcl/unx/inc/plugins/gtk/gtkobject.hxx
index cb328fb504bd..ea740249f1c6 100644
--- a/vcl/unx/inc/plugins/gtk/gtkobject.hxx
+++ b/vcl/unx/inc/plugins/gtk/gtkobject.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: gtkobject.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/vcl/unx/inc/plugins/kde/kdedata.hxx b/vcl/unx/inc/plugins/kde/kdedata.hxx
index 04730b39fad2..a55471901283 100644
--- a/vcl/unx/inc/plugins/kde/kdedata.hxx
+++ b/vcl/unx/inc/plugins/kde/kdedata.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: kdedata.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/vcl/unx/inc/pspgraphics.h b/vcl/unx/inc/pspgraphics.h
index 0ccc13291714..4dce4ee8b06c 100644
--- a/vcl/unx/inc/pspgraphics.h
+++ b/vcl/unx/inc/pspgraphics.h
@@ -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/vcl/unx/inc/salbmp.h b/vcl/unx/inc/salbmp.h
index 4b27275d1c66..23e038f30ab1 100644
--- a/vcl/unx/inc/salbmp.h
+++ b/vcl/unx/inc/salbmp.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: salbmp.h,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/vcl/unx/inc/saldata.hxx b/vcl/unx/inc/saldata.hxx
index 2d09bd35649e..3810558d470d 100644
--- a/vcl/unx/inc/saldata.hxx
+++ b/vcl/unx/inc/saldata.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: saldata.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/vcl/unx/inc/saldisp.hxx b/vcl/unx/inc/saldisp.hxx
index 6e520df97f25..368e554794ad 100644
--- a/vcl/unx/inc/saldisp.hxx
+++ b/vcl/unx/inc/saldisp.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: saldisp.hxx,v $
- * $Revision: 1.47.6.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/inc/salfont.h b/vcl/unx/inc/salfont.h
index bb6a5208f28a..b3fbe93137f3 100644
--- a/vcl/unx/inc/salfont.h
+++ b/vcl/unx/inc/salfont.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: salfont.h,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/vcl/unx/inc/salframe.h b/vcl/unx/inc/salframe.h
index 8dad0350a937..6f962c9a13b3 100644
--- a/vcl/unx/inc/salframe.h
+++ b/vcl/unx/inc/salframe.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: salframe.h,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/vcl/unx/inc/salgdi.h b/vcl/unx/inc/salgdi.h
index f893b547e847..09e85c6840b8 100644
--- a/vcl/unx/inc/salgdi.h
+++ b/vcl/unx/inc/salgdi.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: salgdi.h,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/vcl/unx/inc/salinst.h b/vcl/unx/inc/salinst.h
index 399326c44f27..d73d67f81425 100644
--- a/vcl/unx/inc/salinst.h
+++ b/vcl/unx/inc/salinst.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: salinst.h,v $
- * $Revision: 1.17.154.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/inc/salmenu.h b/vcl/unx/inc/salmenu.h
index 0b6ce5092ab3..09a753ff1d98 100644
--- a/vcl/unx/inc/salmenu.h
+++ b/vcl/unx/inc/salmenu.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: salmenu.h,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/vcl/unx/inc/salobj.h b/vcl/unx/inc/salobj.h
index 6f0fb4120bcf..fa9f1309c8ca 100644
--- a/vcl/unx/inc/salobj.h
+++ b/vcl/unx/inc/salobj.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: salobj.h,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/vcl/unx/inc/salprn.h b/vcl/unx/inc/salprn.h
index 452fa5a89387..fa68f1b38e73 100644
--- a/vcl/unx/inc/salprn.h
+++ b/vcl/unx/inc/salprn.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: salprn.h,v $
- * $Revision: 1.18 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -63,7 +60,6 @@ public:
     virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
     virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
-    virtual DuplexMode          GetDuplexMode( const ImplJobSetup* pSetupData );
 };
 
 class PspSalPrinter : public SalPrinter
@@ -80,6 +76,7 @@ public:
     psp::JobData            m_aJobData;
     psp::PrinterGfx         m_aPrinterGfx;
     ULONG                   m_nCopies;
+    bool                    m_bCollate;
     SalInfoPrinter*         m_pInfoPrinter;
 
     PspSalPrinter( SalInfoPrinter* );
@@ -90,7 +87,9 @@ public:
     virtual BOOL                    StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
-                                              ULONG nCopies, BOOL bCollate,
+                                              ULONG nCopies,
+                                              bool bCollate,
+                                              bool bDirect,
                                               ImplJobSetup* pSetupData );
     virtual BOOL                    EndJob();
     virtual BOOL                    AbortJob();
diff --git a/vcl/unx/inc/salstd.hxx b/vcl/unx/inc/salstd.hxx
index dc4f883fa465..cc03b3fb35a4 100644
--- a/vcl/unx/inc/salstd.hxx
+++ b/vcl/unx/inc/salstd.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: salstd.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/vcl/unx/inc/salsys.h b/vcl/unx/inc/salsys.h
index 801217de1f8e..1da7cae8564a 100644
--- a/vcl/unx/inc/salsys.h
+++ b/vcl/unx/inc/salsys.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: salsys.h,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/vcl/unx/inc/saltimer.h b/vcl/unx/inc/saltimer.h
index 483449f79583..132107d705f8 100644
--- a/vcl/unx/inc/saltimer.h
+++ b/vcl/unx/inc/saltimer.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: saltimer.h,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/vcl/unx/inc/salunx.h b/vcl/unx/inc/salunx.h
index c1fee6c68d94..ef53273b60b4 100644
--- a/vcl/unx/inc/salunx.h
+++ b/vcl/unx/inc/salunx.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: salunx.h,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/vcl/unx/inc/salvd.h b/vcl/unx/inc/salvd.h
index ebbac5fd58e2..3d8c681c4e22 100644
--- a/vcl/unx/inc/salvd.h
+++ b/vcl/unx/inc/salvd.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: salvd.h,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/vcl/unx/inc/sm.hxx b/vcl/unx/inc/sm.hxx
index 09d2f5557e1d..b4339bb8567e 100644
--- a/vcl/unx/inc/sm.hxx
+++ b/vcl/unx/inc/sm.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: sm.hxx,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/vcl/unx/inc/soicon.hxx b/vcl/unx/inc/soicon.hxx
index f768ec9675d6..419f9b2cc54a 100644
--- a/vcl/unx/inc/soicon.hxx
+++ b/vcl/unx/inc/soicon.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: soicon.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/vcl/unx/inc/strhelper.hxx b/vcl/unx/inc/strhelper.hxx
index 88b522794540..cd0220b77e05 100644
--- a/vcl/unx/inc/strhelper.hxx
+++ b/vcl/unx/inc/strhelper.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: strhelper.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/vcl/unx/inc/svsys.h b/vcl/unx/inc/svsys.h
index 42860e10fcc3..d4077d0998e9 100644
--- a/vcl/unx/inc/svsys.h
+++ b/vcl/unx/inc/svsys.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: svsys.h,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/vcl/unx/inc/svunx.h b/vcl/unx/inc/svunx.h
index 02572dea9084..e7d6150b79f4 100644
--- a/vcl/unx/inc/svunx.h
+++ b/vcl/unx/inc/svunx.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: svunx.h,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/vcl/unx/inc/wmadaptor.hxx b/vcl/unx/inc/wmadaptor.hxx
index 314854926ba1..c628cfe091ef 100644
--- a/vcl/unx/inc/wmadaptor.hxx
+++ b/vcl/unx/inc/wmadaptor.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: wmadaptor.hxx,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/vcl/unx/inc/xfont.hxx b/vcl/unx/inc/xfont.hxx
index 8b87e268ca08..4041ed7ce67d 100644
--- a/vcl/unx/inc/xfont.hxx
+++ b/vcl/unx/inc/xfont.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: xfont.hxx,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/vcl/unx/kde/kdedata.cxx b/vcl/unx/kde/kdedata.cxx
index 9da57b6e790d..5e2801e47fc6 100644
--- a/vcl/unx/kde/kdedata.cxx
+++ b/vcl/unx/kde/kdedata.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/vcl/unx/kde/makefile.mk b/vcl/unx/kde/makefile.mk
index 04bdb0047a9c..e4e056ee6435 100644
--- a/vcl/unx/kde/makefile.mk
+++ b/vcl/unx/kde/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/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index cd461fc36c8f..ea9161235ac9 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.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: salnativewidgets-kde.cxx,v $
- * $Revision: 1.26.86.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/kde4/KDEData.cxx b/vcl/unx/kde4/KDEData.cxx
index 91e3a758da3c..99871edadae3 100644
--- a/vcl/unx/kde4/KDEData.cxx
+++ b/vcl/unx/kde4/KDEData.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/vcl/unx/kde4/KDEData.hxx b/vcl/unx/kde4/KDEData.hxx
index 68645abc28d3..7cf5836c9688 100644
--- a/vcl/unx/kde4/KDEData.hxx
+++ b/vcl/unx/kde4/KDEData.hxx
@@ -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/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
index 61044c3de71b..d67399528a7c 100644
--- a/vcl/unx/kde4/KDESalDisplay.cxx
+++ b/vcl/unx/kde4/KDESalDisplay.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/vcl/unx/kde4/KDESalDisplay.hxx b/vcl/unx/kde4/KDESalDisplay.hxx
index ce294f45087d..1ab966b1847b 100644
--- a/vcl/unx/kde4/KDESalDisplay.hxx
+++ b/vcl/unx/kde4/KDESalDisplay.hxx
@@ -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/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 6177c4b2896a..0c8f04f9fe41 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.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/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx
index de3a5af189ee..643be72c27f3 100644
--- a/vcl/unx/kde4/KDESalFrame.hxx
+++ b/vcl/unx/kde4/KDESalFrame.hxx
@@ -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/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx
index 1c9882923b43..79de48302649 100644
--- a/vcl/unx/kde4/KDESalGraphics.cxx
+++ b/vcl/unx/kde4/KDESalGraphics.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/vcl/unx/kde4/KDESalGraphics.hxx b/vcl/unx/kde4/KDESalGraphics.hxx
index e598f75be75f..3e9ac44e4981 100644
--- a/vcl/unx/kde4/KDESalGraphics.hxx
+++ b/vcl/unx/kde4/KDESalGraphics.hxx
@@ -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/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx
index b9aab9a0184a..01c4723bd530 100644
--- a/vcl/unx/kde4/KDESalInstance.cxx
+++ b/vcl/unx/kde4/KDESalInstance.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/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 6f0b268cc397..7d050fe6819e 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -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/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
index dedda64d157e..2e5b86b79f9c 100644
--- a/vcl/unx/kde4/KDEXLib.cxx
+++ b/vcl/unx/kde4/KDEXLib.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/vcl/unx/kde4/KDEXLib.hxx b/vcl/unx/kde4/KDEXLib.hxx
index 0380db7212ef..985e0c3c6717 100644
--- a/vcl/unx/kde4/KDEXLib.hxx
+++ b/vcl/unx/kde4/KDEXLib.hxx
@@ -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/vcl/unx/kde4/VCLKDEApplication.cxx b/vcl/unx/kde4/VCLKDEApplication.cxx
index 29adcae6ceff..2cfb071e96ae 100644
--- a/vcl/unx/kde4/VCLKDEApplication.cxx
+++ b/vcl/unx/kde4/VCLKDEApplication.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/vcl/unx/kde4/VCLKDEApplication.hxx b/vcl/unx/kde4/VCLKDEApplication.hxx
index 839b664ea8d2..2edfddd69a9c 100644
--- a/vcl/unx/kde4/VCLKDEApplication.hxx
+++ b/vcl/unx/kde4/VCLKDEApplication.hxx
@@ -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/vcl/unx/kde4/main.cxx b/vcl/unx/kde4/main.cxx
index 798990c06466..962a882af26b 100644
--- a/vcl/unx/kde4/main.cxx
+++ b/vcl/unx/kde4/main.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/vcl/unx/kde4/makefile.mk b/vcl/unx/kde4/makefile.mk
index 48a2dc87c3a6..fd1e9ca59236 100644
--- a/vcl/unx/kde4/makefile.mk
+++ b/vcl/unx/kde4/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/vcl/unx/source/app/i18n_cb.cxx b/vcl/unx/source/app/i18n_cb.cxx
index fd8b3d5af559..d3a4f2b819ae 100644
--- a/vcl/unx/source/app/i18n_cb.cxx
+++ b/vcl/unx/source/app/i18n_cb.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: i18n_cb.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/vcl/unx/source/app/i18n_ic.cxx b/vcl/unx/source/app/i18n_ic.cxx
index bb8f86d93e01..3064be9367e1 100644
--- a/vcl/unx/source/app/i18n_ic.cxx
+++ b/vcl/unx/source/app/i18n_ic.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: i18n_ic.cxx,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/vcl/unx/source/app/i18n_im.cxx b/vcl/unx/source/app/i18n_im.cxx
index 0a48c054167f..9f1ffee3d1c4 100644
--- a/vcl/unx/source/app/i18n_im.cxx
+++ b/vcl/unx/source/app/i18n_im.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: i18n_im.cxx,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/vcl/unx/source/app/i18n_keysym.cxx b/vcl/unx/source/app/i18n_keysym.cxx
index cfdcb3110b2d..812e54aae937 100644
--- a/vcl/unx/source/app/i18n_keysym.cxx
+++ b/vcl/unx/source/app/i18n_keysym.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: i18n_keysym.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/vcl/unx/source/app/i18n_status.cxx b/vcl/unx/source/app/i18n_status.cxx
index cdaa5b1a9cf0..3a6ae26a2b0e 100644
--- a/vcl/unx/source/app/i18n_status.cxx
+++ b/vcl/unx/source/app/i18n_status.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: i18n_status.cxx,v $
- * $Revision: 1.40 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/app/i18n_wrp.cxx b/vcl/unx/source/app/i18n_wrp.cxx
index b3a3ebc8e101..eb48962a24d0 100644
--- a/vcl/unx/source/app/i18n_wrp.cxx
+++ b/vcl/unx/source/app/i18n_wrp.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: i18n_wrp.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/vcl/unx/source/app/i18n_xkb.cxx b/vcl/unx/source/app/i18n_xkb.cxx
index ba78ea65a7cc..e9a787eda667 100644
--- a/vcl/unx/source/app/i18n_xkb.cxx
+++ b/vcl/unx/source/app/i18n_xkb.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: i18n_xkb.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/vcl/unx/source/app/keysymnames.cxx b/vcl/unx/source/app/keysymnames.cxx
index 188f159300b0..cf7f7e082e69 100644
--- a/vcl/unx/source/app/keysymnames.cxx
+++ b/vcl/unx/source/app/keysymnames.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: keysymnames.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/vcl/unx/source/app/makefile.mk b/vcl/unx/source/app/makefile.mk
index a7f790fd67ab..bd7549945c7c 100644
--- a/vcl/unx/source/app/makefile.mk
+++ b/vcl/unx/source/app/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.34 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/app/randrwrapper.cxx b/vcl/unx/source/app/randrwrapper.cxx
index 4fbe5db97ab9..27f9b1d1b77c 100644
--- a/vcl/unx/source/app/randrwrapper.cxx
+++ b/vcl/unx/source/app/randrwrapper.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: randrwrapper.cxx,v $
- *
- * $Revision: 1.5.10.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -288,6 +284,9 @@ void RandRWrapper::releaseWrapper()
 
 #include "saldisp.hxx"
 #include "salframe.h"
+#if OSL_DEBUG_LEVEL > 1
+#include <cstdio>
+#endif
 
 void SalDisplay::InitRandR( XLIB_Window aRoot ) const
 {
diff --git a/vcl/unx/source/app/saldata.cxx b/vcl/unx/source/app/saldata.cxx
index b1f5a113828f..4155887a9875 100644
--- a/vcl/unx/source/app/saldata.cxx
+++ b/vcl/unx/source/app/saldata.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: saldata.cxx,v $
- * $Revision: 1.58.98.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/app/saldisp.cxx b/vcl/unx/source/app/saldisp.cxx
index cfd568ac9b6c..97116626894e 100644
--- a/vcl/unx/source/app/saldisp.cxx
+++ b/vcl/unx/source/app/saldisp.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: saldisp.cxx,v $
- * $Revision: 1.101.30.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -2304,11 +2301,7 @@ long SalX11Display::Dispatch( XEvent *pEvent )
             return 0;
 
     SalInstance* pInstance = GetSalData()->m_pInstance;
-    if( pInstance->GetEventCallback() )
-    {
-        YieldMutexReleaser aReleaser;
-        pInstance->CallEventCallback( pEvent, sizeof( XEvent ) );
-    }
+    pInstance->CallEventCallback( pEvent, sizeof( XEvent ) );
 
     switch( pEvent->type )
     {
diff --git a/vcl/unx/source/app/salinst.cxx b/vcl/unx/source/app/salinst.cxx
index 6b7753960290..8a8db44cefcd 100644
--- a/vcl/unx/source/app/salinst.cxx
+++ b/vcl/unx/source/app/salinst.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: salinst.cxx,v $
- * $Revision: 1.34.154.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/app/salsys.cxx b/vcl/unx/source/app/salsys.cxx
index 55653b095e6e..1ccb214df4ed 100644
--- a/vcl/unx/source/app/salsys.cxx
+++ b/vcl/unx/source/app/salsys.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: salsys.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/vcl/unx/source/app/saltimer.cxx b/vcl/unx/source/app/saltimer.cxx
index afcecc0d0667..431470935d9e 100644
--- a/vcl/unx/source/app/saltimer.cxx
+++ b/vcl/unx/source/app/saltimer.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: saltimer.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/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx
index c5605cec1dfb..dbaa278a780b 100644
--- a/vcl/unx/source/app/sm.cxx
+++ b/vcl/unx/source/app/sm.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: sm.cxx,v $
- * $Revision: 1.33.90.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/app/soicon.cxx b/vcl/unx/source/app/soicon.cxx
index 7251c28891c5..2bf9e55731d1 100644
--- a/vcl/unx/source/app/soicon.cxx
+++ b/vcl/unx/source/app/soicon.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: soicon.cxx,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/vcl/unx/source/app/wmadaptor.cxx b/vcl/unx/source/app/wmadaptor.cxx
index d15433865450..89c8bb56291c 100644
--- a/vcl/unx/source/app/wmadaptor.cxx
+++ b/vcl/unx/source/app/wmadaptor.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: wmadaptor.cxx,v $
- * $Revision: 1.71 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/desktopdetect/desktopdetector.cxx b/vcl/unx/source/desktopdetect/desktopdetector.cxx
index 07fb18fa8344..74ab2e2c3ea2 100644
--- a/vcl/unx/source/desktopdetect/desktopdetector.cxx
+++ b/vcl/unx/source/desktopdetect/desktopdetector.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: salplug.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/vcl/unx/source/desktopdetect/makefile.mk b/vcl/unx/source/desktopdetect/makefile.mk
index cc845ee34887..83d5d29f4b71 100644
--- a/vcl/unx/source/desktopdetect/makefile.mk
+++ b/vcl/unx/source/desktopdetect/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/dtrans/X11_clipboard.cxx b/vcl/unx/source/dtrans/X11_clipboard.cxx
index 0a47076f0d09..a08a9481b8e8 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.cxx
+++ b/vcl/unx/source/dtrans/X11_clipboard.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: X11_clipboard.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/vcl/unx/source/dtrans/X11_clipboard.hxx b/vcl/unx/source/dtrans/X11_clipboard.hxx
index a12064df6cbd..21bf547a9cb7 100644
--- a/vcl/unx/source/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/source/dtrans/X11_clipboard.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: X11_clipboard.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/vcl/unx/source/dtrans/X11_dndcontext.cxx b/vcl/unx/source/dtrans/X11_dndcontext.cxx
index 59832c27c2a7..e6fc3dd8a532 100644
--- a/vcl/unx/source/dtrans/X11_dndcontext.cxx
+++ b/vcl/unx/source/dtrans/X11_dndcontext.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: X11_dndcontext.cxx,v $
- * $Revision: 1.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,8 +39,8 @@ using namespace x11;
  */
 
 DropTargetDropContext::DropTargetDropContext(
-    Window aDropWindow,
-    Time aTimestamp,
+    XLIB_Window aDropWindow,
+    XLIB_Time aTimestamp,
     SelectionManager& rManager ) :
         m_aDropWindow( aDropWindow ),
         m_nTimestamp( aTimestamp ),
@@ -77,8 +74,8 @@ void DropTargetDropContext::dropComplete( sal_Bool success ) throw()
  */
 
 DropTargetDragContext::DropTargetDragContext(
-    Window aDropWindow,
-    Time aTimestamp,
+    XLIB_Window aDropWindow,
+    XLIB_Time aTimestamp,
     SelectionManager& rManager ) :
         m_aDropWindow( aDropWindow ),
         m_nTimestamp( aTimestamp ),
@@ -106,8 +103,8 @@ void DropTargetDragContext::rejectDrag() throw()
  */
 
 DragSourceContext::DragSourceContext(
-    Window aDropWindow,
-    Time aTimestamp,
+    XLIB_Window aDropWindow,
+    XLIB_Time aTimestamp,
     SelectionManager& rManager ) :
         m_aDropWindow( aDropWindow ),
         m_nTimestamp( aTimestamp ),
diff --git a/vcl/unx/source/dtrans/X11_dndcontext.hxx b/vcl/unx/source/dtrans/X11_dndcontext.hxx
index f2ecb7b0841b..9b48d346f03b 100644
--- a/vcl/unx/source/dtrans/X11_dndcontext.hxx
+++ b/vcl/unx/source/dtrans/X11_dndcontext.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: X11_dndcontext.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,7 +33,9 @@
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
 #include <cppuhelper/implbase1.hxx>
 
+#include "tools/prex.h"
 #include <X11/Xlib.h>
+#include "tools/postx.h"
 
 using namespace com::sun::star::uno;
 
@@ -49,12 +48,12 @@ namespace x11 {
     ::com::sun::star::datatransfer::dnd::XDropTargetDropContext
     >
     {
-        Window                      m_aDropWindow;
-        Time                        m_nTimestamp;
+        XLIB_Window                 m_aDropWindow;
+        XLIB_Time                   m_nTimestamp;
         SelectionManager&           m_rManager;
         Reference< XInterface >     m_xManagerRef;
     public:
-        DropTargetDropContext( Window, Time, SelectionManager& );
+        DropTargetDropContext( XLIB_Window, XLIB_Time, SelectionManager& );
         virtual ~DropTargetDropContext();
 
         // XDropTargetDropContext
@@ -68,12 +67,12 @@ namespace x11 {
     ::com::sun::star::datatransfer::dnd::XDropTargetDragContext
     >
     {
-        Window                      m_aDropWindow;
-        Time                        m_nTimestamp;
+        XLIB_Window                 m_aDropWindow;
+        XLIB_Time                   m_nTimestamp;
         SelectionManager&           m_rManager;
         Reference< XInterface >     m_xManagerRef;
     public:
-        DropTargetDragContext( Window, Time, SelectionManager& );
+        DropTargetDragContext( XLIB_Window, XLIB_Time, SelectionManager& );
         virtual ~DropTargetDragContext();
 
         // XDropTargetDragContext
@@ -86,12 +85,12 @@ namespace x11 {
     ::com::sun::star::datatransfer::dnd::XDragSourceContext
     >
     {
-        Window                      m_aDropWindow;
-        Time                        m_nTimestamp;
+        XLIB_Window                 m_aDropWindow;
+        XLIB_Time                   m_nTimestamp;
         SelectionManager&           m_rManager;
         Reference< XInterface >     m_xManagerRef;
     public:
-        DragSourceContext( Window, Time, SelectionManager& );
+        DragSourceContext( XLIB_Window, XLIB_Time, SelectionManager& );
         virtual ~DragSourceContext();
 
         // XDragSourceContext
diff --git a/vcl/unx/source/dtrans/X11_droptarget.cxx b/vcl/unx/source/dtrans/X11_droptarget.cxx
index 153514c668a0..5db23329abd8 100644
--- a/vcl/unx/source/dtrans/X11_droptarget.cxx
+++ b/vcl/unx/source/dtrans/X11_droptarget.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: X11_droptarget.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/vcl/unx/source/dtrans/X11_selection.cxx b/vcl/unx/source/dtrans/X11_selection.cxx
index c6036ae4f78e..2d63489dac3d 100644
--- a/vcl/unx/source/dtrans/X11_selection.cxx
+++ b/vcl/unx/source/dtrans/X11_selection.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: X11_selection.cxx,v $
- * $Revision: 1.85 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -35,11 +32,13 @@
 #include <stdio.h>
 #include <string.h>
 #include <sys/time.h>
+#include "tools/prex.h"
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/X.h>
 #include <X11/Xutil.h>
+#include "tools/postx.h"
 #if defined(LINUX) || defined(NETBSD) || defined (FREEBSD)
 #include <sys/poll.h>
 #else
@@ -53,6 +52,8 @@
 #include <X11_dndcontext.hxx>
 #include <bmp.hxx>
 
+#include "vcl/svapp.hxx"
+
 // pointer bitmaps
 #include <copydata_curs.h>
 #include <copydata_mask.h>
@@ -66,9 +67,9 @@
 #include <com/sun/star/awt/MouseEvent.hpp>
 #include <com/sun/star/awt/MouseButton.hpp>
 #include <rtl/tencinfo.h>
-#ifndef OSL_PROCESS_H
 #include <osl/process.h>
-#endif
+
+#include <comphelper/processfactory.hxx>
 
 #define DRAG_EVENT_MASK ButtonPressMask         |\
                               ButtonReleaseMask     |\
@@ -81,6 +82,7 @@ using namespace com::sun::star::datatransfer::dnd;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::awt;
 using namespace com::sun::star::uno;
+using namespace com::sun::star::frame;
 using namespace cppu;
 using namespace osl;
 using namespace rtl;
@@ -280,7 +282,7 @@ SelectionManager::SelectionManager() :
     m_aDragRunning.reset();
 }
 
-Cursor SelectionManager::createCursor( const char* pPointerData, const char* pMaskData, int width, int height, int hotX, int hotY )
+XLIB_Cursor SelectionManager::createCursor( const char* pPointerData, const char* pMaskData, int width, int height, int hotX, int hotY )
 {
     Pixmap aPointer;
     Pixmap aMask;
@@ -306,7 +308,7 @@ Cursor SelectionManager::createCursor( const char* pPointerData, const char* pMa
                                  pMaskData,
                                  width,
                                  height );
-    Cursor aCursor =
+    XLIB_Cursor aCursor =
         XCreatePixmapCursor( m_pDisplay, aPointer, aMask,
                              &aBlack, &aWhite,
                              hotX,
@@ -928,7 +930,7 @@ bool SelectionManager::getPasteData( Atom selection, Atom type, Sequence< sal_In
     if( it == m_aSelections.end() )
         return false;
 
-    Window aSelectionOwner = XGetSelectionOwner( m_pDisplay, selection );
+    XLIB_Window aSelectionOwner = XGetSelectionOwner( m_pDisplay, selection );
     if( aSelectionOwner == None )
         return false;
     if( aSelectionOwner == m_aWindow )
@@ -1480,7 +1482,7 @@ static sal_Size GetTrueFormatSize(int nFormat)
 }
 
 bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
-                                 Window requestor,
+                                 XLIB_Window requestor,
                                  Atom target,
                                  Atom property,
                                  Atom selection )
@@ -1587,7 +1589,7 @@ bool SelectionManager::sendData( SelectionAdaptor* pAdaptor,
         {
 #if OSL_DEBUG_LEVEL > 1
             fprintf( stderr, "using INCR protocol\n" );
-            std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor );
+            std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > >::const_iterator win_it = m_aIncrementals.find( requestor );
             if( win_it != m_aIncrementals.end() )
             {
                 std::hash_map< Atom, IncrementalTransfer >::const_iterator inc_it = win_it->second.find( property );
@@ -1986,7 +1988,7 @@ bool SelectionManager::handleSendPropertyNotify( XPropertyEvent& rNotify )
     // feed incrementals
     if( rNotify.state == PropertyDelete )
     {
-        std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >::iterator it;
+        std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > >::iterator it;
         it = m_aIncrementals.find( rNotify.window );
         if( it != m_aIncrementals.end() )
         {
@@ -2168,12 +2170,12 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
     ResettableMutexGuard aGuard(m_aMutex);
 
     // handle drop related events
-    Window aSource = rMessage.data.l[0];
-    Window aTarget = rMessage.window;
+    XLIB_Window aSource = rMessage.data.l[0];
+    XLIB_Window aTarget = rMessage.window;
 
     bool bHandled = false;
 
-    ::std::hash_map< Window, DropTargetEntry >::iterator it =
+    ::std::hash_map< XLIB_Window, DropTargetEntry >::iterator it =
           m_aDropTargets.find( aTarget );
 
 #if OSL_DEBUG_LEVEL > 1
@@ -2187,7 +2189,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
             fprintf( stderr, "but no target found\n" );
         else if( ! it->second.m_pTarget->m_bActive )
             fprintf( stderr, "but target is inactive\n" );
-        else if( m_aDropEnterEvent.data.l[0] != None && (Window)m_aDropEnterEvent.data.l[0] != aSource )
+        else if( m_aDropEnterEvent.data.l[0] != None && (XLIB_Window)m_aDropEnterEvent.data.l[0] != aSource )
             fprintf( stderr, "but source 0x%lx is unknown (expected 0x%lx or 0)\n", aSource, m_aDropEnterEvent.data.l[0] );
         else
             fprintf( stderr, "processing.\n" );
@@ -2208,7 +2210,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
 
     if( it != m_aDropTargets.end() &&
         it->second.m_pTarget->m_bActive &&
-        ( m_aDropEnterEvent.data.l[0] == None || Window(m_aDropEnterEvent.data.l[0]) == aSource )
+       ( m_aDropEnterEvent.data.l[0] == None || XLIB_Window(m_aDropEnterEvent.data.l[0]) == aSource )
         )
     {
         if( rMessage.message_type == m_nXdndEnter )
@@ -2224,7 +2226,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
         }
         else if(
                 rMessage.message_type == m_nXdndPosition &&
-                aSource == Window(m_aDropEnterEvent.data.l[0])
+                aSource == XLIB_Window(m_aDropEnterEvent.data.l[0])
                 )
         {
             bHandled = true;
@@ -2232,7 +2234,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
             if( ! m_bDropEnterSent )
                 m_nDropTimestamp = m_nDropTime;
 
-            Window aChild;
+            XLIB_Window aChild;
             XTranslateCoordinates( m_pDisplay,
                                    it->second.m_aRootWindow,
                                    it->first,
@@ -2280,7 +2282,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
         }
         else if(
                 rMessage.message_type == m_nXdndLeave  &&
-                aSource == Window(m_aDropEnterEvent.data.l[0])
+                aSource == XLIB_Window(m_aDropEnterEvent.data.l[0])
                 )
         {
             bHandled = true;
@@ -2298,7 +2300,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
         }
         else if(
                 rMessage.message_type == m_nXdndDrop &&
-                aSource == Window(m_aDropEnterEvent.data.l[0])
+                aSource == XLIB_Window(m_aDropEnterEvent.data.l[0])
                 )
         {
             bHandled = true;
@@ -2345,7 +2347,7 @@ bool SelectionManager::handleDropEvent( XClientMessageEvent& rMessage )
  *  methods for XDropTargetDropContext
  */
 
-void SelectionManager::dropComplete( sal_Bool bSuccess, Window aDropWindow, Time )
+void SelectionManager::dropComplete( sal_Bool bSuccess, XLIB_Window aDropWindow, XLIB_Time )
 {
     ClearableMutexGuard aGuard(m_aMutex);
 
@@ -2542,21 +2544,21 @@ bool SelectionManager::updateDragAction( int modifierState )
 
 // ------------------------------------------------------------------------
 
-void SelectionManager::sendDropPosition( bool bForce, Time eventTime )
+void SelectionManager::sendDropPosition( bool bForce, XLIB_Time eventTime )
 {
     ClearableMutexGuard aGuard(m_aMutex);
 
     if( m_bDropSent )
         return;
 
-    ::std::hash_map< Window, DropTargetEntry >::const_iterator it =
+    ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it =
           m_aDropTargets.find( m_aDropWindow );
     if( it != m_aDropTargets.end() )
     {
         if( it->second.m_pTarget->m_bActive )
         {
             int x, y;
-            Window aChild;
+            XLIB_Window aChild;
             XTranslateCoordinates( m_pDisplay, it->second.m_aRootWindow, m_aDropWindow, m_nLastDragX, m_nLastDragY, &x, &y, &aChild );
             DropTargetDragEvent dtde;
             dtde.Source         = static_cast< OWeakObject* >(it->second.m_pTarget );
@@ -2612,7 +2614,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
     bool bHandled = false;
 
     // for shortcut
-    ::std::hash_map< Window, DropTargetEntry >::const_iterator it =
+    ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it =
           m_aDropTargets.find( m_aDropWindow );
 #if OSL_DEBUG_LEVEL > 1
     switch( rMessage.type )
@@ -2635,7 +2637,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
         case ButtonRelease:
             fprintf( stderr, "handleDragEvent: ButtonRelease %d (m_nDragButton = %d)\n", rMessage.xbutton.button, m_nDragButton );
             break;
-        case KeyPress:
+        case XLIB_KeyPress:
             fprintf( stderr, "handleDragEvent: KeyPress\n" );
             break;
         case KeyRelease:
@@ -2719,7 +2721,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
         bool bForce = false;
         int root_x  = rMessage.type == MotionNotify ? rMessage.xmotion.x_root : rMessage.xcrossing.x_root;
         int root_y  = rMessage.type == MotionNotify ? rMessage.xmotion.y_root : rMessage.xcrossing.y_root;
-        Window root = rMessage.type == MotionNotify ? rMessage.xmotion.root : rMessage.xcrossing.root;
+        XLIB_Window root = rMessage.type == MotionNotify ? rMessage.xmotion.root : rMessage.xcrossing.root;
         m_nDragTimestamp = rMessage.type == MotionNotify ? rMessage.xmotion.time : rMessage.xcrossing.time;
 
         aGuard.clear();
@@ -2736,7 +2738,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
             sendDropPosition( bForce, rMessage.type == MotionNotify ? rMessage.xmotion.time : rMessage.xcrossing.time );
         }
     }
-    else if( rMessage.type == KeyPress || rMessage.type == KeyRelease )
+    else if( rMessage.type == XLIB_KeyPress || rMessage.type == KeyRelease )
     {
         bHandled = true;
         KeySym aKey = XKeycodeToKeysym( m_pDisplay, rMessage.xkey.keycode, 0 );
@@ -2793,7 +2795,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
                 case XK_Control_L: nNewState = ControlMask;break;
                     // just interested in shift and ctrl for dnd
             }
-            if( rMessage.type == KeyPress )
+            if( rMessage.type == XLIB_KeyPress )
                 nState |= nNewState;
             else
                 nState &= ~nNewState;
@@ -2815,7 +2817,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
                 {
                     bHandled = true;
                     int x, y;
-                    Window aChild;
+                    XLIB_Window aChild;
                     XTranslateCoordinates( m_pDisplay, rMessage.xbutton.root, m_aDropWindow, rMessage.xbutton.x_root, rMessage.xbutton.y_root, &x, &y, &aChild );
                     DropTargetDropEvent dtde;
                     dtde.Source         = static_cast< OWeakObject* >(it->second.m_pTarget );
@@ -2865,7 +2867,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
                 {
                     bHandled = true;
 
-                    Window aDummy;
+                    XLIB_Window aDummy;
                     XEvent aEvent;
                     aEvent.type = ButtonPress;
                     aEvent.xbutton.display      = m_pDisplay;
@@ -2924,7 +2926,7 @@ bool SelectionManager::handleDragEvent( XEvent& rMessage )
 
 // ------------------------------------------------------------------------
 
-void SelectionManager::accept( sal_Int8 dragOperation, Window aDropWindow, Time )
+void SelectionManager::accept( sal_Int8 dragOperation, XLIB_Window aDropWindow, XLIB_Time )
 {
     if( aDropWindow == m_aCurrentDropWindow )
     {
@@ -2946,7 +2948,7 @@ void SelectionManager::accept( sal_Int8 dragOperation, Window aDropWindow, Time
 
 // ------------------------------------------------------------------------
 
-void SelectionManager::reject( Window aDropWindow, Time )
+void SelectionManager::reject( XLIB_Window aDropWindow, XLIB_Time )
 {
     if( aDropWindow == m_aCurrentDropWindow )
     {
@@ -2982,7 +2984,7 @@ sal_Bool SelectionManager::isDragImageSupported() throw()
 
 sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw()
 {
-    Cursor aCursor = m_aNoneCursor;
+    XLIB_Cursor aCursor = m_aNoneCursor;
     if( dragAction & DNDConstants::ACTION_MOVE )
         aCursor = m_aMoveCursor;
     else if( dragAction & DNDConstants::ACTION_COPY )
@@ -2994,7 +2996,7 @@ sal_Int32 SelectionManager::getDefaultCursor( sal_Int8 dragAction ) throw()
 
 // ------------------------------------------------------------------------
 
-int SelectionManager::getXdndVersion( Window aWindow, Window& rProxy )
+int SelectionManager::getXdndVersion( XLIB_Window aWindow, XLIB_Window& rProxy )
 {
     Atom* pProperties = NULL;
     int nProperties = 0;
@@ -3022,7 +3024,7 @@ int SelectionManager::getXdndVersion( Window aWindow, Window& rProxy )
             if( pBytes )
             {
                 if( nType == XA_WINDOW )
-                    rProxy = *(Window*)pBytes;
+                    rProxy = *(XLIB_Window*)pBytes;
                 XFree( pBytes );
                 pBytes = NULL;
                 if( rProxy != None )
@@ -3032,7 +3034,7 @@ int SelectionManager::getXdndVersion( Window aWindow, Window& rProxy )
                                         &nType, &nFormat, &nItems, &nBytes, &pBytes );
                     if( pBytes )
                     {
-                        if( nType == XA_WINDOW && *(Window*)pBytes != rProxy )
+                        if( nType == XA_WINDOW && *(XLIB_Window*)pBytes != rProxy )
                             rProxy = None;
                         XFree( pBytes );
                         pBytes = NULL;
@@ -3044,7 +3046,7 @@ int SelectionManager::getXdndVersion( Window aWindow, Window& rProxy )
             break;
         }
     }
-    Window aAwareWindow = rProxy != None ? rProxy : aWindow;
+    XLIB_Window aAwareWindow = rProxy != None ? rProxy : aWindow;
 
     XGetWindowProperty( m_pDisplay, aAwareWindow, m_nXdndAware, 0, 1, False, XA_ATOM,
                         &nType, &nFormat, &nItems, &nBytes, &pBytes );
@@ -3062,7 +3064,7 @@ int SelectionManager::getXdndVersion( Window aWindow, Window& rProxy )
 
 // ------------------------------------------------------------------------
 
-void SelectionManager::updateDragWindow( int nX, int nY, Window aRoot )
+void SelectionManager::updateDragWindow( int nX, int nY, XLIB_Window aRoot )
 {
     ResettableMutexGuard aGuard( m_aMutex );
 
@@ -3071,9 +3073,9 @@ void SelectionManager::updateDragWindow( int nX, int nY, Window aRoot )
     m_nLastDragX = nX;
     m_nLastDragY = nY;
 
-    Window aParent = aRoot;
-    Window aChild;
-    Window aNewProxy = None, aNewCurrentWindow = None;
+    XLIB_Window aParent = aRoot;
+    XLIB_Window aChild;
+    XLIB_Window aNewProxy = None, aNewCurrentWindow = None;
     int nNewProtocolVersion = -1;
     int nWinX, nWinY;
 
@@ -3114,7 +3116,7 @@ void SelectionManager::updateDragWindow( int nX, int nY, Window aRoot )
     dsde.DropAction         = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
     dsde.UserAction         = nNewProtocolVersion >= 0 ? m_nUserDragAction : DNDConstants::ACTION_COPY;
 
-    ::std::hash_map< Window, DropTargetEntry >::const_iterator it;
+    ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it;
     if( aNewCurrentWindow != m_aDropWindow )
     {
 #if OSL_DEBUG_LEVEL > 1
@@ -3263,11 +3265,11 @@ void SelectionManager::startDrag(
         // the pointer is located in. since said window should be one
         // of our DropTargets at the time of executeDrag we can use
         // them for a start
-        Window aRoot, aParent, aChild;
+        XLIB_Window aRoot, aParent, aChild;
         int root_x, root_y, win_x, win_y;
         unsigned int mask;
 
-        ::std::hash_map< Window, DropTargetEntry >::const_iterator it;
+        ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it;
         it = m_aDropTargets.begin();
         while( it != m_aDropTargets.end() )
         {
@@ -3379,10 +3381,9 @@ void SelectionManager::startDrag(
         m_bDropSuccess                  = false;
         m_bWaitingForPrimaryConversion  = false;
         m_nDragButton                   = Button1; // default to left button
-        if( trigger.Event.getValueTypeName().equalsAsciiL( "com.sun.star.awt.MouseEvent", 27 ) )
+        com::sun::star::awt::MouseEvent aEvent;
+        if( trigger.Event >>= aEvent )
         {
-            MouseEvent aEvent;
-            trigger.Event >>= aEvent;
             if( aEvent.Buttons & MouseButton::LEFT )
                 m_nDragButton = Button1;
             else if( aEvent.Buttons & MouseButton::RIGHT )
@@ -3519,10 +3520,10 @@ sal_Int32 SelectionManager::getCurrentCursor()
 
 // ------------------------------------------------------------------------
 
-void SelectionManager::setCursor( sal_Int32 cursor, Window aDropWindow, Time )
+void SelectionManager::setCursor( sal_Int32 cursor, XLIB_Window aDropWindow, XLIB_Time )
 {
     MutexGuard aGuard( m_aMutex );
-    if( aDropWindow == m_aDropWindow && Cursor(cursor) != m_aCurrentCursor )
+    if( aDropWindow == m_aDropWindow && XLIB_Cursor(cursor) != m_aCurrentCursor )
     {
         if( m_xDragSourceListener.is() && ! m_bDropSent )
         {
@@ -3535,7 +3536,7 @@ void SelectionManager::setCursor( sal_Int32 cursor, Window aDropWindow, Time )
 
 // ------------------------------------------------------------------------
 
-void SelectionManager::setImage( sal_Int32, Window, Time )
+void SelectionManager::setImage( sal_Int32, XLIB_Window, XLIB_Time )
 {
 }
 
@@ -3668,7 +3669,7 @@ bool SelectionManager::handleXEvent( XEvent& rEvent )
         case MotionNotify:
         case ButtonPress:
         case ButtonRelease:
-        case KeyPress:
+        case XLIB_KeyPress:
         case KeyRelease:
             bHandled = handleDragEvent( rEvent );
             break;
@@ -3734,6 +3735,14 @@ void SelectionManager::run( void* pThis )
     timeval aLast;
     gettimeofday( &aLast, 0 );
 
+    Reference< XMultiServiceFactory > xFact( ::comphelper::getProcessServiceFactory() );
+    if( xFact.is() )
+    {
+        Reference< XDesktop > xDesktop( xFact->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ), UNO_QUERY );
+        if( xDesktop.is() )
+            xDesktop->addTerminateListener(This);
+    }
+
     while( osl_scheduleThread(This->m_aThread) )
     {
         This->dispatchEvent( 1000 );
@@ -3750,7 +3759,7 @@ void SelectionManager::run( void* pThis )
             {
                 if( it->first != This->m_nXdndSelection && ! it->second->m_bOwner )
                 {
-                    Window aOwner = XGetSelectionOwner( This->m_pDisplay, it->first );
+                    XLIB_Window aOwner = XGetSelectionOwner( This->m_pDisplay, it->first );
                     if( aOwner != it->second->m_aLastOwner )
                     {
                         it->second->m_aLastOwner = aOwner;
@@ -3774,6 +3783,40 @@ void SelectionManager::run( void* pThis )
 #endif
 }
 
+void SelectionManager::shutdown() throw()
+{
+    ResettableMutexGuard aGuard(m_aMutex);
+    // stop dispatching
+    if( m_aThread )
+    {
+        osl_terminateThread( m_aThread );
+        /*
+         * Allow thread to finish before app exits to avoid pulling the carpet
+         * out from under it if pasting is occuring during shutdown
+         *
+         * a) allow it to have the Mutex and
+         * b) reschedule to allow it to complete callbacks to any
+         * Application::GetSolarMutex protected regions, etc. e.g.
+         * TransferableHelper::getTransferDataFlavors (via
+         * SelectionManager::handleSelectionRequest) which it might
+         * currently be trying to enter.
+         *
+         * Otherwise the thread may be left still waiting on a GlobalMutex
+         * when that gets destroyed, letting the thread blow up and die
+         * when enters the section in a now dead OOo instance.
+         */
+        aGuard.clear();
+        while (osl_isThreadRunning(m_aThread))
+            Application::Reschedule();
+        osl_joinWithThread( m_aThread );
+        osl_destroyThread( m_aThread );
+        m_aThread = NULL;
+        aGuard.reset();
+    }
+    m_xDisplayConnection->removeEventHandler( Any(), this );
+    m_xDisplayConnection.clear();
+}
+
 // ------------------------------------------------------------------------
 
 sal_Bool SelectionManager::handleEvent( const Any& event ) throw()
@@ -3782,10 +3825,10 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw()
     if( (event >>= aSeq) )
     {
         XEvent* pEvent = (XEvent*)aSeq.getArray();
-        Time nTimestamp = CurrentTime;
+        XLIB_Time nTimestamp = CurrentTime;
         if( pEvent->type == ButtonPress || pEvent->type == ButtonRelease )
             nTimestamp = pEvent->xbutton.time;
-        else if( pEvent->type == KeyPress || pEvent->type == KeyRelease )
+        else if( pEvent->type == XLIB_KeyPress || pEvent->type == KeyRelease )
             nTimestamp = pEvent->xkey.time;
         else if( pEvent->type == MotionNotify )
             nTimestamp = pEvent->xmotion.time;
@@ -3806,16 +3849,38 @@ sal_Bool SelectionManager::handleEvent( const Any& event ) throw()
         #if OSL_DEBUG_LEVEL > 1
         fprintf( stderr, "SelectionManager got downing event\n" );
         #endif
-        MutexGuard aGuard(m_aMutex);
-        // stop dispatching
-        if( m_aThread )
-            osl_terminateThread( m_aThread );
-        m_xDisplayConnection->removeEventHandler( Any(), this );
-        m_xDisplayConnection.clear();
+        shutdown();
     }
     return sal_True;
 }
 
+void SAL_CALL SelectionManager::disposing( const ::com::sun::star::lang::EventObject& )
+    throw( ::com::sun::star::uno::RuntimeException )
+{
+}
+
+void SAL_CALL SelectionManager::queryTermination( const ::com::sun::star::lang::EventObject& )
+    throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException )
+{
+}
+
+/*
+ * To be safe, shutdown needs to be called before the ~SfxApplication is called, waiting until
+ * the downing event can be too late if paste are requested during shutdown and ~SfxApplication
+ * has been called before vcl is shutdown
+ */
+void SAL_CALL SelectionManager::notifyTermination( const ::com::sun::star::lang::EventObject& rEvent )
+    throw( ::com::sun::star::uno::RuntimeException )
+{
+    Reference< XDesktop > xDesktop( rEvent.Source, UNO_QUERY );
+    if( xDesktop.is() == sal_True )
+        xDesktop->removeTerminateListener( this );
+    #if OSL_DEBUG_LEVEL > 1
+    fprintf( stderr, "SelectionManager got app termination event\n" );
+    #endif
+    shutdown();
+}
+
 // ------------------------------------------------------------------------
 
 void SelectionManager::registerHandler( Atom selection, SelectionAdaptor& rAdaptor )
@@ -3846,12 +3911,12 @@ void SelectionManager::deregisterHandler( Atom selection )
 
 // ------------------------------------------------------------------------
 
-void SelectionManager::registerDropTarget( Window aWindow, DropTarget* pTarget )
+void SelectionManager::registerDropTarget( XLIB_Window aWindow, DropTarget* pTarget )
 {
     MutexGuard aGuard(m_aMutex);
 
     // sanity check
-    ::std::hash_map< Window, DropTargetEntry >::const_iterator it =
+    ::std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it =
           m_aDropTargets.find( aWindow );
     if( it != m_aDropTargets.end() )
         OSL_ASSERT( "attempt to register window as drop target twice" );
@@ -3877,7 +3942,7 @@ void SelectionManager::registerDropTarget( Window aWindow, DropTarget* pTarget )
 
 // ------------------------------------------------------------------------
 
-void SelectionManager::deregisterDropTarget( Window aWindow )
+void SelectionManager::deregisterDropTarget( XLIB_Window aWindow )
 {
     ClearableMutexGuard aGuard(m_aMutex);
 
@@ -3885,7 +3950,7 @@ void SelectionManager::deregisterDropTarget( Window aWindow )
     if( aWindow == m_aDragSourceWindow && m_aDragRunning.check() )
     {
         // abort drag
-        std::hash_map< Window, DropTargetEntry >::const_iterator it =
+        std::hash_map< XLIB_Window, DropTargetEntry >::const_iterator it =
             m_aDropTargets.find( m_aDropWindow );
         if( it != m_aDropTargets.end() )
         {
diff --git a/vcl/unx/source/dtrans/X11_selection.hxx b/vcl/unx/source/dtrans/X11_selection.hxx
index dc6c41247bbd..47baa1776d1a 100644
--- a/vcl/unx/source/dtrans/X11_selection.hxx
+++ b/vcl/unx/source/dtrans/X11_selection.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: X11_selection.hxx,v $
- * $Revision: 1.37 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -32,6 +29,7 @@
 #define _DTRANS_X11_SELECTION_HXX_
 
 #include <cppuhelper/compbase3.hxx>
+#include <cppuhelper/compbase4.hxx>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
@@ -39,6 +37,7 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/script/XInvocation.hpp>
+#include <com/sun/star/frame/XDesktop.hpp>
 #include <osl/thread.h>
 
 #ifndef _OSL_CONDITION_HXX_
@@ -48,7 +47,9 @@
 #include <hash_map>
 #include <list>
 
+#include "tools/prex.h"
 #include <X11/Xlib.h>
+#include "tools/postx.h"
 
 #define XDND_IMPLEMENTATION_NAME "com.sun.star.datatransfer.dnd.XdndSupport"
 #define XDND_DROPTARGET_IMPLEMENTATION_NAME "com.sun.star.datatransfer.dnd.XdndDropTarget"
@@ -84,7 +85,7 @@ namespace x11 {
         ::osl::Mutex                m_aMutex;
         bool                        m_bActive;
         sal_Int8                    m_nDefaultActions;
-        Window                      m_aTargetWindow;
+        XLIB_Window                 m_aTargetWindow;
         class SelectionManager*     m_pSelectionManager;
         Reference< ::com::sun::star::datatransfer::dnd::XDragSource >
                                     m_xSelectionManager;
@@ -155,10 +156,11 @@ namespace x11 {
 
 
     class SelectionManager :
-        public ::cppu::WeakImplHelper3<
+        public ::cppu::WeakImplHelper4<
             ::com::sun::star::datatransfer::dnd::XDragSource,
             ::com::sun::star::lang::XInitialization,
-            ::com::sun::star::awt::XEventHandler
+            ::com::sun::star::awt::XEventHandler,
+            ::com::sun::star::frame::XTerminateListener
         >,
         public SelectionAdaptor
     {
@@ -175,7 +177,7 @@ namespace x11 {
         {
             Sequence< sal_Int8 >            m_aData;
             int                             m_nBufferPos;
-            Window                          m_aRequestor;
+            XLIB_Window                         m_aRequestor;
             Atom                            m_aProperty;
             Atom                            m_aTarget;
             int                             m_nFormat;
@@ -209,11 +211,11 @@ namespace x11 {
             Atom                        m_aUTF8Type;
             bool                        m_bHaveCompound;
             bool                        m_bOwner;
-            Window                      m_aLastOwner;
+            XLIB_Window                 m_aLastOwner;
             PixmapHolder*               m_pPixmap;
-            // m_nOrigTimestamp contains the timestamp at which the seclection
-            // was acquired; needed for TIMESTAMP target
-            Time                        m_nOrigTimestamp;
+            // m_nOrigXLIB_Timestamp contains the XLIB_Timestamp at which the seclection
+            // was acquired; needed for XLIB_TimeSTAMP target
+            XLIB_Time                        m_nOrigTimestamp;
 
             Selection() : m_eState( Inactive ),
                           m_pAdaptor( NULL ),
@@ -234,7 +236,7 @@ namespace x11 {
         struct DropTargetEntry
         {
             DropTarget*     m_pTarget;
-            Window          m_aRootWindow;
+            XLIB_Window     m_aRootWindow;
 
             DropTargetEntry() : m_pTarget( NULL ), m_aRootWindow( None ) {}
             DropTargetEntry( DropTarget* pTarget ) :
@@ -257,13 +259,13 @@ namespace x11 {
         oslThread                   m_aThread;
         oslThread                   m_aDragExecuteThread;
         ::osl::Condition            m_aDragRunning;
-        Window                      m_aWindow;
+        XLIB_Window                 m_aWindow;
         Reference< ::com::sun::star::awt::XDisplayConnection >
                                     m_xDisplayConnection;
         Reference< com::sun::star::script::XInvocation >
                                     m_xBitmapConverter;
         sal_Int32                   m_nSelectionTimeout;
-        Time                        m_nSelectionTimestamp;
+        XLIB_Time                   m_nSelectionTimestamp;
 
 
         // members used for Xdnd
@@ -272,21 +274,21 @@ namespace x11 {
 
         // contains the XdndEnterEvent of a drop action running
         // with one of our targets. The data.l[0] member
-        // (conatining the drag source window) is set
+        // (conatining the drag source XLIB_Window) is set
         // to None while that is not the case
         XClientMessageEvent         m_aDropEnterEvent;
         // set to false on XdndEnter
         // set to true on first XdndPosition or XdndLeave
         bool                        m_bDropEnterSent;
-        Window                      m_aCurrentDropWindow;
-        // time code of XdndDrop
-        Time                        m_nDropTime;
+        XLIB_Window                 m_aCurrentDropWindow;
+        // XLIB_Time code of XdndDrop
+        XLIB_Time                   m_nDropTime;
         sal_Int8                    m_nLastDropAction;
         // XTransferable for Xdnd with foreign drag source
         Reference< ::com::sun::star::datatransfer::XTransferable >
                                     m_xDropTransferable;
         int                         m_nLastX, m_nLastY;
-        Time                        m_nDropTimestamp;
+        XLIB_Time                   m_nDropTimestamp;
         // set to true when calling drop()
         // if another XdndEnter is received this shows that
         // someone forgot to call dropComplete - we should reset
@@ -296,10 +298,10 @@ namespace x11 {
         // drag only
 
         // None if no Dnd action is running with us as source
-        Window                      m_aDropWindow;
-        // either m_aDropWindow or its XdndProxy
-        Window                      m_aDropProxy;
-        Window                      m_aDragSourceWindow;
+        XLIB_Window                 m_aDropWindow;
+        // either m_aDropXLIB_Window or its XdndProxy
+        XLIB_Window                 m_aDropProxy;
+        XLIB_Window                 m_aDragSourceWindow;
         // XTransferable for Xdnd when we are drag source
         Reference< ::com::sun::star::datatransfer::XTransferable >
                                     m_xDragSourceTransferable;
@@ -321,20 +323,20 @@ namespace x11 {
         bool                        m_bDropSent;
         time_t                      m_nDropTimeout;
         bool                        m_bWaitingForPrimaryConversion;
-        Time                        m_nDragTimestamp;
+        XLIB_Time                   m_nDragTimestamp;
 
         // drag cursors
-        Cursor                      m_aMoveCursor;
-        Cursor                      m_aCopyCursor;
-        Cursor                      m_aLinkCursor;
-        Cursor                      m_aNoneCursor;
-        Cursor                      m_aCurrentCursor;
+        XLIB_Cursor                 m_aMoveCursor;
+        XLIB_Cursor                 m_aCopyCursor;
+        XLIB_Cursor                 m_aLinkCursor;
+        XLIB_Cursor                 m_aNoneCursor;
+        XLIB_Cursor                 m_aCurrentCursor;
 
 
         // drag and drop
 
         int                         m_nCurrentProtocolVersion;
-        ::std::hash_map< Window, DropTargetEntry >
+        ::std::hash_map< XLIB_Window, DropTargetEntry >
                                     m_aDropTargets;
 
 
@@ -374,7 +376,7 @@ namespace x11 {
         ::std::hash_map< Atom, Selection* >
                                     m_aSelections;
         // IncrementalTransfers in progress
-        std::hash_map< Window, std::hash_map< Atom, IncrementalTransfer > >
+        std::hash_map< XLIB_Window, std::hash_map< Atom, IncrementalTransfer > >
                                     m_aIncrementals;
 
         // do not use X11 multithreading capabilities
@@ -398,12 +400,12 @@ namespace x11 {
 
         // dnd helpers
         void sendDragStatus( Atom nDropAction );
-        void sendDropPosition( bool bForce, Time eventTime );
+        void sendDropPosition( bool bForce, XLIB_Time eventXLIB_Time );
         bool updateDragAction( int modifierState );
-        int getXdndVersion( Window aWindow, Window& rProxy );
-        Cursor createCursor( const char* pPointerData, const char* pMaskData, int width, int height, int hotX, int hotY );
-        // coordinates on root window
-        void updateDragWindow( int nX, int nY, Window aRoot );
+        int getXdndVersion( XLIB_Window aXLIB_Window, XLIB_Window& rProxy );
+        XLIB_Cursor createCursor( const char* pPointerData, const char* pMaskData, int width, int height, int hotX, int hotY );
+        // coordinates on root XLIB_Window
+        void updateDragWindow( int nX, int nY, XLIB_Window aRoot );
 
         bool getPasteData( Atom selection, Atom type, Sequence< sal_Int8 >& rData );
         // returns true if conversion was successful
@@ -412,7 +414,7 @@ namespace x11 {
                           Atom nSelection,
                           int & rFormat,
                           Sequence< sal_Int8 >& rData );
-        bool sendData( SelectionAdaptor* pAdaptor, Window requestor, Atom target, Atom property, Atom selection );
+        bool sendData( SelectionAdaptor* pAdaptor, XLIB_Window requestor, Atom target, Atom property, Atom selection );
 
         // thread dispatch loop
         public:
@@ -438,7 +440,7 @@ namespace x11 {
         static SelectionManager& get( const ::rtl::OUString& rDisplayName = ::rtl::OUString() );
 
         Display * getDisplay() { return m_pDisplay; };
-        Window getWindow() { return m_aWindow; };
+        XLIB_Window getWindow() { return m_aWindow; };
 
 
         void registerHandler( Atom selection, SelectionAdaptor& rAdaptor );
@@ -464,20 +466,22 @@ namespace x11 {
         bool getPasteData( Atom selection, const ::rtl::OUString& rType, Sequence< sal_Int8 >& rData );
 
         // for XDropTarget to register/deregister itself
-        void registerDropTarget( Window aWindow, DropTarget* pTarget );
-        void deregisterDropTarget( Window aWindow );
+        void registerDropTarget( XLIB_Window aXLIB_Window, DropTarget* pTarget );
+        void deregisterDropTarget( XLIB_Window aXLIB_Window );
 
         // for XDropTarget{Drag|Drop}Context
-        void accept( sal_Int8 dragOperation, Window aDropWindow, Time aTimestamp );
-        void reject( Window aDropWindow, Time aTimestamp );
-        void dropComplete( sal_Bool success, Window aDropWindow, Time aTimestamp );
+        void accept( sal_Int8 dragOperation, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp );
+        void reject( XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp );
+        void dropComplete( sal_Bool success, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp );
 
         // for XDragSourceContext
         sal_Int32 getCurrentCursor();
-        void setCursor( sal_Int32 cursor, Window aDropWindow, Time aTimestamp );
-        void setImage( sal_Int32 image, Window aDropWindow, Time aTimestamp );
+        void setCursor( sal_Int32 cursor, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp );
+        void setImage( sal_Int32 image, XLIB_Window aDropXLIB_Window, XLIB_Time aXLIB_Timestamp );
         void transferablesFlavorsChanged();
 
+        void shutdown() throw();
+
         // XInitialization
         virtual void        SAL_CALL initialize( const Sequence< Any >& arguments ) throw( ::com::sun::star::uno::Exception );
 
@@ -499,6 +503,15 @@ namespace x11 {
         virtual void clearTransferable() throw();
         virtual void fireContentsChanged() throw();
         virtual Reference< XInterface > getReference() throw();
+
+        // XEventListener
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw( ::com::sun::star::uno::RuntimeException );
+
+        // XTerminateListener
+        virtual void SAL_CALL queryTermination( const ::com::sun::star::lang::EventObject& aEvent )
+                throw( ::com::sun::star::frame::TerminationVetoException, ::com::sun::star::uno::RuntimeException );
+        virtual void SAL_CALL notifyTermination( const ::com::sun::star::lang::EventObject& aEvent )
+                throw( ::com::sun::star::uno::RuntimeException );
     };
 
 // ------------------------------------------------------------------------
diff --git a/vcl/unx/source/dtrans/X11_service.cxx b/vcl/unx/source/dtrans/X11_service.cxx
index cf971a2f8eb6..e14d81643553 100644
--- a/vcl/unx/source/dtrans/X11_service.cxx
+++ b/vcl/unx/source/dtrans/X11_service.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: X11_service.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/vcl/unx/source/dtrans/X11_transferable.cxx b/vcl/unx/source/dtrans/X11_transferable.cxx
index a95b87fe1c15..16518f0b2864 100644
--- a/vcl/unx/source/dtrans/X11_transferable.cxx
+++ b/vcl/unx/source/dtrans/X11_transferable.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: X11_transferable.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/vcl/unx/source/dtrans/X11_transferable.hxx b/vcl/unx/source/dtrans/X11_transferable.hxx
index 8e8367f666e2..57f0d6682cab 100644
--- a/vcl/unx/source/dtrans/X11_transferable.hxx
+++ b/vcl/unx/source/dtrans/X11_transferable.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: X11_transferable.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/vcl/unx/source/dtrans/bmp.cxx b/vcl/unx/source/dtrans/bmp.cxx
index 49219bfb0e2a..1ccd04eba725 100644
--- a/vcl/unx/source/dtrans/bmp.cxx
+++ b/vcl/unx/source/dtrans/bmp.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: bmp.cxx,v $
- * $Revision: 1.8 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -356,7 +353,7 @@ sal_uInt8* x11::X11_getBmpFromPixmap(
                                 )
 {
     // get geometry of drawable
-    Window aRoot;
+    XLIB_Window aRoot;
     int x,y;
     unsigned int w, h, bw, d;
     XGetGeometry( pDisplay, aDrawable, &aRoot, &x, &y, &w, &h, &bw, &d );
diff --git a/vcl/unx/source/dtrans/bmp.hxx b/vcl/unx/source/dtrans/bmp.hxx
index baf04ac31d90..b59b4417ca69 100644
--- a/vcl/unx/source/dtrans/bmp.hxx
+++ b/vcl/unx/source/dtrans/bmp.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: bmp.hxx,v $
- * $Revision: 1.4 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -31,10 +28,12 @@
 #ifndef _DTRANS_BMP_HXX_
 #define _DTRANS_BMP_HXX_
 
+#include "tools/prex.h"
 #include <X11/Xatom.h>
 #include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
+#include "tools/postx.h"
 
 #include <sal/types.h>
 #include <com/sun/star/awt/XBitmap.hpp>
diff --git a/vcl/unx/source/dtrans/config.cxx b/vcl/unx/source/dtrans/config.cxx
index 2402fb4452c3..001da3900bb7 100644
--- a/vcl/unx/source/dtrans/config.cxx
+++ b/vcl/unx/source/dtrans/config.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: config.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/vcl/unx/source/dtrans/copydata_curs.h b/vcl/unx/source/dtrans/copydata_curs.h
index 21a095521939..e3d0e3e76530 100644
--- a/vcl/unx/source/dtrans/copydata_curs.h
+++ b/vcl/unx/source/dtrans/copydata_curs.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: copydata_curs.h,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/vcl/unx/source/dtrans/copydata_mask.h b/vcl/unx/source/dtrans/copydata_mask.h
index 25db64d9bfee..f25b0863d807 100644
--- a/vcl/unx/source/dtrans/copydata_mask.h
+++ b/vcl/unx/source/dtrans/copydata_mask.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: copydata_mask.h,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/vcl/unx/source/dtrans/linkdata_curs.h b/vcl/unx/source/dtrans/linkdata_curs.h
index 01ea8678acd2..c60edc3b99d0 100644
--- a/vcl/unx/source/dtrans/linkdata_curs.h
+++ b/vcl/unx/source/dtrans/linkdata_curs.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: linkdata_curs.h,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/vcl/unx/source/dtrans/linkdata_mask.h b/vcl/unx/source/dtrans/linkdata_mask.h
index b4207ad40dcf..cf0f89f63b1b 100644
--- a/vcl/unx/source/dtrans/linkdata_mask.h
+++ b/vcl/unx/source/dtrans/linkdata_mask.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: linkdata_mask.h,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/vcl/unx/source/dtrans/makefile.mk b/vcl/unx/source/dtrans/makefile.mk
index 6af3a7c75048..6f5caccfd734 100644
--- a/vcl/unx/source/dtrans/makefile.mk
+++ b/vcl/unx/source/dtrans/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/vcl/unx/source/dtrans/movedata_curs.h b/vcl/unx/source/dtrans/movedata_curs.h
index 36845d5e9d1e..b79412bc3f41 100644
--- a/vcl/unx/source/dtrans/movedata_curs.h
+++ b/vcl/unx/source/dtrans/movedata_curs.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: movedata_curs.h,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/vcl/unx/source/dtrans/movedata_mask.h b/vcl/unx/source/dtrans/movedata_mask.h
index facca718b8bf..e25d0837d8dc 100644
--- a/vcl/unx/source/dtrans/movedata_mask.h
+++ b/vcl/unx/source/dtrans/movedata_mask.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: movedata_mask.h,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/vcl/unx/source/dtrans/nodrop_curs.h b/vcl/unx/source/dtrans/nodrop_curs.h
index 725b0fccf91b..8e208e32f293 100644
--- a/vcl/unx/source/dtrans/nodrop_curs.h
+++ b/vcl/unx/source/dtrans/nodrop_curs.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: nodrop_curs.h,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/vcl/unx/source/dtrans/nodrop_mask.h b/vcl/unx/source/dtrans/nodrop_mask.h
index ef67a2bc2642..7cbecef2c60f 100644
--- a/vcl/unx/source/dtrans/nodrop_mask.h
+++ b/vcl/unx/source/dtrans/nodrop_mask.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: nodrop_mask.h,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/vcl/unx/source/fontmanager/adobeenc.tab b/vcl/unx/source/fontmanager/adobeenc.tab
index e4005a87849f..492e92f3fcf2 100644
--- a/vcl/unx/source/fontmanager/adobeenc.tab
+++ b/vcl/unx/source/fontmanager/adobeenc.tab
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: adobeenc.tab,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/vcl/unx/source/fontmanager/fontcache.cxx b/vcl/unx/source/fontmanager/fontcache.cxx
index 524a365ee20b..803e92d3cb14 100644
--- a/vcl/unx/source/fontmanager/fontcache.cxx
+++ b/vcl/unx/source/fontmanager/fontcache.cxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: fontcache.cxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx
index bc0dae480d31..1d4573518879 100644
--- a/vcl/unx/source/fontmanager/fontconfig.cxx
+++ b/vcl/unx/source/fontmanager/fontconfig.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: fontconfig.cxx,v $
- * $Revision: 1.30.24.2 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/fontmanager/fontmanager.cxx b/vcl/unx/source/fontmanager/fontmanager.cxx
index 99f19ba2fc31..aad53549f1ea 100644
--- a/vcl/unx/source/fontmanager/fontmanager.cxx
+++ b/vcl/unx/source/fontmanager/fontmanager.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/vcl/unx/source/fontmanager/helper.cxx b/vcl/unx/source/fontmanager/helper.cxx
index 2f3821eac7d1..05213a52597c 100644
--- a/vcl/unx/source/fontmanager/helper.cxx
+++ b/vcl/unx/source/fontmanager/helper.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: helper.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/vcl/unx/source/fontmanager/makefile.mk b/vcl/unx/source/fontmanager/makefile.mk
index c1d1fde15de3..c6a23b88f35b 100644
--- a/vcl/unx/source/fontmanager/makefile.mk
+++ b/vcl/unx/source/fontmanager/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/fontmanager/parseAFM.cxx b/vcl/unx/source/fontmanager/parseAFM.cxx
index 0ac4754d4bd5..fd131121cbb5 100644
--- a/vcl/unx/source/fontmanager/parseAFM.cxx
+++ b/vcl/unx/source/fontmanager/parseAFM.cxx
@@ -42,16 +42,6 @@
  *                           in recognize() routine
  */
 
-/*************************************************************************
- *
- *  $RCSfile: parseAFM.cxx,v $
- *
- *  $Revision: 1.11 $
- *
- *  last change: $Author: rt $ $Date: 2008-01-29 16:08:31 $
- *
- ************************************************************************/
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_vcl.hxx"
 
diff --git a/vcl/unx/source/fontmanager/parseAFM.hxx b/vcl/unx/source/fontmanager/parseAFM.hxx
index ad0c32e4b51b..cfebde696c14 100644
--- a/vcl/unx/source/fontmanager/parseAFM.hxx
+++ b/vcl/unx/source/fontmanager/parseAFM.hxx
@@ -34,16 +34,6 @@
  *  10/19/2005 pl       - changed parseFile to accept a file name instead of a stream
  */
 
-/*************************************************************************
- *
- *  $RCSfile: parseAFM.hxx,v $
- *
- *  $Revision: 1.2 $
- *
- *  last change: $Author: hr $ $Date: 2005-12-28 17:08:50 $
- *
- ************************************************************************/
-
 /* ParseAFM.h
  *
  * This header file is used in conjuction with the parseAFM.c file.
diff --git a/vcl/unx/source/gdi/cdeint.cxx b/vcl/unx/source/gdi/cdeint.cxx
index 3794737b293e..caa4867af874 100644
--- a/vcl/unx/source/gdi/cdeint.cxx
+++ b/vcl/unx/source/gdi/cdeint.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: cdeint.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/vcl/unx/source/gdi/dtint.cxx b/vcl/unx/source/gdi/dtint.cxx
index 96d78b4f006d..5f0dbd50ea17 100644
--- a/vcl/unx/source/gdi/dtint.cxx
+++ b/vcl/unx/source/gdi/dtint.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: dtint.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/vcl/unx/source/gdi/dtsetenum.hxx b/vcl/unx/source/gdi/dtsetenum.hxx
index d8d2de8c50b7..5406ac870a43 100644
--- a/vcl/unx/source/gdi/dtsetenum.hxx
+++ b/vcl/unx/source/gdi/dtsetenum.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: dtsetenum.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/vcl/unx/source/gdi/gcach_xpeer.cxx b/vcl/unx/source/gdi/gcach_xpeer.cxx
index 85466c532ff2..634f79d3e002 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/source/gdi/gcach_xpeer.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: gcach_xpeer.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/vcl/unx/source/gdi/gcach_xpeer.hxx b/vcl/unx/source/gdi/gcach_xpeer.hxx
index 3af34ffd9297..13277fa975de 100644
--- a/vcl/unx/source/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/source/gdi/gcach_xpeer.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: gcach_xpeer.hxx,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/vcl/unx/source/gdi/makefile.mk b/vcl/unx/source/gdi/makefile.mk
index fb513a66a841..536aadcac015 100644
--- a/vcl/unx/source/gdi/makefile.mk
+++ b/vcl/unx/source/gdi/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.26.28.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/gdi/pspgraphics.cxx b/vcl/unx/source/gdi/pspgraphics.cxx
index 227d6cd7e9b2..10a51afeb696 100644
--- a/vcl/unx/source/gdi/pspgraphics.cxx
+++ b/vcl/unx/source/gdi/pspgraphics.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/vcl/unx/source/gdi/salbmp.cxx b/vcl/unx/source/gdi/salbmp.cxx
index 4db44d664c16..cc7934b0a798 100644
--- a/vcl/unx/source/gdi/salbmp.cxx
+++ b/vcl/unx/source/gdi/salbmp.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: salbmp.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/vcl/unx/source/gdi/salcvt.cxx b/vcl/unx/source/gdi/salcvt.cxx
index 8b1912e3fe85..c699cdb12335 100644
--- a/vcl/unx/source/gdi/salcvt.cxx
+++ b/vcl/unx/source/gdi/salcvt.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: salcvt.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/vcl/unx/source/gdi/salcvt.hxx b/vcl/unx/source/gdi/salcvt.hxx
index 8bbbee0251e9..c142c76fe5d0 100644
--- a/vcl/unx/source/gdi/salcvt.hxx
+++ b/vcl/unx/source/gdi/salcvt.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: salcvt.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/vcl/unx/source/gdi/salgdi.cxx b/vcl/unx/source/gdi/salgdi.cxx
index 5fe2295a8fed..7637d3b2bd02 100644
--- a/vcl/unx/source/gdi/salgdi.cxx
+++ b/vcl/unx/source/gdi/salgdi.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
  *
@@ -1428,14 +1428,17 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
         // unless it splits another trapezoid that is still active
         bool bSplit = false;
         ActiveTrapSet::iterator aActiveTrapsIt = aActiveTraps.begin();
-        for(; aActiveTrapsIt != aActiveTraps.end(); ++aActiveTrapsIt )
+        while(aActiveTrapsIt != aActiveTraps.end())
         {
             XTrapezoid& rLeftTrap = aTrapVector[ *aActiveTrapsIt ];
 
             // skip until first overlap candidate
             // TODO: use stl::*er_bound() instead
             if( IsLeftOf( aTrapezoid.left, rLeftTrap.left) )
+            {
+                ++aActiveTrapsIt;
                 continue;
+            }
 
             // in the ActiveTrapSet there are still trapezoids where
             // a vertical overlap with new trapezoids is no longer possible
@@ -1446,15 +1449,26 @@ bool X11SalGraphics::drawPolyPolygon( const ::basegfx::B2DPolyPolygon& rOrigPoly
             {
                 ActiveTrapSet::iterator it = aActiveTrapsIt;
                 if( aActiveTrapsIt != aActiveTraps.begin() )
+                {
                     --aActiveTrapsIt;
-                aActiveTraps.erase( it );
+                    aActiveTraps.erase( it );
+                    ++aActiveTrapsIt;
+                }
+                else
+                {
+                    aActiveTraps.erase( it );
+                    aActiveTrapsIt = aActiveTraps.begin();
+                }
                 continue;
             }
 
             // check if there is horizontal overlap
             // aTrapezoid.left==rLeftTrap.right is allowed though
             if( !IsLeftOf( aTrapezoid.left, rLeftTrap.right ) )
+            {
+                ++aActiveTrapsIt;
                 continue;
+            }
 
             // prepare to split the old trapezoid and keep its upper part
             // find the old trapezoids entry in the VerticalTrapSet and remove it
diff --git a/vcl/unx/source/gdi/salgdi2.cxx b/vcl/unx/source/gdi/salgdi2.cxx
index 1d8e80df0663..1cb2abbedf43 100644
--- a/vcl/unx/source/gdi/salgdi2.cxx
+++ b/vcl/unx/source/gdi/salgdi2.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: salgdi2.cxx,v $
- * $Revision: 1.47.16.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/gdi/salgdi3.cxx b/vcl/unx/source/gdi/salgdi3.cxx
index 5d6cd464376a..bb5e7c68b356 100644
--- a/vcl/unx/source/gdi/salgdi3.cxx
+++ b/vcl/unx/source/gdi/salgdi3.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/vcl/unx/source/gdi/salprnpsp.cxx b/vcl/unx/source/gdi/salprnpsp.cxx
index 2cf4e3baedd3..3491622f783c 100644
--- a/vcl/unx/source/gdi/salprnpsp.cxx
+++ b/vcl/unx/source/gdi/salprnpsp.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: salprnpsp.cxx,v $
- * $Revision: 1.53 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -177,6 +174,32 @@ static void copyJobDataToJobSetup( ImplJobSetup* pJobSetup, JobData& rData )
             pJobSetup->mnPaperBin = 0;
     }
 
+    // copy duplex
+    pKey = NULL;
+    pValue = NULL;
+
+    pJobSetup->meDuplexMode = DUPLEX_UNKNOWN;
+    if( rData.m_pParser )
+        pKey = rData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
+    if( pKey )
+        pValue = rData.m_aContext.getValue( pKey );
+    if( pKey && pValue )
+    {
+        if( pValue->m_aOption.EqualsIgnoreCaseAscii( "None" ) ||
+            pValue->m_aOption.EqualsIgnoreCaseAscii( "Simplex", 0, 7 )
+           )
+        {
+            pJobSetup->meDuplexMode = DUPLEX_OFF;
+        }
+        else if( pValue->m_aOption.EqualsIgnoreCaseAscii( "DuplexNoTumble" ) )
+        {
+            pJobSetup->meDuplexMode = DUPLEX_LONGEDGE;
+        }
+        else if( pValue->m_aOption.EqualsIgnoreCaseAscii( "DuplexTumble" ) )
+        {
+            pJobSetup->meDuplexMode = DUPLEX_SHORTEDGE;
+        }
+    }
 
     // copy the whole context
     if( pJobSetup->mpDriverData )
@@ -525,34 +548,6 @@ void PspSalInfoPrinter::InitPaperFormats( const ImplJobSetup* )
 
 // -----------------------------------------------------------------------
 
-DuplexMode PspSalInfoPrinter::GetDuplexMode( const ImplJobSetup* pJobSetup )
-{
-    DuplexMode aRet = DUPLEX_UNKNOWN;
-    PrinterInfo aInfo( PrinterInfoManager::get().getPrinterInfo( pJobSetup->maPrinterName ) );
-    if ( pJobSetup->mpDriverData )
-        JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aInfo );
-    if( aInfo.m_pParser )
-    {
-        const PPDKey * pKey = aInfo.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
-        if( pKey )
-        {
-            const PPDValue* pVal = aInfo.m_aContext.getValue( pKey );
-            if( pVal && (
-                pVal->m_aOption.EqualsIgnoreCaseAscii( "None" )          ||
-                pVal->m_aOption.EqualsIgnoreCaseAscii( "Simplex", 0, 7 )
-                ) )
-            {
-                aRet = DUPLEX_OFF;
-            }
-            else
-                aRet = DUPLEX_ON;
-        }
-    }
-    return aRet;
-}
-
-// -----------------------------------------------------------------------
-
 int PspSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* )
 {
     return 900;
@@ -727,6 +722,37 @@ BOOL PspSalInfoPrinter::SetData(
         if( nSetDataFlags & SAL_JOBSET_ORIENTATION )
             aData.m_eOrientation = pJobSetup->meOrientation == ORIENTATION_LANDSCAPE ? orientation::Landscape : orientation::Portrait;
 
+        // merge duplex if necessary
+        if( nSetDataFlags & SAL_JOBSET_DUPLEXMODE )
+        {
+            pKey = aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Duplex" ) ) );
+            if( pKey )
+            {
+                pValue = NULL;
+                switch( pJobSetup->meDuplexMode )
+                {
+                case DUPLEX_OFF:
+                    pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "None" ) ) );
+                    if( pValue == NULL )
+                        pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "SimplexNoTumble" ) ) );
+                    break;
+                case DUPLEX_SHORTEDGE:
+                    pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "DuplexTumble" ) ) );
+                    break;
+                case DUPLEX_LONGEDGE:
+                    pValue = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "DuplexNoTumble" ) ) );
+                    break;
+                case DUPLEX_UNKNOWN:
+                default:
+                    pValue = 0;
+                    break;
+                }
+                if( ! pValue )
+                    pValue = pKey->getDefaultValue();
+                aData.m_aContext.setValue( pKey, pValue );
+            }
+        }
+
         m_aJobData = aData;
         copyJobDataToJobSetup( pJobSetup, aData );
         return TRUE;
@@ -810,7 +836,7 @@ String PspSalInfoPrinter::GetPaperBinName( const ImplJobSetup* pJobSetup, ULONG
         {
             const PPDValue* pValue = pKey->getValue( nPaperBin );
             if( pValue )
-                aRet = pValue->m_aOptionTranslation.Len() ? pValue->m_aOptionTranslation : pValue->m_aOption;
+                aRet = aData.m_pParser->translateOption( pKey->getKey(), pValue->m_aOption );
         }
     }
 
@@ -828,9 +854,22 @@ ULONG PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT
         case PRINTER_CAPABILITIES_COPIES:
             return 0xffff;
         case PRINTER_CAPABILITIES_COLLATECOPIES:
-            return 0;
+        {
+            // see if the PPD contains a value to set Collate to True
+            JobData aData;
+            JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, aData );
+
+            const PPDKey* pKey = aData.m_pParser ? aData.m_pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ) ) : NULL;
+            const PPDValue* pVal = pKey ? pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "True" ) ) ) : NULL;
+
+            // PPDs don't mention the number of possible collated copies.
+            // so let's guess as many as we want ?
+            return pVal ? 0xffff : 0;
+        }
         case PRINTER_CAPABILITIES_SETORIENTATION:
             return 1;
+        case PRINTER_CAPABILITIES_SETDUPLEX:
+            return 1;
         case PRINTER_CAPABILITIES_SETPAPERBIN:
             return 1;
         case PRINTER_CAPABILITIES_SETPAPERSIZE:
@@ -860,6 +899,7 @@ ULONG PspSalInfoPrinter::GetCapabilities( const ImplJobSetup* pJobSetup, USHORT
    m_bSwallowFaxNo( false ),
    m_pGraphics( NULL ),
    m_nCopies( 1 ),
+   m_bCollate( false ),
    m_pInfoPrinter( pInfoPrinter )
 {
 }
@@ -885,7 +925,9 @@ BOOL PspSalPrinter::StartJob(
     const XubString* pFileName,
     const XubString& rJobName,
     const XubString& rAppName,
-    ULONG nCopies, BOOL /*bCollate*/,
+    ULONG nCopies,
+    bool bCollate,
+    bool bDirect,
     ImplJobSetup* pJobSetup )
 {
     vcl_sal::PrinterUpdate::jobStarted();
@@ -894,13 +936,17 @@ BOOL PspSalPrinter::StartJob(
     m_bPdf      = false;
     m_aFileName = pFileName ? *pFileName : String();
     m_aTmpFile  = String();
-    m_nCopies       = nCopies;
+    m_nCopies   = nCopies;
+    m_bCollate  = bCollate;
 
     JobData::constructFromStreamBuffer( pJobSetup->mpDriverData, pJobSetup->mnDriverDataLen, m_aJobData );
     if( m_nCopies > 1 )
+    {
         // in case user did not do anything (m_nCopies=1)
         // take the default from jobsetup
         m_aJobData.m_nCopies = m_nCopies;
+        m_aJobData.setCollate( bCollate );
+    }
 
     // check wether this printer is configured as fax
     int nMode = 0;
@@ -943,15 +989,6 @@ BOOL PspSalPrinter::StartJob(
     }
     m_aPrinterGfx.Init( m_aJobData );
 
-    bool bIsQuickJob = false;
-    std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator quick_it =
-        pJobSetup->maValueMap.find( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsQuickJob" ) ) );
-    if( quick_it != pJobSetup->maValueMap.end() )
-    {
-        if( quick_it->second.equalsIgnoreAsciiCaseAscii( "true" ) )
-            bIsQuickJob = true;
-    }
-
     // set/clear backwards compatibility flag
     bool bStrictSO52Compatibility = false;
     std::hash_map<rtl::OUString, rtl::OUString, rtl::OUStringHash >::const_iterator compat_it =
@@ -964,7 +1001,7 @@ BOOL PspSalPrinter::StartJob(
     }
     m_aPrinterGfx.setStrictSO52Compatibility( bStrictSO52Compatibility );
 
-    return m_aPrintJob.StartJob( m_aTmpFile.Len() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bIsQuickJob ) ? TRUE : FALSE;
+    return m_aPrintJob.StartJob( m_aTmpFile.Len() ? m_aTmpFile : m_aFileName, nMode, rJobName, rAppName, m_aJobData, &m_aPrinterGfx, bDirect ) ? TRUE : FALSE;
 }
 
 // -----------------------------------------------------------------------
@@ -1010,9 +1047,12 @@ SalGraphics* PspSalPrinter::StartPage( ImplJobSetup* pJobSetup, BOOL )
     m_pGraphics = new PspGraphics( &m_aJobData, &m_aPrinterGfx, m_bFax ? &m_aFaxNr : NULL, m_bSwallowFaxNo, m_pInfoPrinter  );
     m_pGraphics->SetLayout( 0 );
     if( m_nCopies > 1 )
+    {
         // in case user did not do anything (m_nCopies=1)
         // take the default from jobsetup
         m_aJobData.m_nCopies = m_nCopies;
+        m_aJobData.setCollate( m_nCopies > 1 && m_bCollate );
+    }
 
     m_aPrintJob.StartPage( m_aJobData );
     m_aPrinterGfx.Init( m_aPrintJob );
diff --git a/vcl/unx/source/gdi/salvd.cxx b/vcl/unx/source/gdi/salvd.cxx
index 66e582e231b7..f242fffae715 100644
--- a/vcl/unx/source/gdi/salvd.cxx
+++ b/vcl/unx/source/gdi/salvd.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: salvd.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/vcl/unx/source/gdi/xfont.cxx b/vcl/unx/source/gdi/xfont.cxx
index e7b3844ae2ea..f6d19909cd4a 100644
--- a/vcl/unx/source/gdi/xfont.cxx
+++ b/vcl/unx/source/gdi/xfont.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: xfont.cxx,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/vcl/unx/source/gdi/xlfd_attr.cxx b/vcl/unx/source/gdi/xlfd_attr.cxx
index 1c656e9f18ce..ca49a8548afb 100644
--- a/vcl/unx/source/gdi/xlfd_attr.cxx
+++ b/vcl/unx/source/gdi/xlfd_attr.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: xlfd_attr.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/vcl/unx/source/gdi/xlfd_attr.hxx b/vcl/unx/source/gdi/xlfd_attr.hxx
index 5aa2ec3571a5..b721310da506 100644
--- a/vcl/unx/source/gdi/xlfd_attr.hxx
+++ b/vcl/unx/source/gdi/xlfd_attr.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: xlfd_attr.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/vcl/unx/source/gdi/xlfd_extd.cxx b/vcl/unx/source/gdi/xlfd_extd.cxx
index 486e69f1effe..8449fcc5872e 100644
--- a/vcl/unx/source/gdi/xlfd_extd.cxx
+++ b/vcl/unx/source/gdi/xlfd_extd.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: xlfd_extd.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/vcl/unx/source/gdi/xlfd_extd.hxx b/vcl/unx/source/gdi/xlfd_extd.hxx
index af0fca9902b7..523f87fac477 100644
--- a/vcl/unx/source/gdi/xlfd_extd.hxx
+++ b/vcl/unx/source/gdi/xlfd_extd.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: xlfd_extd.hxx,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/vcl/unx/source/gdi/xlfd_smpl.cxx b/vcl/unx/source/gdi/xlfd_smpl.cxx
index f9321361a069..6cf18d98de1e 100644
--- a/vcl/unx/source/gdi/xlfd_smpl.cxx
+++ b/vcl/unx/source/gdi/xlfd_smpl.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: xlfd_smpl.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/vcl/unx/source/gdi/xlfd_smpl.hxx b/vcl/unx/source/gdi/xlfd_smpl.hxx
index 4ff41f8644e4..f62ac381e6b9 100644
--- a/vcl/unx/source/gdi/xlfd_smpl.hxx
+++ b/vcl/unx/source/gdi/xlfd_smpl.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: xlfd_smpl.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/vcl/unx/source/gdi/xrender_peer.cxx b/vcl/unx/source/gdi/xrender_peer.cxx
index fc8de818fafd..c5d84cffab58 100644
--- a/vcl/unx/source/gdi/xrender_peer.cxx
+++ b/vcl/unx/source/gdi/xrender_peer.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$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/gdi/xrender_peer.hxx b/vcl/unx/source/gdi/xrender_peer.hxx
index 27c8fb3dcaeb..6d40015ee94d 100644
--- a/vcl/unx/source/gdi/xrender_peer.hxx
+++ b/vcl/unx/source/gdi/xrender_peer.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$
- * $Revision$
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/inc/airbrush_curs.h b/vcl/unx/source/inc/airbrush_curs.h
index 6b93b006726b..293c9757e77b 100644
--- a/vcl/unx/source/inc/airbrush_curs.h
+++ b/vcl/unx/source/inc/airbrush_curs.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: airbrush_curs.h,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/vcl/unx/source/inc/airbrush_mask.h b/vcl/unx/source/inc/airbrush_mask.h
index 035776983179..811ea2819669 100644
--- a/vcl/unx/source/inc/airbrush_mask.h
+++ b/vcl/unx/source/inc/airbrush_mask.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: airbrush_mask.h,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/vcl/unx/source/inc/ase_curs.h b/vcl/unx/source/inc/ase_curs.h
index 814ac78e64ed..52b67f56d2ae 100644
--- a/vcl/unx/source/inc/ase_curs.h
+++ b/vcl/unx/source/inc/ase_curs.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: ase_curs.h,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/vcl/unx/source/inc/ase_mask.h b/vcl/unx/source/inc/ase_mask.h
index 5ea34a8e621f..5dbd5c134dbf 100644
--- a/vcl/unx/source/inc/ase_mask.h
+++ b/vcl/unx/source/inc/ase_mask.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: ase_mask.h,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/vcl/unx/source/inc/asn_curs.h b/vcl/unx/source/inc/asn_curs.h
index 6ed7bc97e7c8..3b5f4364b5e2 100644
--- a/vcl/unx/source/inc/asn_curs.h
+++ b/vcl/unx/source/inc/asn_curs.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: asn_curs.h,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/vcl/unx/source/inc/asn_mask.h b/vcl/unx/source/inc/asn_mask.h
index 2605d433b94d..902fe80df8a1 100644
--- a/vcl/unx/source/inc/asn_mask.h
+++ b/vcl/unx/source/inc/asn_mask.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: asn_mask.h,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/vcl/unx/source/inc/asne_curs.h b/vcl/unx/source/inc/asne_curs.h
index 37c3e441d5d7..0939b1d07e4b 100644
--- a/vcl/unx/source/inc/asne_curs.h
+++ b/vcl/unx/source/inc/asne_curs.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: asne_curs.h,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/vcl/unx/source/inc/asne_mask.h b/vcl/unx/source/inc/asne_mask.h
index 1937ecc89280..9ab55c293218 100644
--- a/vcl/unx/source/inc/asne_mask.h
+++ b/vcl/unx/source/inc/asne_mask.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: asne_mask.h,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/vcl/unx/source/inc/asns_curs.h b/vcl/unx/source/inc/asns_curs.h
index 4fd91e7a0ee9..fef8fe2f4ab5 100644
--- a/vcl/unx/source/inc/asns_curs.h
+++ b/vcl/unx/source/inc/asns_curs.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: asns_curs.h,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/vcl/unx/source/inc/asns_mask.h b/vcl/unx/source/inc/asns_mask.h
index 2de0e46ab935..f90cb95ee721 100644
--- a/vcl/unx/source/inc/asns_mask.h
+++ b/vcl/unx/source/inc/asns_mask.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: asns_mask.h,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/vcl/unx/source/inc/asnswe_curs.h b/vcl/unx/source/inc/asnswe_curs.h
index 76d39dda8d27..fd6ddaca65cb 100644
--- a/vcl/unx/source/inc/asnswe_curs.h
+++ b/vcl/unx/source/inc/asnswe_curs.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: asnswe_curs.h,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/vcl/unx/source/inc/asnswe_mask.h b/vcl/unx/source/inc/asnswe_mask.h
index 1cbd93322299..e48da90e3de5 100644
--- a/vcl/unx/source/inc/asnswe_mask.h
+++ b/vcl/unx/source/inc/asnswe_mask.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: asnswe_mask.h,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/vcl/unx/source/inc/asnw_curs.h b/vcl/unx/source/inc/asnw_curs.h
index 901945ea5260..cb3a35d793c7 100644
--- a/vcl/unx/source/inc/asnw_curs.h
+++ b/vcl/unx/source/inc/asnw_curs.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: asnw_curs.h,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/vcl/unx/source/inc/asnw_mask.h b/vcl/unx/source/inc/asnw_mask.h
index 1a38c9b01d11..e583957c4bae 100644
--- a/vcl/unx/source/inc/asnw_mask.h
+++ b/vcl/unx/source/inc/asnw_mask.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: asnw_mask.h,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/vcl/unx/source/inc/ass_curs.h b/vcl/unx/source/inc/ass_curs.h
index ed60c672a1d9..ea942cefe942 100644
--- a/vcl/unx/source/inc/ass_curs.h
+++ b/vcl/unx/source/inc/ass_curs.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: ass_curs.h,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/vcl/unx/source/inc/ass_mask.h b/vcl/unx/source/inc/ass_mask.h
index 7fe390f17b5e..b35298183cb1 100644
--- a/vcl/unx/source/inc/ass_mask.h
+++ b/vcl/unx/source/inc/ass_mask.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: ass_mask.h,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/vcl/unx/source/inc/asse_curs.h b/vcl/unx/source/inc/asse_curs.h
index 96717c87dc69..4b30e81882ff 100644
--- a/vcl/unx/source/inc/asse_curs.h
+++ b/vcl/unx/source/inc/asse_curs.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: asse_curs.h,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/vcl/unx/source/inc/asse_mask.h b/vcl/unx/source/inc/asse_mask.h
index 16615bdbd1fb..ad74b0cf724a 100644
--- a/vcl/unx/source/inc/asse_mask.h
+++ b/vcl/unx/source/inc/asse_mask.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: asse_mask.h,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/vcl/unx/source/inc/assw_curs.h b/vcl/unx/source/inc/assw_curs.h
index 4a135b87e562..d26c36e79ed4 100644
--- a/vcl/unx/source/inc/assw_curs.h
+++ b/vcl/unx/source/inc/assw_curs.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: assw_curs.h,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/vcl/unx/source/inc/assw_mask.h b/vcl/unx/source/inc/assw_mask.h
index 3ef37da8fa41..ea47a3ee27e9 100644
--- a/vcl/unx/source/inc/assw_mask.h
+++ b/vcl/unx/source/inc/assw_mask.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: assw_mask.h,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/vcl/unx/source/inc/asw_curs.h b/vcl/unx/source/inc/asw_curs.h
index fc52f51c0409..7b9b2199955a 100644
--- a/vcl/unx/source/inc/asw_curs.h
+++ b/vcl/unx/source/inc/asw_curs.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: asw_curs.h,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/vcl/unx/source/inc/asw_mask.h b/vcl/unx/source/inc/asw_mask.h
index f29c4d0b1074..df934399fe91 100644
--- a/vcl/unx/source/inc/asw_mask.h
+++ b/vcl/unx/source/inc/asw_mask.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: asw_mask.h,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/vcl/unx/source/inc/aswe_curs.h b/vcl/unx/source/inc/aswe_curs.h
index 1962d76bb617..f06d2140559e 100644
--- a/vcl/unx/source/inc/aswe_curs.h
+++ b/vcl/unx/source/inc/aswe_curs.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: aswe_curs.h,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/vcl/unx/source/inc/aswe_mask.h b/vcl/unx/source/inc/aswe_mask.h
index 2aab7cba42b8..c04dbf5deafb 100644
--- a/vcl/unx/source/inc/aswe_mask.h
+++ b/vcl/unx/source/inc/aswe_mask.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: aswe_mask.h,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/vcl/unx/source/inc/chain_curs.h b/vcl/unx/source/inc/chain_curs.h
index 350592b7e9e0..95b4fbe66c2e 100644
--- a/vcl/unx/source/inc/chain_curs.h
+++ b/vcl/unx/source/inc/chain_curs.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: chain_curs.h,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/vcl/unx/source/inc/chain_mask.h b/vcl/unx/source/inc/chain_mask.h
index 77704d310789..91d89bbed3c6 100644
--- a/vcl/unx/source/inc/chain_mask.h
+++ b/vcl/unx/source/inc/chain_mask.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: chain_mask.h,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/vcl/unx/source/inc/chainnot_curs.h b/vcl/unx/source/inc/chainnot_curs.h
index 4d3d649fe6d8..841e2efdec63 100644
--- a/vcl/unx/source/inc/chainnot_curs.h
+++ b/vcl/unx/source/inc/chainnot_curs.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: chainnot_curs.h,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/vcl/unx/source/inc/chainnot_mask.h b/vcl/unx/source/inc/chainnot_mask.h
index 126747a0cd57..9fbed6408c54 100644
--- a/vcl/unx/source/inc/chainnot_mask.h
+++ b/vcl/unx/source/inc/chainnot_mask.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: chainnot_mask.h,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/vcl/unx/source/inc/chart_curs.h b/vcl/unx/source/inc/chart_curs.h
index f0ef099681e8..9346fbd8f2c0 100644
--- a/vcl/unx/source/inc/chart_curs.h
+++ b/vcl/unx/source/inc/chart_curs.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: chart_curs.h,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/vcl/unx/source/inc/chart_mask.h b/vcl/unx/source/inc/chart_mask.h
index 37f0f42ce3a5..d4804fb6c85b 100644
--- a/vcl/unx/source/inc/chart_mask.h
+++ b/vcl/unx/source/inc/chart_mask.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: chart_mask.h,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/vcl/unx/source/inc/copydata_curs.h b/vcl/unx/source/inc/copydata_curs.h
index 21a095521939..e3d0e3e76530 100644
--- a/vcl/unx/source/inc/copydata_curs.h
+++ b/vcl/unx/source/inc/copydata_curs.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: copydata_curs.h,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/vcl/unx/source/inc/copydata_mask.h b/vcl/unx/source/inc/copydata_mask.h
index 25db64d9bfee..f25b0863d807 100644
--- a/vcl/unx/source/inc/copydata_mask.h
+++ b/vcl/unx/source/inc/copydata_mask.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: copydata_mask.h,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/vcl/unx/source/inc/copydlnk_curs.h b/vcl/unx/source/inc/copydlnk_curs.h
index 48912ac59dab..8e22a5bee37b 100644
--- a/vcl/unx/source/inc/copydlnk_curs.h
+++ b/vcl/unx/source/inc/copydlnk_curs.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: copydlnk_curs.h,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/vcl/unx/source/inc/copydlnk_mask.h b/vcl/unx/source/inc/copydlnk_mask.h
index 38f96cd77a2d..02ee5db5fbc1 100644
--- a/vcl/unx/source/inc/copydlnk_mask.h
+++ b/vcl/unx/source/inc/copydlnk_mask.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: copydlnk_mask.h,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/vcl/unx/source/inc/copyfile_curs.h b/vcl/unx/source/inc/copyfile_curs.h
index be17ff2cf39b..c74a1da26b66 100644
--- a/vcl/unx/source/inc/copyfile_curs.h
+++ b/vcl/unx/source/inc/copyfile_curs.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: copyfile_curs.h,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/vcl/unx/source/inc/copyfile_mask.h b/vcl/unx/source/inc/copyfile_mask.h
index 977ad12f7eb5..c13089abaea5 100644
--- a/vcl/unx/source/inc/copyfile_mask.h
+++ b/vcl/unx/source/inc/copyfile_mask.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: copyfile_mask.h,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/vcl/unx/source/inc/copyfiles_curs.h b/vcl/unx/source/inc/copyfiles_curs.h
index e2db0932aefc..e6a9b7a668af 100644
--- a/vcl/unx/source/inc/copyfiles_curs.h
+++ b/vcl/unx/source/inc/copyfiles_curs.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: copyfiles_curs.h,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/vcl/unx/source/inc/copyfiles_mask.h b/vcl/unx/source/inc/copyfiles_mask.h
index 5fd23561bc6a..f904b7848f64 100644
--- a/vcl/unx/source/inc/copyfiles_mask.h
+++ b/vcl/unx/source/inc/copyfiles_mask.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: copyfiles_mask.h,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/vcl/unx/source/inc/copyflnk_curs.h b/vcl/unx/source/inc/copyflnk_curs.h
index 945c70fefb94..b76368923f31 100644
--- a/vcl/unx/source/inc/copyflnk_curs.h
+++ b/vcl/unx/source/inc/copyflnk_curs.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: copyflnk_curs.h,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/vcl/unx/source/inc/copyflnk_mask.h b/vcl/unx/source/inc/copyflnk_mask.h
index 94a53fc6b1e0..b8fac92fdd75 100644
--- a/vcl/unx/source/inc/copyflnk_mask.h
+++ b/vcl/unx/source/inc/copyflnk_mask.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: copyflnk_mask.h,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/vcl/unx/source/inc/crook_curs.h b/vcl/unx/source/inc/crook_curs.h
index 56e155d0ae48..6e4d5f613959 100644
--- a/vcl/unx/source/inc/crook_curs.h
+++ b/vcl/unx/source/inc/crook_curs.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: crook_curs.h,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/vcl/unx/source/inc/crook_mask.h b/vcl/unx/source/inc/crook_mask.h
index 6553b9301646..7493f3a501dc 100644
--- a/vcl/unx/source/inc/crook_mask.h
+++ b/vcl/unx/source/inc/crook_mask.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: crook_mask.h,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/vcl/unx/source/inc/crop_curs.h b/vcl/unx/source/inc/crop_curs.h
index 5b53167de585..a546ce6c1ba8 100644
--- a/vcl/unx/source/inc/crop_curs.h
+++ b/vcl/unx/source/inc/crop_curs.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: crop_curs.h,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/vcl/unx/source/inc/crop_mask.h b/vcl/unx/source/inc/crop_mask.h
index 36191240828b..5a10726cf36c 100644
--- a/vcl/unx/source/inc/crop_mask.h
+++ b/vcl/unx/source/inc/crop_mask.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: crop_mask.h,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/vcl/unx/source/inc/detective_curs.h b/vcl/unx/source/inc/detective_curs.h
index 2538d5dd264e..9d8a0d6a1c47 100644
--- a/vcl/unx/source/inc/detective_curs.h
+++ b/vcl/unx/source/inc/detective_curs.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: detective_curs.h,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/vcl/unx/source/inc/detective_mask.h b/vcl/unx/source/inc/detective_mask.h
index 6bfa45ebf0c5..14402a37b641 100644
--- a/vcl/unx/source/inc/detective_mask.h
+++ b/vcl/unx/source/inc/detective_mask.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: detective_mask.h,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/vcl/unx/source/inc/drawarc_curs.h b/vcl/unx/source/inc/drawarc_curs.h
index 9b456ecce800..daea116e186e 100644
--- a/vcl/unx/source/inc/drawarc_curs.h
+++ b/vcl/unx/source/inc/drawarc_curs.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: drawarc_curs.h,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/vcl/unx/source/inc/drawarc_mask.h b/vcl/unx/source/inc/drawarc_mask.h
index db166b64ef7e..c9e2b6dd8737 100644
--- a/vcl/unx/source/inc/drawarc_mask.h
+++ b/vcl/unx/source/inc/drawarc_mask.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: drawarc_mask.h,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/vcl/unx/source/inc/drawbezier_curs.h b/vcl/unx/source/inc/drawbezier_curs.h
index d9abb4f59959..ea677d4734aa 100644
--- a/vcl/unx/source/inc/drawbezier_curs.h
+++ b/vcl/unx/source/inc/drawbezier_curs.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: drawbezier_curs.h,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/vcl/unx/source/inc/drawbezier_mask.h b/vcl/unx/source/inc/drawbezier_mask.h
index 7b7fd0aab505..17c1075d07a7 100644
--- a/vcl/unx/source/inc/drawbezier_mask.h
+++ b/vcl/unx/source/inc/drawbezier_mask.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: drawbezier_mask.h,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/vcl/unx/source/inc/drawcaption_curs.h b/vcl/unx/source/inc/drawcaption_curs.h
index 0f544e0dc3e8..3fe104f3673e 100644
--- a/vcl/unx/source/inc/drawcaption_curs.h
+++ b/vcl/unx/source/inc/drawcaption_curs.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: drawcaption_curs.h,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/vcl/unx/source/inc/drawcaption_mask.h b/vcl/unx/source/inc/drawcaption_mask.h
index 2042b93310db..70b39e37b65e 100644
--- a/vcl/unx/source/inc/drawcaption_mask.h
+++ b/vcl/unx/source/inc/drawcaption_mask.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: drawcaption_mask.h,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/vcl/unx/source/inc/drawcirclecut_curs.h b/vcl/unx/source/inc/drawcirclecut_curs.h
index 19797ab63d0f..dc632873dd3b 100644
--- a/vcl/unx/source/inc/drawcirclecut_curs.h
+++ b/vcl/unx/source/inc/drawcirclecut_curs.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: drawcirclecut_curs.h,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/vcl/unx/source/inc/drawcirclecut_mask.h b/vcl/unx/source/inc/drawcirclecut_mask.h
index 6cf82ef24226..1f96be33b86a 100644
--- a/vcl/unx/source/inc/drawcirclecut_mask.h
+++ b/vcl/unx/source/inc/drawcirclecut_mask.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: drawcirclecut_mask.h,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/vcl/unx/source/inc/drawconnect_curs.h b/vcl/unx/source/inc/drawconnect_curs.h
index 6774b7613886..994f34b96e0e 100644
--- a/vcl/unx/source/inc/drawconnect_curs.h
+++ b/vcl/unx/source/inc/drawconnect_curs.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: drawconnect_curs.h,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/vcl/unx/source/inc/drawconnect_mask.h b/vcl/unx/source/inc/drawconnect_mask.h
index 1b3545a9d32f..187cf31cfd1a 100644
--- a/vcl/unx/source/inc/drawconnect_mask.h
+++ b/vcl/unx/source/inc/drawconnect_mask.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: drawconnect_mask.h,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/vcl/unx/source/inc/drawcrook_curs.h b/vcl/unx/source/inc/drawcrook_curs.h
index c842cb334fec..4fdba0e8442a 100644
--- a/vcl/unx/source/inc/drawcrook_curs.h
+++ b/vcl/unx/source/inc/drawcrook_curs.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: drawcrook_curs.h,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/vcl/unx/source/inc/drawcrook_mask.h b/vcl/unx/source/inc/drawcrook_mask.h
index 73c09f4ff7a0..657fcff2b4fd 100644
--- a/vcl/unx/source/inc/drawcrook_mask.h
+++ b/vcl/unx/source/inc/drawcrook_mask.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: drawcrook_mask.h,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/vcl/unx/source/inc/drawcrop_curs.h b/vcl/unx/source/inc/drawcrop_curs.h
index ed16f45054a3..7f574e1ab351 100644
--- a/vcl/unx/source/inc/drawcrop_curs.h
+++ b/vcl/unx/source/inc/drawcrop_curs.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: drawcrop_curs.h,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/vcl/unx/source/inc/drawcrop_mask.h b/vcl/unx/source/inc/drawcrop_mask.h
index 133a5d603b03..ac2e8885bdbb 100644
--- a/vcl/unx/source/inc/drawcrop_mask.h
+++ b/vcl/unx/source/inc/drawcrop_mask.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: drawcrop_mask.h,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/vcl/unx/source/inc/drawellipse_curs.h b/vcl/unx/source/inc/drawellipse_curs.h
index a071d46ccab1..bddc330d71d2 100644
--- a/vcl/unx/source/inc/drawellipse_curs.h
+++ b/vcl/unx/source/inc/drawellipse_curs.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: drawellipse_curs.h,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/vcl/unx/source/inc/drawellipse_mask.h b/vcl/unx/source/inc/drawellipse_mask.h
index 11dd3ec41a42..0ac5f200eab1 100644
--- a/vcl/unx/source/inc/drawellipse_mask.h
+++ b/vcl/unx/source/inc/drawellipse_mask.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: drawellipse_mask.h,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/vcl/unx/source/inc/drawfreehand_curs.h b/vcl/unx/source/inc/drawfreehand_curs.h
index 637eb77e96c4..75795c088c8e 100644
--- a/vcl/unx/source/inc/drawfreehand_curs.h
+++ b/vcl/unx/source/inc/drawfreehand_curs.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: drawfreehand_curs.h,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/vcl/unx/source/inc/drawfreehand_mask.h b/vcl/unx/source/inc/drawfreehand_mask.h
index aaca492baa30..29edf44a9999 100644
--- a/vcl/unx/source/inc/drawfreehand_mask.h
+++ b/vcl/unx/source/inc/drawfreehand_mask.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: drawfreehand_mask.h,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/vcl/unx/source/inc/drawline_curs.h b/vcl/unx/source/inc/drawline_curs.h
index 15535e6ef7e1..2d2aa162fac6 100644
--- a/vcl/unx/source/inc/drawline_curs.h
+++ b/vcl/unx/source/inc/drawline_curs.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: drawline_curs.h,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/vcl/unx/source/inc/drawline_mask.h b/vcl/unx/source/inc/drawline_mask.h
index 26916a62076a..d66b0fd09aaa 100644
--- a/vcl/unx/source/inc/drawline_mask.h
+++ b/vcl/unx/source/inc/drawline_mask.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: drawline_mask.h,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/vcl/unx/source/inc/drawmirror_curs.h b/vcl/unx/source/inc/drawmirror_curs.h
index cea7ecb78419..3f61e751befb 100644
--- a/vcl/unx/source/inc/drawmirror_curs.h
+++ b/vcl/unx/source/inc/drawmirror_curs.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: drawmirror_curs.h,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/vcl/unx/source/inc/drawmirror_mask.h b/vcl/unx/source/inc/drawmirror_mask.h
index 088608fcbd28..5394dd74576a 100644
--- a/vcl/unx/source/inc/drawmirror_mask.h
+++ b/vcl/unx/source/inc/drawmirror_mask.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: drawmirror_mask.h,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/vcl/unx/source/inc/drawpie_curs.h b/vcl/unx/source/inc/drawpie_curs.h
index a94ec3e0272b..327b15258d3d 100644
--- a/vcl/unx/source/inc/drawpie_curs.h
+++ b/vcl/unx/source/inc/drawpie_curs.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: drawpie_curs.h,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/vcl/unx/source/inc/drawpie_mask.h b/vcl/unx/source/inc/drawpie_mask.h
index 5154349421f9..6b5e5ac4ff0d 100644
--- a/vcl/unx/source/inc/drawpie_mask.h
+++ b/vcl/unx/source/inc/drawpie_mask.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: drawpie_mask.h,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/vcl/unx/source/inc/drawpolygon_curs.h b/vcl/unx/source/inc/drawpolygon_curs.h
index b1a5cccf8bcd..ee68c707444c 100644
--- a/vcl/unx/source/inc/drawpolygon_curs.h
+++ b/vcl/unx/source/inc/drawpolygon_curs.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: drawpolygon_curs.h,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/vcl/unx/source/inc/drawpolygon_mask.h b/vcl/unx/source/inc/drawpolygon_mask.h
index 7aabdb6f9be1..8b82e237233c 100644
--- a/vcl/unx/source/inc/drawpolygon_mask.h
+++ b/vcl/unx/source/inc/drawpolygon_mask.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: drawpolygon_mask.h,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/vcl/unx/source/inc/drawrect_curs.h b/vcl/unx/source/inc/drawrect_curs.h
index ba848e93b55f..c2508d37fad5 100644
--- a/vcl/unx/source/inc/drawrect_curs.h
+++ b/vcl/unx/source/inc/drawrect_curs.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: drawrect_curs.h,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/vcl/unx/source/inc/drawrect_mask.h b/vcl/unx/source/inc/drawrect_mask.h
index 27b93a1837cc..955152f312c9 100644
--- a/vcl/unx/source/inc/drawrect_mask.h
+++ b/vcl/unx/source/inc/drawrect_mask.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: drawrect_mask.h,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/vcl/unx/source/inc/drawtext_curs.h b/vcl/unx/source/inc/drawtext_curs.h
index 9b94794984f2..c5049670b9ec 100644
--- a/vcl/unx/source/inc/drawtext_curs.h
+++ b/vcl/unx/source/inc/drawtext_curs.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: drawtext_curs.h,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/vcl/unx/source/inc/drawtext_mask.h b/vcl/unx/source/inc/drawtext_mask.h
index 56e23ea0ba8b..e27ce2514306 100644
--- a/vcl/unx/source/inc/drawtext_mask.h
+++ b/vcl/unx/source/inc/drawtext_mask.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: drawtext_mask.h,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/vcl/unx/source/inc/fill_curs.h b/vcl/unx/source/inc/fill_curs.h
index d04621e7ad43..792ea50e4f00 100644
--- a/vcl/unx/source/inc/fill_curs.h
+++ b/vcl/unx/source/inc/fill_curs.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: fill_curs.h,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/vcl/unx/source/inc/fill_mask.h b/vcl/unx/source/inc/fill_mask.h
index 083eca36a0a9..67681f243f7b 100644
--- a/vcl/unx/source/inc/fill_mask.h
+++ b/vcl/unx/source/inc/fill_mask.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: fill_mask.h,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/vcl/unx/source/inc/hshear_curs.h b/vcl/unx/source/inc/hshear_curs.h
index b7eeb6f9eb0e..7f6092b648de 100644
--- a/vcl/unx/source/inc/hshear_curs.h
+++ b/vcl/unx/source/inc/hshear_curs.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: hshear_curs.h,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/vcl/unx/source/inc/hshear_mask.h b/vcl/unx/source/inc/hshear_mask.h
index c22eb28a897b..6d09b3b0af01 100644
--- a/vcl/unx/source/inc/hshear_mask.h
+++ b/vcl/unx/source/inc/hshear_mask.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: hshear_mask.h,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/vcl/unx/source/inc/invert50.h b/vcl/unx/source/inc/invert50.h
index f8440970dfc1..7c0d00ce8fa4 100644
--- a/vcl/unx/source/inc/invert50.h
+++ b/vcl/unx/source/inc/invert50.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: invert50.h,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/vcl/unx/source/inc/linkdata_curs.h b/vcl/unx/source/inc/linkdata_curs.h
index 01ea8678acd2..c60edc3b99d0 100644
--- a/vcl/unx/source/inc/linkdata_curs.h
+++ b/vcl/unx/source/inc/linkdata_curs.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: linkdata_curs.h,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/vcl/unx/source/inc/linkdata_mask.h b/vcl/unx/source/inc/linkdata_mask.h
index b4207ad40dcf..cf0f89f63b1b 100644
--- a/vcl/unx/source/inc/linkdata_mask.h
+++ b/vcl/unx/source/inc/linkdata_mask.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: linkdata_mask.h,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/vcl/unx/source/inc/linkfile_curs.h b/vcl/unx/source/inc/linkfile_curs.h
index 06fe83fb63ed..fb676ae2a04b 100644
--- a/vcl/unx/source/inc/linkfile_curs.h
+++ b/vcl/unx/source/inc/linkfile_curs.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: linkfile_curs.h,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/vcl/unx/source/inc/linkfile_mask.h b/vcl/unx/source/inc/linkfile_mask.h
index b0b302eb21bc..28ff46c4fae4 100644
--- a/vcl/unx/source/inc/linkfile_mask.h
+++ b/vcl/unx/source/inc/linkfile_mask.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: linkfile_mask.h,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/vcl/unx/source/inc/magnify_curs.h b/vcl/unx/source/inc/magnify_curs.h
index 70922d3a2386..76114ca410d5 100644
--- a/vcl/unx/source/inc/magnify_curs.h
+++ b/vcl/unx/source/inc/magnify_curs.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: magnify_curs.h,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/vcl/unx/source/inc/magnify_mask.h b/vcl/unx/source/inc/magnify_mask.h
index 4176314f9d6b..db4213943b6e 100644
--- a/vcl/unx/source/inc/magnify_mask.h
+++ b/vcl/unx/source/inc/magnify_mask.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: magnify_mask.h,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/vcl/unx/source/inc/mirror_curs.h b/vcl/unx/source/inc/mirror_curs.h
index 1539552372fa..0f0f1b360224 100644
--- a/vcl/unx/source/inc/mirror_curs.h
+++ b/vcl/unx/source/inc/mirror_curs.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: mirror_curs.h,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/vcl/unx/source/inc/mirror_mask.h b/vcl/unx/source/inc/mirror_mask.h
index a6362c14ca95..da9c00435162 100644
--- a/vcl/unx/source/inc/mirror_mask.h
+++ b/vcl/unx/source/inc/mirror_mask.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: mirror_mask.h,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/vcl/unx/source/inc/movebezierweight_curs.h b/vcl/unx/source/inc/movebezierweight_curs.h
index 9813af9573b6..a1ece2d925e9 100644
--- a/vcl/unx/source/inc/movebezierweight_curs.h
+++ b/vcl/unx/source/inc/movebezierweight_curs.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: movebezierweight_curs.h,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/vcl/unx/source/inc/movebezierweight_mask.h b/vcl/unx/source/inc/movebezierweight_mask.h
index 20414839588e..27e0d8c703db 100644
--- a/vcl/unx/source/inc/movebezierweight_mask.h
+++ b/vcl/unx/source/inc/movebezierweight_mask.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: movebezierweight_mask.h,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/vcl/unx/source/inc/movedata_curs.h b/vcl/unx/source/inc/movedata_curs.h
index 36845d5e9d1e..b79412bc3f41 100644
--- a/vcl/unx/source/inc/movedata_curs.h
+++ b/vcl/unx/source/inc/movedata_curs.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: movedata_curs.h,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/vcl/unx/source/inc/movedata_mask.h b/vcl/unx/source/inc/movedata_mask.h
index facca718b8bf..e25d0837d8dc 100644
--- a/vcl/unx/source/inc/movedata_mask.h
+++ b/vcl/unx/source/inc/movedata_mask.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: movedata_mask.h,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/vcl/unx/source/inc/movedlnk_curs.h b/vcl/unx/source/inc/movedlnk_curs.h
index fba1f8a7653a..56608b8153a6 100644
--- a/vcl/unx/source/inc/movedlnk_curs.h
+++ b/vcl/unx/source/inc/movedlnk_curs.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: movedlnk_curs.h,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/vcl/unx/source/inc/movedlnk_mask.h b/vcl/unx/source/inc/movedlnk_mask.h
index 494ba14fc019..2aa3eb4b277d 100644
--- a/vcl/unx/source/inc/movedlnk_mask.h
+++ b/vcl/unx/source/inc/movedlnk_mask.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: movedlnk_mask.h,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/vcl/unx/source/inc/movefile_curs.h b/vcl/unx/source/inc/movefile_curs.h
index 2330fa62162f..ed3a11e7f49d 100644
--- a/vcl/unx/source/inc/movefile_curs.h
+++ b/vcl/unx/source/inc/movefile_curs.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: movefile_curs.h,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/vcl/unx/source/inc/movefile_mask.h b/vcl/unx/source/inc/movefile_mask.h
index 2e9d5b72f491..668d8d7e8015 100644
--- a/vcl/unx/source/inc/movefile_mask.h
+++ b/vcl/unx/source/inc/movefile_mask.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: movefile_mask.h,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/vcl/unx/source/inc/movefiles_curs.h b/vcl/unx/source/inc/movefiles_curs.h
index f7231c508153..148fe2e72a5e 100644
--- a/vcl/unx/source/inc/movefiles_curs.h
+++ b/vcl/unx/source/inc/movefiles_curs.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: movefiles_curs.h,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/vcl/unx/source/inc/movefiles_mask.h b/vcl/unx/source/inc/movefiles_mask.h
index fdfa9be75661..dc990dc5cb61 100644
--- a/vcl/unx/source/inc/movefiles_mask.h
+++ b/vcl/unx/source/inc/movefiles_mask.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: movefiles_mask.h,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/vcl/unx/source/inc/moveflnk_curs.h b/vcl/unx/source/inc/moveflnk_curs.h
index 875103c87c77..7f48bc4506fc 100644
--- a/vcl/unx/source/inc/moveflnk_curs.h
+++ b/vcl/unx/source/inc/moveflnk_curs.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: moveflnk_curs.h,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/vcl/unx/source/inc/moveflnk_mask.h b/vcl/unx/source/inc/moveflnk_mask.h
index 40e21546f417..a25b7ee18960 100644
--- a/vcl/unx/source/inc/moveflnk_mask.h
+++ b/vcl/unx/source/inc/moveflnk_mask.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: moveflnk_mask.h,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/vcl/unx/source/inc/movepoint_curs.h b/vcl/unx/source/inc/movepoint_curs.h
index 6b2f4ace4d1d..e3b20bd8edf9 100644
--- a/vcl/unx/source/inc/movepoint_curs.h
+++ b/vcl/unx/source/inc/movepoint_curs.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: movepoint_curs.h,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/vcl/unx/source/inc/movepoint_mask.h b/vcl/unx/source/inc/movepoint_mask.h
index 5db40bd8e6e7..e4fae36c023c 100644
--- a/vcl/unx/source/inc/movepoint_mask.h
+++ b/vcl/unx/source/inc/movepoint_mask.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: movepoint_mask.h,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/vcl/unx/source/inc/nodrop_curs.h b/vcl/unx/source/inc/nodrop_curs.h
index 725b0fccf91b..8e208e32f293 100644
--- a/vcl/unx/source/inc/nodrop_curs.h
+++ b/vcl/unx/source/inc/nodrop_curs.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: nodrop_curs.h,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/vcl/unx/source/inc/nodrop_mask.h b/vcl/unx/source/inc/nodrop_mask.h
index ef67a2bc2642..7cbecef2c60f 100644
--- a/vcl/unx/source/inc/nodrop_mask.h
+++ b/vcl/unx/source/inc/nodrop_mask.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: nodrop_mask.h,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/vcl/unx/source/inc/null_curs.h b/vcl/unx/source/inc/null_curs.h
index f81b1d2f44cf..19d4130d4b5d 100644
--- a/vcl/unx/source/inc/null_curs.h
+++ b/vcl/unx/source/inc/null_curs.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: null_curs.h,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/vcl/unx/source/inc/null_mask.h b/vcl/unx/source/inc/null_mask.h
index eab133924e90..a657cfa54af4 100644
--- a/vcl/unx/source/inc/null_mask.h
+++ b/vcl/unx/source/inc/null_mask.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: null_mask.h,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/vcl/unx/source/inc/pivotcol_curs.h b/vcl/unx/source/inc/pivotcol_curs.h
index 36a53f568317..22873985daf0 100644
--- a/vcl/unx/source/inc/pivotcol_curs.h
+++ b/vcl/unx/source/inc/pivotcol_curs.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: pivotcol_curs.h,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/vcl/unx/source/inc/pivotcol_mask.h b/vcl/unx/source/inc/pivotcol_mask.h
index 9e991ec49d06..911eede87ed4 100644
--- a/vcl/unx/source/inc/pivotcol_mask.h
+++ b/vcl/unx/source/inc/pivotcol_mask.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: pivotcol_mask.h,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/vcl/unx/source/inc/pivotdel_curs.h b/vcl/unx/source/inc/pivotdel_curs.h
index 42921174d257..e0dcbc14a6d6 100644
--- a/vcl/unx/source/inc/pivotdel_curs.h
+++ b/vcl/unx/source/inc/pivotdel_curs.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: pivotdel_curs.h,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/vcl/unx/source/inc/pivotdel_mask.h b/vcl/unx/source/inc/pivotdel_mask.h
index 50fdb123dd40..147bc2da410d 100644
--- a/vcl/unx/source/inc/pivotdel_mask.h
+++ b/vcl/unx/source/inc/pivotdel_mask.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: pivotdel_mask.h,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/vcl/unx/source/inc/pivotfld_curs.h b/vcl/unx/source/inc/pivotfld_curs.h
index 0cf54377b5bd..1daf4f553275 100644
--- a/vcl/unx/source/inc/pivotfld_curs.h
+++ b/vcl/unx/source/inc/pivotfld_curs.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: pivotfld_curs.h,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/vcl/unx/source/inc/pivotfld_mask.h b/vcl/unx/source/inc/pivotfld_mask.h
index 5a0b13655ca4..6d62d8bbda46 100644
--- a/vcl/unx/source/inc/pivotfld_mask.h
+++ b/vcl/unx/source/inc/pivotfld_mask.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: pivotfld_mask.h,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/vcl/unx/source/inc/pivotrow_curs.h b/vcl/unx/source/inc/pivotrow_curs.h
index b82188bbe0d0..75f4965f2582 100644
--- a/vcl/unx/source/inc/pivotrow_curs.h
+++ b/vcl/unx/source/inc/pivotrow_curs.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: pivotrow_curs.h,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/vcl/unx/source/inc/pivotrow_mask.h b/vcl/unx/source/inc/pivotrow_mask.h
index 3e1e42b41a31..a8896d0975f9 100644
--- a/vcl/unx/source/inc/pivotrow_mask.h
+++ b/vcl/unx/source/inc/pivotrow_mask.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: pivotrow_mask.h,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/vcl/unx/source/inc/rotate_curs.h b/vcl/unx/source/inc/rotate_curs.h
index 89f7984b73e2..f9c57674dfb2 100644
--- a/vcl/unx/source/inc/rotate_curs.h
+++ b/vcl/unx/source/inc/rotate_curs.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: rotate_curs.h,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/vcl/unx/source/inc/rotate_mask.h b/vcl/unx/source/inc/rotate_mask.h
index cc8f7fa2f46b..9fcff18925f0 100644
--- a/vcl/unx/source/inc/rotate_mask.h
+++ b/vcl/unx/source/inc/rotate_mask.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: rotate_mask.h,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/vcl/unx/source/inc/salcursors.h b/vcl/unx/source/inc/salcursors.h
index ad9814107bff..e8a63d6195aa 100644
--- a/vcl/unx/source/inc/salcursors.h
+++ b/vcl/unx/source/inc/salcursors.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: salcursors.h,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/vcl/unx/source/inc/timemove_curs.h b/vcl/unx/source/inc/timemove_curs.h
index 46f5b3287c6f..252a702caf77 100644
--- a/vcl/unx/source/inc/timemove_curs.h
+++ b/vcl/unx/source/inc/timemove_curs.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: timemove_curs.h,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/vcl/unx/source/inc/timemove_mask.h b/vcl/unx/source/inc/timemove_mask.h
index e6cad2d52515..b7a9542a64c6 100644
--- a/vcl/unx/source/inc/timemove_mask.h
+++ b/vcl/unx/source/inc/timemove_mask.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: timemove_mask.h,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/vcl/unx/source/inc/timesize_curs.h b/vcl/unx/source/inc/timesize_curs.h
index e7e96a904983..61e53971290e 100644
--- a/vcl/unx/source/inc/timesize_curs.h
+++ b/vcl/unx/source/inc/timesize_curs.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: timesize_curs.h,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/vcl/unx/source/inc/timesize_mask.h b/vcl/unx/source/inc/timesize_mask.h
index ef48b5ee8334..3c4333c5e7b8 100644
--- a/vcl/unx/source/inc/timesize_mask.h
+++ b/vcl/unx/source/inc/timesize_mask.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: timesize_mask.h,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/vcl/unx/source/inc/vshear_curs.h b/vcl/unx/source/inc/vshear_curs.h
index a3b01ec1849a..87357c0a5027 100644
--- a/vcl/unx/source/inc/vshear_curs.h
+++ b/vcl/unx/source/inc/vshear_curs.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: vshear_curs.h,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/vcl/unx/source/inc/vshear_mask.h b/vcl/unx/source/inc/vshear_mask.h
index 3e6dff16482c..be77728c13f9 100644
--- a/vcl/unx/source/inc/vshear_mask.h
+++ b/vcl/unx/source/inc/vshear_mask.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: vshear_mask.h,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/vcl/unx/source/plugadapt/makefile.mk b/vcl/unx/source/plugadapt/makefile.mk
index ca71331fae48..af409c04af35 100644
--- a/vcl/unx/source/plugadapt/makefile.mk
+++ b/vcl/unx/source/plugadapt/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/plugadapt/salplug.cxx b/vcl/unx/source/plugadapt/salplug.cxx
index f1c63b8abee7..c42c22bc0592 100644
--- a/vcl/unx/source/plugadapt/salplug.cxx
+++ b/vcl/unx/source/plugadapt/salplug.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
  *
@@ -219,8 +219,10 @@ SalInstance *CreateSalInstance()
 
     if( !(pUsePlugin && *pUsePlugin) )
         pInst = check_headless_plugin();
+    else
+        pInst = tryInstance( OUString::createFromAscii( pUsePlugin ) );
 
-    if( ! pInst && !(pUsePlugin && *pUsePlugin) )
+    if( ! pInst )
         pInst = autodetect_plugin();
 
     // fallback to gen
diff --git a/vcl/unx/source/printer/cupsmgr.cxx b/vcl/unx/source/printer/cupsmgr.cxx
index d0c7f184fb06..e245b2548c79 100644
--- a/vcl/unx/source/printer/cupsmgr.cxx
+++ b/vcl/unx/source/printer/cupsmgr.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: cupsmgr.cxx,v $
- * $Revision: 1.28 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -533,6 +530,10 @@ void CUPSManager::initialize()
                                                       pDest->options );
     if( pOpt )
         m_bUseIncludeFeature = true;
+    // do not send include JobPatch; CUPS will insert that itself
+    // TODO: currently unknwon which versions of CUPS insert JobPatches
+    // so currently it is assumed CUPS = don't insert JobPatch files
+    m_bUseJobPatch = false;
 
     rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
     int nPrinter = m_nDests;
diff --git a/vcl/unx/source/printer/jobdata.cxx b/vcl/unx/source/printer/jobdata.cxx
index 51e171d578d9..a1bca9441f77 100644
--- a/vcl/unx/source/printer/jobdata.cxx
+++ b/vcl/unx/source/printer/jobdata.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: jobdata.cxx,v $
- * $Revision: 1.10 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -64,6 +61,28 @@ JobData& JobData::operator=(const JobData& rRight)
     return *this;
 }
 
+void JobData::setCollate( bool bCollate )
+{
+    const PPDParser* pParser = m_aContext.getParser();
+    if( pParser )
+    {
+        const PPDKey* pKey = pParser->getKey( String( RTL_CONSTASCII_USTRINGPARAM( "Collate" ) ) );
+        if( pKey )
+        {
+            const PPDValue* pVal = NULL;
+            if( bCollate )
+                pVal = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "True" ) ) );
+            else
+            {
+                pVal = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "False" ) ) );
+                if( ! pVal )
+                    pVal = pKey->getValue( String( RTL_CONSTASCII_USTRINGPARAM( "None" ) ) );
+            }
+            m_aContext.setValue( pKey, pVal );
+        }
+    }
+}
+
 bool JobData::getStreamBuffer( void*& pData, int& bytes )
 {
     // consistency checks
diff --git a/vcl/unx/source/printer/makefile.mk b/vcl/unx/source/printer/makefile.mk
index df184adc00fa..5cd35088acd9 100644
--- a/vcl/unx/source/printer/makefile.mk
+++ b/vcl/unx/source/printer/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/printer/ppdparser.cxx b/vcl/unx/source/printer/ppdparser.cxx
index 95bc7bca41ca..971db860cf42 100644
--- a/vcl/unx/source/printer/ppdparser.cxx
+++ b/vcl/unx/source/printer/ppdparser.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: ppdparser.cxx,v $
- * $Revision: 1.27 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -39,6 +36,7 @@
 #include "vcl/ppdparser.hxx"
 #include "vcl/strhelper.hxx"
 #include "vcl/helper.hxx"
+#include "vcl/svapp.hxx"
 #include "cupsmgr.hxx"
 #include "tools/debug.hxx"
 #include "tools/urlobj.hxx"
@@ -51,6 +49,202 @@
 #include "rtl/strbuf.hxx"
 #include "rtl/ustrbuf.hxx"
 
+#include "com/sun/star/lang/Locale.hpp"
+
+namespace psp
+{
+    class PPDTranslator
+    {
+        struct LocaleEqual
+        {
+            bool operator()(const com::sun::star::lang::Locale& i_rLeft,
+                            const com::sun::star::lang::Locale& i_rRight) const
+            {
+                return i_rLeft.Language.equals( i_rRight.Language ) &&
+                i_rLeft.Country.equals( i_rRight.Country ) &&
+                i_rLeft.Variant.equals( i_rRight.Variant );
+            }
+        };
+
+        struct LocaleHash
+        {
+            size_t operator()(const com::sun::star::lang::Locale& rLocale) const
+            { return
+                  (size_t)rLocale.Language.hashCode()
+                ^ (size_t)rLocale.Country.hashCode()
+                ^ (size_t)rLocale.Variant.hashCode()
+                ;
+            }
+        };
+
+        typedef std::hash_map< com::sun::star::lang::Locale, rtl::OUString, LocaleHash, LocaleEqual > translation_map;
+        typedef std::hash_map< rtl::OUString, translation_map, rtl::OUStringHash > key_translation_map;
+
+        key_translation_map     m_aTranslations;
+        public:
+        PPDTranslator() {}
+        ~PPDTranslator() {}
+
+
+        void insertValue(
+            const rtl::OUString& i_rKey,
+            const rtl::OUString& i_rOption,
+            const rtl::OUString& i_rValue,
+            const rtl::OUString& i_rTranslation,
+            const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale()
+            );
+
+        void insertOption( const rtl::OUString& i_rKey,
+                           const rtl::OUString& i_rOption,
+                           const rtl::OUString& i_rTranslation,
+                           const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() )
+        {
+            insertValue( i_rKey, i_rOption, rtl::OUString(), i_rTranslation, i_rLocale );
+        }
+
+        void insertKey( const rtl::OUString& i_rKey,
+                        const rtl::OUString& i_rTranslation,
+                        const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() )
+        {
+            insertValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rTranslation, i_rLocale );
+        }
+
+        rtl::OUString translateValue(
+            const rtl::OUString& i_rKey,
+            const rtl::OUString& i_rOption,
+            const rtl::OUString& i_rValue,
+            const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale()
+            ) const;
+
+        rtl::OUString translateOption( const rtl::OUString& i_rKey,
+                                       const rtl::OUString& i_rOption,
+                                       const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const
+        {
+            return translateValue( i_rKey, i_rOption, rtl::OUString(), i_rLocale );
+        }
+
+        rtl::OUString translateKey( const rtl::OUString& i_rKey,
+                                    const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const
+        {
+            return translateValue( i_rKey, rtl::OUString(), rtl::OUString(), i_rLocale );
+        }
+    };
+
+    static com::sun::star::lang::Locale normalizeInputLocale(
+        const com::sun::star::lang::Locale& i_rLocale,
+        bool bInsertDefault = false
+        )
+    {
+        com::sun::star::lang::Locale aLoc( i_rLocale );
+        if( bInsertDefault && aLoc.Language.getLength() == 0 )
+        {
+            // empty locale requested, fill in application UI locale
+            aLoc = Application::GetSettings().GetUILocale();
+
+            #if OSL_DEBUG_LEVEL > 1
+            static const char* pEnvLocale = getenv( "SAL_PPDPARSER_LOCALE" );
+            if( pEnvLocale && *pEnvLocale )
+            {
+                rtl::OString aStr( pEnvLocale );
+                sal_Int32 nLen = aStr.getLength();
+                aLoc.Language = rtl::OStringToOUString( aStr.copy( 0, nLen > 2 ? 2 : nLen ), RTL_TEXTENCODING_MS_1252 );
+                if( nLen >=5 && aStr.getStr()[2] == '_' )
+                    aLoc.Country = rtl::OStringToOUString( aStr.copy( 3, 2 ), RTL_TEXTENCODING_MS_1252 );
+                else
+                    aLoc.Country = rtl::OUString();
+                aLoc.Variant = rtl::OUString();
+            }
+            #endif
+        }
+        aLoc.Language = aLoc.Language.toAsciiLowerCase();
+        aLoc.Country  = aLoc.Country.toAsciiUpperCase();
+        aLoc.Variant  = aLoc.Variant.toAsciiUpperCase();
+
+        return aLoc;
+    }
+
+    void PPDTranslator::insertValue(
+        const rtl::OUString& i_rKey,
+        const rtl::OUString& i_rOption,
+        const rtl::OUString& i_rValue,
+        const rtl::OUString& i_rTranslation,
+        const com::sun::star::lang::Locale& i_rLocale
+        )
+    {
+        rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 );
+        aKey.append( i_rKey );
+        if( i_rOption.getLength() || i_rValue.getLength() )
+        {
+            aKey.append( sal_Unicode( ':' ) );
+            aKey.append( i_rOption );
+        }
+        if( i_rValue.getLength() )
+        {
+            aKey.append( sal_Unicode( ':' ) );
+            aKey.append( i_rValue );
+        }
+        if( aKey.getLength() && i_rTranslation.getLength() )
+        {
+            rtl::OUString aK( aKey.makeStringAndClear() );
+            com::sun::star::lang::Locale aLoc;
+            aLoc.Language = i_rLocale.Language.toAsciiLowerCase();
+            aLoc.Country  = i_rLocale.Country.toAsciiUpperCase();
+            aLoc.Variant  = i_rLocale.Variant.toAsciiUpperCase();
+            m_aTranslations[ aK ][ aLoc ] = i_rTranslation;
+        }
+    }
+
+    rtl::OUString PPDTranslator::translateValue(
+        const rtl::OUString& i_rKey,
+        const rtl::OUString& i_rOption,
+        const rtl::OUString& i_rValue,
+        const com::sun::star::lang::Locale& i_rLocale
+        ) const
+    {
+        rtl::OUString aResult;
+
+        rtl::OUStringBuffer aKey( i_rKey.getLength() + i_rOption.getLength() + i_rValue.getLength() + 2 );
+        aKey.append( i_rKey );
+        if( i_rOption.getLength() || i_rValue.getLength() )
+        {
+            aKey.append( sal_Unicode( ':' ) );
+            aKey.append( i_rOption );
+        }
+        if( i_rValue.getLength() )
+        {
+            aKey.append( sal_Unicode( ':' ) );
+            aKey.append( i_rValue );
+        }
+        if( aKey.getLength() )
+        {
+            rtl::OUString aK( aKey.makeStringAndClear() );
+            key_translation_map::const_iterator it = m_aTranslations.find( aK );
+            if( it != m_aTranslations.end() )
+            {
+                const translation_map& rMap( it->second );
+
+                com::sun::star::lang::Locale aLoc( normalizeInputLocale( i_rLocale, true ) );
+                for( int nTry = 0; nTry < 4; nTry++ )
+                {
+                    translation_map::const_iterator tr = rMap.find( aLoc );
+                    if( tr != rMap.end() )
+                    {
+                        aResult = tr->second;
+                        break;
+                    }
+                    switch( nTry )
+                    {
+                    case 0: aLoc.Variant  = rtl::OUString();break;
+                    case 1: aLoc.Country  = rtl::OUString();break;
+                    case 2: aLoc.Language = rtl::OUString();break;
+                    }
+                }
+            }
+        }
+        return aResult;
+    }
+}
+
 using namespace psp;
 using namespace rtl;
 
@@ -481,7 +675,8 @@ PPDParser::PPDParser( const String& rFile ) :
         m_pResolutions( NULL ),
         m_pDefaultDuplexType( NULL ),
         m_pDuplexTypes( NULL ),
-        m_pFontList( NULL )
+        m_pFontList( NULL ),
+        m_pTranslator( new PPDTranslator() )
 {
     // read in the file
     std::list< ByteString > aLines;
@@ -648,6 +843,7 @@ PPDParser::~PPDParser()
 {
     for( PPDParser::hash_type::iterator it = m_aKeys.begin(); it != m_aKeys.end(); ++it )
         delete it->second;
+    delete m_pTranslator;
 }
 
 void PPDParser::insertKey( const String& rKey, PPDKey* pKey )
@@ -687,11 +883,11 @@ static sal_uInt8 getNibble( sal_Char cChar )
     return nRet;
 }
 
-String PPDParser::handleTranslation( const ByteString& rString )
+String PPDParser::handleTranslation( const ByteString& i_rString, bool bIsGlobalized )
 {
-    int nOrigLen = rString.Len();
+    int nOrigLen = i_rString.Len();
     OStringBuffer aTrans( nOrigLen );
-    const sal_Char* pStr = rString.GetBuffer();
+    const sal_Char* pStr = i_rString.GetBuffer();
     const sal_Char* pEnd = pStr + nOrigLen;
     while( pStr < pEnd )
     {
@@ -710,14 +906,11 @@ String PPDParser::handleTranslation( const ByteString& rString )
         else
             aTrans.append( *pStr++ );
     }
-    return OStringToOUString( aTrans.makeStringAndClear(), m_aFileEncoding );
+    return OStringToOUString( aTrans.makeStringAndClear(), bIsGlobalized ? RTL_TEXTENCODING_UTF8 : m_aFileEncoding );
 }
 
 void PPDParser::parse( ::std::list< ByteString >& rLines )
 {
-    PPDValue*   pValue  = NULL;
-    PPDKey*     pKey    = NULL;
-
     std::list< ByteString >::iterator line = rLines.begin();
     PPDParser::hash_type::const_iterator keyit;
     while( line != rLines.end() )
@@ -765,14 +958,25 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
         }
 
         String aUniKey( aKey, RTL_TEXTENCODING_MS_1252 );
-        keyit = m_aKeys.find( aUniKey );
-        if( keyit == m_aKeys.end() )
+        // handle CUPS extension for globalized PPDs
+        bool bIsGlobalizedLine = false;
+        com::sun::star::lang::Locale aTransLocale;
+        if( ( aUniKey.Len() > 3 && aUniKey.GetChar( 2 ) == '.' ) ||
+            ( aUniKey.Len() > 5 && aUniKey.GetChar( 2 ) == '_' && aUniKey.GetChar( 5 ) == '.' ) )
         {
-            pKey = new PPDKey( aUniKey );
-            insertKey( aUniKey, pKey );
+            if( aUniKey.GetChar( 2 ) == '.' )
+            {
+                aTransLocale.Language = aUniKey.Copy( 0, 2 );
+                aUniKey = aUniKey.Copy( 3 );
+            }
+            else
+            {
+                aTransLocale.Language = aUniKey.Copy( 0, 2 );
+                aTransLocale.Country = aUniKey.Copy( 3, 2 );
+                aUniKey = aUniKey.Copy( 6 );
+            }
+            bIsGlobalizedLine = true;
         }
-        else
-            pKey = keyit->second;
 
         String aOption;
         nPos = aCurrentLine.Search( ':' );
@@ -784,76 +988,125 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
             if( nTransPos != STRING_NOTFOUND )
                 aOption.Erase( nTransPos );
         }
-        pValue = pKey->insertValue( aOption );
-        if( ! pValue )
-            continue;
 
-        if( nPos == STRING_NOTFOUND )
+        PPDValueType eType = eNo;
+        String aValue;
+        rtl::OUString aOptionTranslation;
+        rtl::OUString aValueTranslation;
+        if( nPos != STRING_NOTFOUND )
         {
-            // have a single main keyword
-            pValue->m_eType = eNo;
-            if( bQuery )
-                pKey->eraseValue( aOption );
-            continue;
-        }
+            // found a colon, there may be an option
+            ByteString aLine = aCurrentLine.Copy( 1, nPos-1 );
+            aLine = WhitespaceToSpace( aLine );
+            int nTransPos = aLine.Search( '/' );
+            if( nTransPos != STRING_NOTFOUND )
+                aOptionTranslation = handleTranslation( aLine.Copy( nTransPos+1 ), bIsGlobalizedLine );
 
-        // found a colon, there may be an option
-        ByteString aLine = aCurrentLine.Copy( 1, nPos-1 );
-        aLine = WhitespaceToSpace( aLine );
-        int nTransPos = aLine.Search( '/' );
-        if( nTransPos != STRING_NOTFOUND )
-            pValue->m_aOptionTranslation = handleTranslation( aLine.Copy( nTransPos+1 ) );
-
-        // read in more lines if necessary for multiline values
-        aLine = aCurrentLine.Copy( nPos+1 );
-        while( ! ( aLine.GetTokenCount( '"' ) & 1 ) &&
-               line != rLines.end() )
-            // while there is an even number of tokens; that m_eans
-            // an odd number of doubleqoutes
-        {
-            // copy the newlines also
-            aLine += '\n';
-            aLine += *line;
-            ++line;
+            // read in more lines if necessary for multiline values
+            aLine = aCurrentLine.Copy( nPos+1 );
+            if( aLine.Len() )
+            {
+                while( ! ( aLine.GetTokenCount( '"' ) & 1 ) &&
+                       line != rLines.end() )
+                    // while there is an even number of tokens; that means
+                    // an odd number of doubleqoutes
+                {
+                    // copy the newlines also
+                    aLine += '\n';
+                    aLine += *line;
+                    ++line;
+                }
+            }
+            aLine = WhitespaceToSpace( aLine );
+
+            // #i100644# handle a missing value (actually a broken PPD)
+            if( ! aLine.Len() )
+            {
+                if( aOption.Len() &&
+                    aUniKey.CompareToAscii( "JCL", 3 ) != COMPARE_EQUAL )
+                    eType = eInvocation;
+                else
+                    eType = eQuoted;
+            }
+            // check for invocation or quoted value
+            else if( aLine.GetChar(0) == '"' )
+            {
+                aLine.Erase( 0, 1 );
+                nTransPos = aLine.Search( '"' );
+                aValue = String( aLine.Copy( 0, nTransPos ), RTL_TEXTENCODING_MS_1252 );
+                // after the second doublequote can follow a / and a translation
+                aValueTranslation = handleTranslation( aLine.Copy( nTransPos+2 ), bIsGlobalizedLine );
+                // check for quoted value
+                if( aOption.Len() &&
+                    aUniKey.CompareToAscii( "JCL", 3 ) != COMPARE_EQUAL )
+                    eType = eInvocation;
+                else
+                    eType = eQuoted;
+            }
+            // check for symbol value
+            else if( aLine.GetChar(0) == '^' )
+            {
+                aLine.Erase( 0, 1 );
+                aValue = String( aLine, RTL_TEXTENCODING_MS_1252 );
+                eType = eSymbol;
+            }
+            else
+            {
+                // must be a string value then
+                // strictly this is false because string values
+                // can contain any whitespace which is reduced
+                // to one space by now
+                // who cares ...
+                nTransPos = aLine.Search( '/' );
+                if( nTransPos == STRING_NOTFOUND )
+                    nTransPos = aLine.Len();
+                aValue = String( aLine.Copy( 0, nTransPos ), RTL_TEXTENCODING_MS_1252 );
+                aValueTranslation = handleTranslation( aLine.Copy( nTransPos+1 ), bIsGlobalizedLine );
+                eType = eString;
+            }
         }
-        aLine = WhitespaceToSpace( aLine );
 
-        // check for invocation or quoted value
-        if( aLine.GetChar(0) == '"' )
+        // handle globalized PPD entries
+        if( bIsGlobalizedLine )
         {
-            aLine.Erase( 0, 1 );
-            nTransPos = aLine.Search( '"' );
-            pValue->m_aValue = String( aLine.Copy( 0, nTransPos ), RTL_TEXTENCODING_MS_1252 );
-            // after the second doublequote can follow a / and a translation
-            pValue->m_aValueTranslation = handleTranslation( aLine.Copy( nTransPos+2 ) );
-            // check for quoted value
-            if( pValue->m_aOption.Len() &&
-                aKey.CompareTo( "JCL", 3 ) != COMPARE_EQUAL )
-                pValue->m_eType = eInvocation;
+            // handle main key translations of form:
+            // *ll_CC.Translation MainKeyword/translated text: ""
+            if( aUniKey.EqualsAscii( "Translation" ) )
+            {
+                m_pTranslator->insertKey( aOption, aOptionTranslation, aTransLocale );
+            }
+            // handle options translations of for:
+            // *ll_CC.MainKeyword OptionKeyword/translated text: ""
             else
-                pValue->m_eType = eQuoted;
+            {
+                m_pTranslator->insertOption( aUniKey, aOption, aOptionTranslation, aTransLocale );
+            }
+            continue;
         }
-        // check for symbol value
-        else if( aLine.GetChar(0) == '^' )
+
+        PPDKey* pKey = NULL;
+        keyit = m_aKeys.find( aUniKey );
+        if( keyit == m_aKeys.end() )
         {
-            aLine.Erase( 0, 1 );
-            pValue->m_aValue = String( aLine, RTL_TEXTENCODING_MS_1252 );
-            pValue->m_eType = eSymbol;
+            pKey = new PPDKey( aUniKey );
+            insertKey( aUniKey, pKey );
         }
         else
-        {
-            // must be a string value then
-            // strictly this is false because string values
-            // can contain any whitespace which is reduced
-            // to one space by now
-            // who cares ...
-            nTransPos = aLine.Search( '/' );
-            if( nTransPos == STRING_NOTFOUND )
-                nTransPos = aLine.Len();
-            pValue->m_aValue = String( aLine.Copy( 0, nTransPos ), RTL_TEXTENCODING_MS_1252 );
-            pValue->m_aValueTranslation = handleTranslation( aLine.Copy( nTransPos+1 ) );
-            pValue->m_eType = eString;
-        }
+            pKey = keyit->second;
+
+        if( eType == eNo && bQuery )
+            continue;
+
+        PPDValue* pValue = pKey->insertValue( aOption );
+        if( ! pValue )
+            continue;
+        pValue->m_eType = eType;
+        pValue->m_aValue = aValue;
+
+        if( aOptionTranslation.getLength() )
+            m_pTranslator->insertOption( aUniKey, aOption, aOptionTranslation, aTransLocale );
+        if( aValueTranslation.getLength() )
+            m_pTranslator->insertValue( aUniKey, aOption, aValue, aValueTranslation, aTransLocale );
 
         // eventually update query and remove from option list
         if( bQuery && pKey->m_bQueryValue == FALSE )
@@ -879,7 +1132,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
                 keyit = m_aKeys.find( aKey );
                 if( keyit != m_aKeys.end() )
                 {
-                    pKey = keyit->second;
+                    PPDKey* pKey = keyit->second;
                     const PPDValue* pDefValue = pKey->getValue( aOption );
                     if( pKey->m_pDefaultValue == NULL )
                         pKey->m_pDefaultValue = pDefValue;
@@ -890,7 +1143,7 @@ void PPDParser::parse( ::std::list< ByteString >& rLines )
                     // do not exist otherwise
                     // (example: DefaultResolution)
                     // so invent that key here and have a default value
-                    pKey = new PPDKey( aKey );
+                    PPDKey* pKey = new PPDKey( aKey );
                     PPDValue* pNewValue = pKey->insertValue( aOption );
                     pNewValue->m_eType = eInvocation; // or what ?
                     insertKey( aKey, pKey );
@@ -915,7 +1168,7 @@ void PPDParser::parseOpenUI( const ByteString& rLine )
     nPos = aKey.Search( '/' );
     if( nPos != STRING_NOTFOUND )
     {
-        aTranslation = handleTranslation( aKey.Copy( nPos + 1 ) );
+        aTranslation = handleTranslation( aKey.Copy( nPos + 1 ), false );
         aKey.Erase( nPos );
     }
     aKey = GetCommandLineToken( 1, aKey );
@@ -933,7 +1186,7 @@ void PPDParser::parseOpenUI( const ByteString& rLine )
         pKey = keyit->second;
 
     pKey->m_bUIOption = true;
-    pKey->m_aUITranslation = aTranslation;
+    m_pTranslator->insertKey( pKey->getKey(), aTranslation );
 
     ByteString aValue = WhitespaceToSpace( rLine.GetToken( 1, ':' ) );
     if( aValue.CompareIgnoreCaseToAscii( "boolean" ) == COMPARE_EQUAL )
@@ -1393,6 +1646,36 @@ const String& PPDParser::getFont( int nFont ) const
     return aEmptyString;
 }
 
+rtl::OUString PPDParser::translateKey( const rtl::OUString& i_rKey,
+                                       const com::sun::star::lang::Locale& i_rLocale ) const
+{
+    rtl::OUString aResult( m_pTranslator->translateKey( i_rKey, i_rLocale ) );
+    if( aResult.getLength() == 0 )
+        aResult = i_rKey;
+    return aResult;
+}
+
+rtl::OUString PPDParser::translateOption( const rtl::OUString& i_rKey,
+                                          const rtl::OUString& i_rOption,
+                                          const com::sun::star::lang::Locale& i_rLocale ) const
+{
+    rtl::OUString aResult( m_pTranslator->translateOption( i_rKey, i_rOption, i_rLocale ) );
+    if( aResult.getLength() == 0 )
+        aResult = i_rOption;
+    return aResult;
+}
+
+rtl::OUString PPDParser::translateValue( const rtl::OUString& i_rKey,
+                                         const rtl::OUString& i_rOption,
+                                         const rtl::OUString& i_rValue,
+                                         const com::sun::star::lang::Locale& i_rLocale ) const
+{
+    rtl::OUString aResult( m_pTranslator->translateValue( i_rKey, i_rOption, i_rValue, i_rLocale ) );
+    if( aResult.getLength() == 0 )
+        aResult = i_rValue;
+    return aResult;
+}
+
 /*
  *  PPDKey
  */
diff --git a/vcl/unx/source/printer/printerinfomanager.cxx b/vcl/unx/source/printer/printerinfomanager.cxx
index 53cd662db8e0..e1d499c40ca5 100644
--- a/vcl/unx/source/printer/printerinfomanager.cxx
+++ b/vcl/unx/source/printer/printerinfomanager.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: printerinfomanager.cxx,v $
- * $Revision: 1.50 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -119,6 +116,7 @@ PrinterInfoManager::PrinterInfoManager( Type eType ) :
     m_pQueueInfo( NULL ),
     m_eType( eType ),
     m_bUseIncludeFeature( false ),
+    m_bUseJobPatch( true ),
     m_aSystemDefaultPaper( RTL_CONSTASCII_USTRINGPARAM( "A4" ) ),
     m_bDisableCUPS( false )
 {
diff --git a/vcl/unx/source/printergfx/bitmap_gfx.cxx b/vcl/unx/source/printergfx/bitmap_gfx.cxx
index b1ec82aa17e2..1421fb7433f7 100644
--- a/vcl/unx/source/printergfx/bitmap_gfx.cxx
+++ b/vcl/unx/source/printergfx/bitmap_gfx.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: bitmap_gfx.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/vcl/unx/source/printergfx/common_gfx.cxx b/vcl/unx/source/printergfx/common_gfx.cxx
index 9b305ff323ba..6bb31acfcbbe 100644
--- a/vcl/unx/source/printergfx/common_gfx.cxx
+++ b/vcl/unx/source/printergfx/common_gfx.cxx
@@ -2,12 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE 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_gfx.cxx,v $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/printergfx/glyphset.cxx b/vcl/unx/source/printergfx/glyphset.cxx
index 5adff6683267..8885a6b42c1e 100644
--- a/vcl/unx/source/printergfx/glyphset.cxx
+++ b/vcl/unx/source/printergfx/glyphset.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/vcl/unx/source/printergfx/glyphset.hxx b/vcl/unx/source/printergfx/glyphset.hxx
index f4cd15a56ae6..320e8e071955 100644
--- a/vcl/unx/source/printergfx/glyphset.hxx
+++ b/vcl/unx/source/printergfx/glyphset.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: glyphset.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/vcl/unx/source/printergfx/makefile.mk b/vcl/unx/source/printergfx/makefile.mk
index 6de3e9bfe3bb..cc5692e951f5 100644
--- a/vcl/unx/source/printergfx/makefile.mk
+++ b/vcl/unx/source/printergfx/makefile.mk
@@ -2,14 +2,10 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.8 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/printergfx/printerjob.cxx b/vcl/unx/source/printergfx/printerjob.cxx
index 783dd5ff2b47..3e885d8af5b4 100644
--- a/vcl/unx/source/printergfx/printerjob.cxx
+++ b/vcl/unx/source/printergfx/printerjob.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: printerjob.cxx,v $
- * $Revision: 1.47 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -681,14 +678,6 @@ PrinterJob::StartPage (const JobData& rJobSetup)
     if( ! (pPageHeader && pPageBody) )
         return sal_False;
 
-    /* #i7262# write setup only before first page
-     *  don't do this in StartJob since the jobsetup there may be
-     *  different.
-     */
-    bool bSuccess =  true;
-    if( 1 == maPageList.size() )
-        m_aDocumentJobData = rJobSetup;
-
     // write page header according to Document Structuring Conventions (DSC)
     WritePS (pPageHeader, "%%Page: ");
     WritePS (pPageHeader, aPageNo);
@@ -722,13 +711,25 @@ PrinterJob::StartPage (const JobData& rJobSetup)
 
     WritePS (pPageHeader, pBBox);
 
-    if (bSuccess)
-        bSuccess = writePageSetup ( pPageHeader, rJobSetup );
-    if(bSuccess)
-        m_aLastJobData = rJobSetup;
+    /* #i7262# #i65491# write setup only before first page
+     *  (to %%Begin(End)Setup, instead of %%Begin(End)PageSetup)
+     *  don't do this in StartJob since the jobsetup there may be
+     *  different.
+     */
+    bool bWriteFeatures = true;
+    if( 1 == maPageList.size() )
+    {
+        m_aDocumentJobData = rJobSetup;
+        bWriteFeatures = false;
+    }
 
+    if ( writePageSetup( pPageHeader, rJobSetup, bWriteFeatures ) )
+    {
+        m_aLastJobData = rJobSetup;
+        return true;
+    }
 
-    return bSuccess;
+    return false;
 }
 
 sal_Bool
@@ -828,12 +829,9 @@ bool PrinterJob::writeFeatureList( osl::File* pFile, const JobData& rJob, bool b
                 if( pKey->getSetupType()    == PPDKey::DocumentSetup )
                     bEmit = true;
             }
-            else
-            {
-                if( pKey->getSetupType()    == PPDKey::PageSetup        ||
-                    pKey->getSetupType()    == PPDKey::AnySetup )
-                    bEmit = true;
-            }
+            if( pKey->getSetupType()    == PPDKey::PageSetup        ||
+                pKey->getSetupType()    == PPDKey::AnySetup )
+                bEmit = true;
             if( bEmit )
             {
                 const PPDValue* pValue = rJob.m_aContext.getValue( pKey );
@@ -866,13 +864,13 @@ bool PrinterJob::writeFeatureList( osl::File* pFile, const JobData& rJob, bool b
     return bSuccess;
 }
 
-bool PrinterJob::writePageSetup( osl::File* pFile, const JobData& rJob )
+bool PrinterJob::writePageSetup( osl::File* pFile, const JobData& rJob, bool bWriteFeatures )
 {
     bool bSuccess = true;
 
     WritePS (pFile, "%%BeginPageSetup\n%\n");
-
-    bSuccess = writeFeatureList( pFile, rJob, false );
+    if ( bWriteFeatures )
+        bSuccess = writeFeatureList( pFile, rJob, false );
     WritePS (pFile, "%%EndPageSetup\n");
 
     sal_Char  pTranslate [128];
@@ -914,6 +912,9 @@ bool PrinterJob::writePageSetup( osl::File* pFile, const JobData& rJob )
 
 void PrinterJob::writeJobPatch( osl::File* pFile, const JobData& rJobData )
 {
+    if( ! PrinterInfoManager::get().getUseJobPatch() )
+        return;
+
     const PPDKey* pKey = NULL;
 
     if( rJobData.m_pParser )
diff --git a/vcl/unx/source/printergfx/psheader.ps b/vcl/unx/source/printergfx/psheader.ps
index 7b947b3a470b..6a0e350d9ddc 100644
--- a/vcl/unx/source/printergfx/psheader.ps
+++ b/vcl/unx/source/printergfx/psheader.ps
@@ -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: psheader.ps,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/vcl/unx/source/printergfx/psputil.cxx b/vcl/unx/source/printergfx/psputil.cxx
index 0b92f4ee423d..370114be47cb 100644
--- a/vcl/unx/source/printergfx/psputil.cxx
+++ b/vcl/unx/source/printergfx/psputil.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: psputil.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/vcl/unx/source/printergfx/psputil.hxx b/vcl/unx/source/printergfx/psputil.hxx
index b3227962e8a0..d4af41bb95ed 100644
--- a/vcl/unx/source/printergfx/psputil.hxx
+++ b/vcl/unx/source/printergfx/psputil.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: psputil.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/vcl/unx/source/printergfx/text_gfx.cxx b/vcl/unx/source/printergfx/text_gfx.cxx
index 00e3ab5f44c2..1901aa0d004a 100644
--- a/vcl/unx/source/printergfx/text_gfx.cxx
+++ b/vcl/unx/source/printergfx/text_gfx.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: text_gfx.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/vcl/unx/source/window/FWS.cxx b/vcl/unx/source/window/FWS.cxx
index 6e266a31837a..4683864fd116 100644
--- a/vcl/unx/source/window/FWS.cxx
+++ b/vcl/unx/source/window/FWS.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: FWS.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/vcl/unx/source/window/FWS.hxx b/vcl/unx/source/window/FWS.hxx
index 9cf40a2db954..a687870ede4a 100644
--- a/vcl/unx/source/window/FWS.hxx
+++ b/vcl/unx/source/window/FWS.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: FWS.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/vcl/unx/source/window/makefile.mk b/vcl/unx/source/window/makefile.mk
index a0409807a791..808b712903f3 100644
--- a/vcl/unx/source/window/makefile.mk
+++ b/vcl/unx/source/window/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/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx
index 68c99e05da77..5b538626a634 100644
--- a/vcl/unx/source/window/salframe.cxx
+++ b/vcl/unx/source/window/salframe.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: salframe.cxx,v $
- * $Revision: 1.225 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/unx/source/window/salmenu.cxx b/vcl/unx/source/window/salmenu.cxx
index 6a34803b8818..0739b6cd5352 100644
--- a/vcl/unx/source/window/salmenu.cxx
+++ b/vcl/unx/source/window/salmenu.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: salmenu.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/vcl/unx/source/window/salobj.cxx b/vcl/unx/source/window/salobj.cxx
index eed6264f00bc..647b95ae032c 100644
--- a/vcl/unx/source/window/salobj.cxx
+++ b/vcl/unx/source/window/salobj.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: salobj.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/goodies/source/filter.vcl/eps/strings.hrc b/vcl/util/hidother.src
index b0f14dc8c3d5..f966fcded1b3 100644
--- a/goodies/source/filter.vcl/eps/strings.hrc
+++ b/vcl/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: strings.hrc,v $
- * $Revision: 1.6 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -28,5 +25,7 @@
  *
  ************************************************************************/
 
-#define KEY_VERSION_CHECK               260
+#include "vcl/svids.hrc"
+
+hidspecial HID_PRINTDLG                         { HelpID = HID_PRINTDLG; };
 
diff --git a/vcl/util/linksvp/makefile.mk b/vcl/util/linksvp/makefile.mk
index e5e82323af5c..99d1c4537111 100644
--- a/vcl/util/linksvp/makefile.mk
+++ b/vcl/util/linksvp/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.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/util/makefile.mk b/vcl/util/makefile.mk
index ef4f13301ecd..d501765c8491 100644
--- a/vcl/util/makefile.mk
+++ b/vcl/util/makefile.mk
@@ -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
 #
@@ -31,6 +31,7 @@ PRJNAME=vcl
 TARGET=vcl
 TARGETTYPE=GUI
 USE_DEFFILE=TRUE
+GEN_HID_OTHER=TRUE
 
 .IF "$(SNDFILE_LIBS)"!=""
 SNDFILELIB=$(SNDFILE_LIBS)
@@ -302,6 +303,7 @@ SHL2STDLIBS=\
             $(VOSLIB)           \
             $(BASEGFXLIB)	\
             $(UNOTOOLSLIB) \
+            $(COMPHELPERLIB)	\
             $(CPPUHELPERLIB) \
             $(CPPULIB) \
             $(SALLIB)
diff --git a/vcl/util/makefile.pmk b/vcl/util/makefile.pmk
index 0765fa8a4391..884eb499b532 100644
--- a/vcl/util/makefile.pmk
+++ b/vcl/util/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: makefile.pmk,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/vcl/util/makefile2.pmk b/vcl/util/makefile2.pmk
index 63b2889bc15d..56102a256ea3 100644
--- a/vcl/util/makefile2.pmk
+++ b/vcl/util/makefile2.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: makefile2.pmk,v $
-#
-# $Revision: 1.5 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
@@ -36,3 +32,10 @@ VISIBILITY_HIDDEN=TRUE
 .IF "$(GUIBASE)"=="aqua"
 CFLAGSCXX+=$(OBJCXXFLAGS)
 .ENDIF  # "$(GUIBASE)"=="aqua"
+
+#building with stlport, but graphite was not built with stlport
+.IF "$(USE_SYSTEM_STL)"!="YES"
+.IF "$(SYSTEM_GRAPHITE)"=="YES"
+CDEFS += -DGRAPHITEADAPTSTL
+.ENDIF
+.ENDIF
diff --git a/vcl/util/target.pmk b/vcl/util/target.pmk
index 7e57038d2a5b..3144acc4bc05 100644
--- a/vcl/util/target.pmk
+++ b/vcl/util/target.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: target.pmk,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/vcl/win/inc/salbmp.h b/vcl/win/inc/salbmp.h
index 0c8129bbbb99..7a31add2ae19 100644
--- a/vcl/win/inc/salbmp.h
+++ b/vcl/win/inc/salbmp.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: salbmp.h,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/vcl/win/inc/saldata.hxx b/vcl/win/inc/saldata.hxx
index d743a7b7dae1..ec67272ed07f 100644
--- a/vcl/win/inc/saldata.hxx
+++ b/vcl/win/inc/saldata.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: saldata.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/vcl/win/inc/salframe.h b/vcl/win/inc/salframe.h
index b29ce49e0d74..f9aa8ef9dc4b 100644
--- a/vcl/win/inc/salframe.h
+++ b/vcl/win/inc/salframe.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: salframe.h,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/vcl/win/inc/salgdi.h b/vcl/win/inc/salgdi.h
index c7ceb68199b9..6b58e0c5375a 100644
--- a/vcl/win/inc/salgdi.h
+++ b/vcl/win/inc/salgdi.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: salgdi.h,v $
- * $Revision: 1.30.20.5 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/win/inc/salids.hrc b/vcl/win/inc/salids.hrc
index 712c5a58d0bd..3049f11b551b 100644
--- a/vcl/win/inc/salids.hrc
+++ b/vcl/win/inc/salids.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: salids.hrc,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/vcl/win/inc/salinst.h b/vcl/win/inc/salinst.h
index 33a1a941ed49..f3005e3ad30b 100644
--- a/vcl/win/inc/salinst.h
+++ b/vcl/win/inc/salinst.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: salinst.h,v $
- * $Revision: 1.16.154.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/win/inc/salmenu.h b/vcl/win/inc/salmenu.h
index 5dd01d3810d4..7f1774b61975 100644
--- a/vcl/win/inc/salmenu.h
+++ b/vcl/win/inc/salmenu.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: salmenu.h,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/vcl/win/inc/salnativewidgets.h b/vcl/win/inc/salnativewidgets.h
index 8f30092056e6..fceee1076595 100644
--- a/vcl/win/inc/salnativewidgets.h
+++ b/vcl/win/inc/salnativewidgets.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: salnativewidgets.h,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/vcl/win/inc/salobj.h b/vcl/win/inc/salobj.h
index f903a7ac89e9..11ae96931321 100644
--- a/vcl/win/inc/salobj.h
+++ b/vcl/win/inc/salobj.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: salobj.h,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/vcl/win/inc/salprn.h b/vcl/win/inc/salprn.h
index 58d721fd043a..57ae8eae55e3 100644
--- a/vcl/win/inc/salprn.h
+++ b/vcl/win/inc/salprn.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: salprn.h,v $
- * $Revision: 1.9 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -88,7 +85,6 @@ public:
     virtual String                  GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin );
     virtual void                    InitPaperFormats( const ImplJobSetup* pSetupData );
     virtual int                 GetLandscapeAngle( const ImplJobSetup* pSetupData );
-    virtual DuplexMode          GetDuplexMode( const ImplJobSetup* pSetupData );
 };
 
 // -----------------
@@ -117,7 +113,9 @@ public:
     virtual BOOL                    StartJob( const XubString* pFileName,
                                               const XubString& rJobName,
                                               const XubString& rAppName,
-                                              ULONG nCopies, BOOL bCollate,
+                                              ULONG nCopies,
+                                              bool bCollate,
+                                              bool bDirect,
                                               ImplJobSetup* pSetupData );
     virtual BOOL                    EndJob();
     virtual BOOL                    AbortJob();
diff --git a/vcl/win/inc/salsys.h b/vcl/win/inc/salsys.h
index 3bd82c8e1d53..b6eadc6e6818 100644
--- a/vcl/win/inc/salsys.h
+++ b/vcl/win/inc/salsys.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: salsys.h,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/vcl/win/inc/saltimer.h b/vcl/win/inc/saltimer.h
index 461aa15cce22..c24af459aa97 100644
--- a/vcl/win/inc/saltimer.h
+++ b/vcl/win/inc/saltimer.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: saltimer.h,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/vcl/win/inc/salvd.h b/vcl/win/inc/salvd.h
index ce78e7bbe3bb..d0f32a6460a9 100644
--- a/vcl/win/inc/salvd.h
+++ b/vcl/win/inc/salvd.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: salvd.h,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/vcl/win/inc/svsys.h b/vcl/win/inc/svsys.h
index 7a96bafe917d..7b0e87304d59 100644
--- a/vcl/win/inc/svsys.h
+++ b/vcl/win/inc/svsys.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: svsys.h,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/vcl/win/inc/wincomp.hxx b/vcl/win/inc/wincomp.hxx
index 089fd9f9fb1f..61e04779dbce 100644
--- a/vcl/win/inc/wincomp.hxx
+++ b/vcl/win/inc/wincomp.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: wincomp.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/vcl/win/source/app/MAKEFILE.MK b/vcl/win/source/app/MAKEFILE.MK
index 83339dbb997a..9b3237567eff 100644
--- a/vcl/win/source/app/MAKEFILE.MK
+++ b/vcl/win/source/app/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.11 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/win/source/app/saldata.cxx b/vcl/win/source/app/saldata.cxx
index c9009492a4af..bb8a198a96e6 100644
--- a/vcl/win/source/app/saldata.cxx
+++ b/vcl/win/source/app/saldata.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: saldata.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/vcl/win/source/app/salinfo.cxx b/vcl/win/source/app/salinfo.cxx
index cc5a89097d9f..b7ea81d313ae 100644
--- a/vcl/win/source/app/salinfo.cxx
+++ b/vcl/win/source/app/salinfo.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: salinfo.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/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 68177795c8db..97dbb5285cca 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.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: salinst.cxx,v $
- * $Revision: 1.42.154.1 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/win/source/app/salshl.cxx b/vcl/win/source/app/salshl.cxx
index 5fe804dfc0c5..0f3b0c41e258 100644
--- a/vcl/win/source/app/salshl.cxx
+++ b/vcl/win/source/app/salshl.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: salshl.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/vcl/win/source/app/saltimer.cxx b/vcl/win/source/app/saltimer.cxx
index 821a6186b985..d512be753f9c 100644
--- a/vcl/win/source/app/saltimer.cxx
+++ b/vcl/win/source/app/saltimer.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: saltimer.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/vcl/win/source/gdi/MAKEFILE.MK b/vcl/win/source/gdi/MAKEFILE.MK
index 3d8fd904b35b..7489be633f2b 100644
--- a/vcl/win/source/gdi/MAKEFILE.MK
+++ b/vcl/win/source/gdi/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.13.152.1 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/win/source/gdi/salbmp.cxx b/vcl/win/source/gdi/salbmp.cxx
index e4b928ca1a0d..444df039dd69 100644
--- a/vcl/win/source/gdi/salbmp.cxx
+++ b/vcl/win/source/gdi/salbmp.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: salbmp.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/vcl/win/source/gdi/salgdi.cxx b/vcl/win/source/gdi/salgdi.cxx
index 55caa086a57a..eb260eb808c6 100644
--- a/vcl/win/source/gdi/salgdi.cxx
+++ b/vcl/win/source/gdi/salgdi.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: salgdi.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/vcl/win/source/gdi/salgdi2.cxx b/vcl/win/source/gdi/salgdi2.cxx
index 0a60c6971213..803c0886f429 100644
--- a/vcl/win/source/gdi/salgdi2.cxx
+++ b/vcl/win/source/gdi/salgdi2.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: salgdi2.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/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index 12fdad65dfb1..84695baf3557 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.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/vcl/win/source/gdi/salgdi_gdiplus.cxx b/vcl/win/source/gdi/salgdi_gdiplus.cxx
index 29e4ff1d801e..c621d81dce40 100644
--- a/vcl/win/source/gdi/salgdi_gdiplus.cxx
+++ b/vcl/win/source/gdi/salgdi_gdiplus.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: salgdi.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/vcl/win/source/gdi/salnativewidgets-luna.cxx b/vcl/win/source/gdi/salnativewidgets-luna.cxx
index 5a5703e10944..f95f42d6bf4d 100644
--- a/vcl/win/source/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/source/gdi/salnativewidgets-luna.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: salnativewidgets-luna.cxx,v $
- * $Revision: 1.12 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -42,7 +39,7 @@
 #include "osl/module.h"
 
 #include "uxtheme.h"
-#include "tmschema.h"
+#include "vssym32.h"
 
 #include <map>
 #include <string>
@@ -337,7 +334,7 @@ BOOL ImplDrawTheme( HTHEME hTheme, HDC hDC, int iPart, int iState, RECT rc, cons
 }
 
 
-Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const Rectangle& aRect )
+Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const Rectangle& aRect, THEMESIZE eTS = TS_TRUE )
 {
     SIZE aSz;
     RECT rc;
@@ -345,7 +342,7 @@ Rectangle ImplGetThemeRect( HTHEME hTheme, HDC hDC, int iPart, int iState, const
     rc.right = aRect.nRight;
     rc.top = aRect.nTop;
     rc.bottom = aRect.nBottom;
-    HRESULT hr = vsAPI.GetThemePartSize( hTheme, hDC, iPart, iState, NULL, TS_TRUE, &aSz ); // TS_TRUE returns optimal size
+    HRESULT hr = vsAPI.GetThemePartSize( hTheme, hDC, iPart, iState, NULL, eTS, &aSz ); // TS_TRUE returns optimal size
     if( hr == S_OK )
         return Rectangle( 0, 0, aSz.cx, aSz.cy );
     else
@@ -1109,6 +1106,63 @@ BOOL WinSalGraphics::getNativeControlRegion(  ControlType nType,
                 bRet = TRUE;
         }
     }
+
+    if( (nType == CTRL_LISTBOX || nType == CTRL_COMBOBOX ) && nPart == PART_ENTIRE_CONTROL )
+    {
+        HTHEME hTheme = getThemeHandle( mhWnd, L"Combobox");
+        if( hTheme )
+        {
+            Rectangle aBoxRect( rControlRegion.GetBoundRect() );
+            Rectangle aRect( ImplGetThemeRect( hTheme, hDC, CP_DROPDOWNBUTTON,
+                                               CBXS_NORMAL, aBoxRect ) );
+            Rectangle aBrdRect( ImplGetThemeRect( hTheme, hDC, CP_BORDER,
+                                                  CBB_HOT, aBoxRect ) );
+            aRect.Top() -= aBrdRect.GetHeight();
+            if( aRect.GetHeight() > aBoxRect.GetHeight() )
+                aBoxRect.Bottom() = aBoxRect.Top() + aRect.GetHeight();
+            if( aRect.GetWidth() > aBoxRect.GetWidth() )
+                aBoxRect.Right() = aBoxRect.Left() + aRect.GetWidth();
+            rNativeContentRegion = aBoxRect;
+            rNativeBoundingRegion = rNativeContentRegion;
+            if( !aRect.IsEmpty() )
+                bRet = TRUE;
+        }
+    }
+
+    if( (nType == CTRL_EDITBOX || nType == CTRL_SPINBOX) && nPart == PART_ENTIRE_CONTROL )
+    {
+        HTHEME hTheme = getThemeHandle( mhWnd, L"Edit");
+        if( hTheme )
+        {
+            // get borderr size
+            Rectangle aBoxRect( rControlRegion.GetBoundRect() );
+            Rectangle aRect( ImplGetThemeRect( hTheme, hDC, EP_BACKGROUNDWITHBORDER,
+                                               EBWBS_HOT, aBoxRect ) );
+            // ad app font height
+            NONCLIENTMETRICSW aNonClientMetrics;
+            aNonClientMetrics.cbSize = sizeof( aNonClientMetrics );
+            if ( SystemParametersInfoW( SPI_GETNONCLIENTMETRICS, sizeof( aNonClientMetrics ), &aNonClientMetrics, 0 ) )
+            {
+                long nFontHeight = aNonClientMetrics.lfMessageFont.lfHeight;
+                if( nFontHeight < 0 )
+                    nFontHeight = -nFontHeight;
+
+                if( aRect.GetHeight() && nFontHeight )
+                {
+                    aRect.Bottom() += aRect.GetHeight();
+                    aRect.Bottom() += nFontHeight;
+                    if( aRect.GetHeight() > aBoxRect.GetHeight() )
+                        aBoxRect.Bottom() = aBoxRect.Top() + aRect.GetHeight();
+                    if( aRect.GetWidth() > aBoxRect.GetWidth() )
+                        aBoxRect.Right() = aBoxRect.Left() + aRect.GetWidth();
+                    rNativeContentRegion = aBoxRect;
+                    rNativeBoundingRegion = rNativeContentRegion;
+                        bRet = TRUE;
+                }
+            }
+        }
+    }
+
     ReleaseDC( mhWnd, hDC );
     return( bRet );
 }
diff --git a/vcl/win/source/gdi/salprn.cxx b/vcl/win/source/gdi/salprn.cxx
index ecf91aea7c1b..9d8d41723f64 100644
--- a/vcl/win/source/gdi/salprn.cxx
+++ b/vcl/win/source/gdi/salprn.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: salprn.cxx,v $
- * $Revision: 1.36 $
- *
  * This file is part of OpenOffice.org.
  *
  * OpenOffice.org is free software: you can redistribute it and/or modify
@@ -1059,6 +1056,21 @@ static void ImplDevModeToJobSetup( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
                 break;
         }
     }
+
+    if( nFlags & SAL_JOBSET_DUPLEXMODE )
+    {
+        DuplexMode eDuplex = DUPLEX_UNKNOWN;
+        if( (CHOOSE_DEVMODE(dmFields) & DM_DUPLEX) )
+        {
+            if( CHOOSE_DEVMODE(dmDuplex) == DMDUP_SIMPLEX )
+                eDuplex = DUPLEX_OFF;
+            else if( CHOOSE_DEVMODE(dmDuplex) == DMDUP_VERTICAL )
+                eDuplex = DUPLEX_LONGEDGE;
+            else if( CHOOSE_DEVMODE(dmDuplex) == DMDUP_HORIZONTAL )
+                eDuplex = DUPLEX_SHORTEDGE;
+        }
+        pSetupData->meDuplexMode = eDuplex;
+    }
 }
 
 // -----------------------------------------------------------------------
@@ -1326,6 +1338,26 @@ static void ImplJobSetupToDevMode( WinSalInfoPrinter* pPrinter, ImplJobSetup* pS
             }
         }
     }
+    if( (nFlags & SAL_JOBSET_DUPLEXMODE) )
+    {
+        switch( pSetupData->meDuplexMode )
+        {
+        case DUPLEX_OFF:
+            CHOOSE_DEVMODE(dmFields) |= DM_DUPLEX;
+            CHOOSE_DEVMODE(dmDuplex) = DMDUP_SIMPLEX;
+            break;
+        case DUPLEX_SHORTEDGE:
+            CHOOSE_DEVMODE(dmFields) |= DM_DUPLEX;
+            CHOOSE_DEVMODE(dmDuplex) = DMDUP_HORIZONTAL;
+            break;
+        case DUPLEX_LONGEDGE:
+            CHOOSE_DEVMODE(dmFields) |= DM_DUPLEX;
+            CHOOSE_DEVMODE(dmDuplex) = DMDUP_VERTICAL;
+            break;
+        case DUPLEX_UNKNOWN:
+            break;
+        }
+    }
 }
 
 // -----------------------------------------------------------------------
@@ -1559,39 +1591,6 @@ void WinSalInfoPrinter::InitPaperFormats( const ImplJobSetup* pSetupData )
 
 // -----------------------------------------------------------------------
 
-DuplexMode WinSalInfoPrinter::GetDuplexMode( const ImplJobSetup* pSetupData )
-{
-    DuplexMode nRet = DUPLEX_UNKNOWN;
-    if ( pSetupData &&pSetupData->mpDriverData )
-    {
-        if( aSalShlData.mbWPrinter )
-        {
-            DEVMODEW* pDevMode = SAL_DEVMODE_W( pSetupData );
-            if ( pDevMode && (pDevMode->dmFields & DM_DUPLEX ))
-            {
-                if ( pDevMode->dmDuplex == DMDUP_SIMPLEX )
-                    nRet = DUPLEX_OFF;
-                else
-                    nRet = DUPLEX_ON;
-            }
-        }
-        else
-        {
-            DEVMODEA* pDevMode = SAL_DEVMODE_A( pSetupData );
-            if ( pDevMode && (pDevMode->dmFields & DM_DUPLEX ))
-            {
-                if ( pDevMode->dmDuplex == DMDUP_SIMPLEX )
-                    nRet = DUPLEX_OFF;
-                else
-                    nRet = DUPLEX_ON;
-            }
-        }
-    }
-    return nRet;
-}
-
-// -----------------------------------------------------------------------
-
 int WinSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* pSetupData )
 {
     int nRet = ImplDeviceCaps( this, DC_ORIENTATION, NULL, pSetupData );
@@ -1964,7 +1963,9 @@ static int lcl_StartDocA( HDC hDC, DOCINFOA* pInfo, WinSalPrinter* pPrt )
 BOOL WinSalPrinter::StartJob( const XubString* pFileName,
                            const XubString& rJobName,
                            const XubString&,
-                           ULONG nCopies, BOOL bCollate,
+                           ULONG nCopies,
+                           bool bCollate,
+                           bool /*bDirect*/,
                            ImplJobSetup* pSetupData )
 {
     mnError     = 0;
diff --git a/vcl/win/source/gdi/salvd.cxx b/vcl/win/source/gdi/salvd.cxx
index 300bfd9cd6a8..816a8fef1141 100644
--- a/vcl/win/source/gdi/salvd.cxx
+++ b/vcl/win/source/gdi/salvd.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: salvd.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/vcl/win/source/gdi/winlayout.cxx b/vcl/win/source/gdi/winlayout.cxx
index bf56b2a1082b..ba19f2255646 100644
--- a/vcl/win/source/gdi/winlayout.cxx
+++ b/vcl/win/source/gdi/winlayout.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/vcl/win/source/gdi/wntgdi.cxx b/vcl/win/source/gdi/wntgdi.cxx
index 736f4c4dc8e7..eb53fb4d8699 100644
--- a/vcl/win/source/gdi/wntgdi.cxx
+++ b/vcl/win/source/gdi/wntgdi.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: wntgdi.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/vcl/win/source/src/MAKEFILE.MK b/vcl/win/source/src/MAKEFILE.MK
index 975b1a20330e..7addba363481 100644
--- a/vcl/win/source/src/MAKEFILE.MK
+++ b/vcl/win/source/src/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/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index be7cb50204a4..1db1bfc910cf 100644
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -2,13 +2,10 @@
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: salsrc.rc,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/vcl/win/source/window/MAKEFILE.MK b/vcl/win/source/window/MAKEFILE.MK
index 67cb1bf3e080..e83f04cfdfb0 100644
--- a/vcl/win/source/window/MAKEFILE.MK
+++ b/vcl/win/source/window/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.94.2 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index fc92757e0925..a6567464ac5e 100644..100755
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.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
  *
@@ -2978,6 +2978,11 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
         aStyleSettings.SetCheckedColor( Color( nRed, nGreen, nBlue ) );
     }
 
+    // caret width
+    DWORD nCaretWidth = 2;
+    if( SystemParametersInfo( SPI_GETCARETWIDTH, 0, &nCaretWidth, 0 ) )
+        aStyleSettings.SetCursorSize( nCaretWidth );
+
     // High contrast
     HIGHCONTRAST hc;
     hc.cbSize = sizeof( HIGHCONTRAST );
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index d3602aeabf0e..1eb75969ea38 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.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: salmenu.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/vcl/win/source/window/salobj.cxx b/vcl/win/source/window/salobj.cxx
index f0bdfc266b0c..2f657968284f 100644
--- a/vcl/win/source/window/salobj.cxx
+++ b/vcl/win/source/window/salobj.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: salobj.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/vcl/workben/makefile.mk b/vcl/workben/makefile.mk
index 0b89f031651d..67c0289cc24f 100644
--- a/vcl/workben/makefile.mk
+++ b/vcl/workben/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.23 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx
index 1109111b63c5..9122a1addc0a 100755
--- a/vcl/workben/outdevgrind.cxx
+++ b/vcl/workben/outdevgrind.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: outdevgrind.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/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx
index 7f9500be2ae2..5822f4024a59 100644
--- a/vcl/workben/svdem.cxx
+++ b/vcl/workben/svdem.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: svdem.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/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx
index 7bea0b94f76a..61ed22ca95e7 100644
--- a/vcl/workben/svpclient.cxx
+++ b/vcl/workben/svpclient.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: svpclient.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/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx
index 8e0f664b45be..cc7c0f2b0cce 100644
--- a/vcl/workben/svptest.cxx
+++ b/vcl/workben/svptest.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: svptest.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/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index f6677c905741..41ca76144e5c 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.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: vcldemo.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/vos/inc/vos/conditn.hxx b/vos/inc/vos/conditn.hxx
index 66bc0e832e9d..884ef85c91d6 100644
--- a/vos/inc/vos/conditn.hxx
+++ b/vos/inc/vos/conditn.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: conditn.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/vos/inc/vos/connectn.hxx b/vos/inc/vos/connectn.hxx
index 9aa5c2bef1c1..803ab56b92f0 100644
--- a/vos/inc/vos/connectn.hxx
+++ b/vos/inc/vos/connectn.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: connectn.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/vos/inc/vos/diagnose.hxx b/vos/inc/vos/diagnose.hxx
index e6f524011e6d..a037c9517ec4 100644
--- a/vos/inc/vos/diagnose.hxx
+++ b/vos/inc/vos/diagnose.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: diagnose.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/vos/inc/vos/execabl.hxx b/vos/inc/vos/execabl.hxx
index 37d7a2076426..04e0ef837b02 100644
--- a/vos/inc/vos/execabl.hxx
+++ b/vos/inc/vos/execabl.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: execabl.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/vos/inc/vos/istream.hxx b/vos/inc/vos/istream.hxx
index 3eaf5c64bd7e..9aacf2829226 100644
--- a/vos/inc/vos/istream.hxx
+++ b/vos/inc/vos/istream.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: istream.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/vos/inc/vos/macros.hxx b/vos/inc/vos/macros.hxx
index 0635bfa41a85..ca1b750d67f4 100644
--- a/vos/inc/vos/macros.hxx
+++ b/vos/inc/vos/macros.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: macros.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/vos/inc/vos/module.hxx b/vos/inc/vos/module.hxx
index d2b87781b8d4..d70cc101e4fc 100644
--- a/vos/inc/vos/module.hxx
+++ b/vos/inc/vos/module.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: module.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/vos/inc/vos/mutex.hxx b/vos/inc/vos/mutex.hxx
index e6f7d53af1cb..6336e23bd0f7 100644
--- a/vos/inc/vos/mutex.hxx
+++ b/vos/inc/vos/mutex.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: mutex.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/vos/inc/vos/object.hxx b/vos/inc/vos/object.hxx
index 0f302084ab42..6108280cf382 100644
--- a/vos/inc/vos/object.hxx
+++ b/vos/inc/vos/object.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: object.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/vos/inc/vos/pipe.hxx b/vos/inc/vos/pipe.hxx
index 2f2e0909c19e..e9b1145a36ee 100644
--- a/vos/inc/vos/pipe.hxx
+++ b/vos/inc/vos/pipe.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: pipe.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/vos/inc/vos/process.hxx b/vos/inc/vos/process.hxx
index 3d3639f736a2..e41a050acaa0 100644
--- a/vos/inc/vos/process.hxx
+++ b/vos/inc/vos/process.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: process.hxx,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/vos/inc/vos/ref.hxx b/vos/inc/vos/ref.hxx
index 32dca62c91a2..7b68bc43f09f 100644
--- a/vos/inc/vos/ref.hxx
+++ b/vos/inc/vos/ref.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: ref.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/vos/inc/vos/ref.inl b/vos/inc/vos/ref.inl
index 7dd0159b0801..48ccf19ea80e 100644
--- a/vos/inc/vos/ref.inl
+++ b/vos/inc/vos/ref.inl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: ref.inl,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/vos/inc/vos/refernce.hxx b/vos/inc/vos/refernce.hxx
index 8fe7ec40b469..25f0f39eb0f3 100644
--- a/vos/inc/vos/refernce.hxx
+++ b/vos/inc/vos/refernce.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: refernce.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/vos/inc/vos/refobj.hxx b/vos/inc/vos/refobj.hxx
index 9c8add87e5ae..a79d45c9bd0c 100644
--- a/vos/inc/vos/refobj.hxx
+++ b/vos/inc/vos/refobj.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: refobj.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/vos/inc/vos/refobj.inl b/vos/inc/vos/refobj.inl
index 16feb3ef7ce1..78b4e0f2808d 100644
--- a/vos/inc/vos/refobj.inl
+++ b/vos/inc/vos/refobj.inl
@@ -2,13 +2,10 @@
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2008 by Sun Microsystems, Inc.
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: refobj.inl,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/vos/inc/vos/runnable.hxx b/vos/inc/vos/runnable.hxx
index 1a907144be2c..d577181b2398 100644
--- a/vos/inc/vos/runnable.hxx
+++ b/vos/inc/vos/runnable.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: runnable.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/vos/inc/vos/security.hxx b/vos/inc/vos/security.hxx
index e0e3e93cf75b..6f0766bc4b24 100644
--- a/vos/inc/vos/security.hxx
+++ b/vos/inc/vos/security.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: security.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/vos/inc/vos/signal.hxx b/vos/inc/vos/signal.hxx
index 9395d2214263..ea9db4850490 100644
--- a/vos/inc/vos/signal.hxx
+++ b/vos/inc/vos/signal.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: signal.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/vos/inc/vos/socket.hxx b/vos/inc/vos/socket.hxx
index e0b86929bc49..cfd51fbb069b 100644
--- a/vos/inc/vos/socket.hxx
+++ b/vos/inc/vos/socket.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: socket.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/vos/inc/vos/stream.hxx b/vos/inc/vos/stream.hxx
index a0ade2a87251..5e25aa1d103a 100644
--- a/vos/inc/vos/stream.hxx
+++ b/vos/inc/vos/stream.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: stream.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/vos/inc/vos/thread.hxx b/vos/inc/vos/thread.hxx
index ca3115c62603..16f64c0e0812 100644
--- a/vos/inc/vos/thread.hxx
+++ b/vos/inc/vos/thread.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: thread.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/vos/inc/vos/timer.hxx b/vos/inc/vos/timer.hxx
index 0617fa2ade2e..4605092ec2f0 100644
--- a/vos/inc/vos/timer.hxx
+++ b/vos/inc/vos/timer.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: timer.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/vos/inc/vos/types.hxx b/vos/inc/vos/types.hxx
index de8ca3447cf1..c68f04e44d96 100644
--- a/vos/inc/vos/types.hxx
+++ b/vos/inc/vos/types.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: types.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/vos/inc/vos/xception.hxx b/vos/inc/vos/xception.hxx
index e01f9bfd76f7..fff67cf4a9c6 100644
--- a/vos/inc/vos/xception.hxx
+++ b/vos/inc/vos/xception.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: xception.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/vos/source/conditn.cxx b/vos/source/conditn.cxx
index 535731f3edf6..f6acc4bb7fab 100644
--- a/vos/source/conditn.cxx
+++ b/vos/source/conditn.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: conditn.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/vos/source/dllentry.cxx b/vos/source/dllentry.cxx
index 0e4d624c81d4..d25de20bfb9f 100644
--- a/vos/source/dllentry.cxx
+++ b/vos/source/dllentry.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: dllentry.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/vos/source/makefile.mk b/vos/source/makefile.mk
index 0f664ec3f93c..7a4e6061622d 100644
--- a/vos/source/makefile.mk
+++ b/vos/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.14 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vos/source/module.cxx b/vos/source/module.cxx
index f34b83e00655..23b916d2b1f9 100644
--- a/vos/source/module.cxx
+++ b/vos/source/module.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: module.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/vos/source/mutex.cxx b/vos/source/mutex.cxx
index f6e7049475e5..d8cefb92028f 100644
--- a/vos/source/mutex.cxx
+++ b/vos/source/mutex.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: mutex.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/vos/source/object.cxx b/vos/source/object.cxx
index df18a3647b9a..8761c7e4daed 100644
--- a/vos/source/object.cxx
+++ b/vos/source/object.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: object.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/vos/source/pipe.cxx b/vos/source/pipe.cxx
index d643d395d7ff..a7d8e655414d 100644
--- a/vos/source/pipe.cxx
+++ b/vos/source/pipe.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: pipe.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/vos/source/process.cxx b/vos/source/process.cxx
index 1a787fe585b1..71c8729d9023 100644
--- a/vos/source/process.cxx
+++ b/vos/source/process.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: process.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/vos/source/refernce.cxx b/vos/source/refernce.cxx
index 83f93992e854..ff21c1acb13e 100644
--- a/vos/source/refernce.cxx
+++ b/vos/source/refernce.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: refernce.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/vos/source/security.cxx b/vos/source/security.cxx
index ba9f95cdf0df..b4fdc8e8d6a3 100644
--- a/vos/source/security.cxx
+++ b/vos/source/security.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: security.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/vos/source/signal.cxx b/vos/source/signal.cxx
index a16bca0fa07d..1f879f8b225c 100644
--- a/vos/source/signal.cxx
+++ b/vos/source/signal.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: signal.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/vos/source/socket.cxx b/vos/source/socket.cxx
index 8e2f74348d1b..c32faf17a4a5 100644
--- a/vos/source/socket.cxx
+++ b/vos/source/socket.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: socket.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/vos/source/stream.cxx b/vos/source/stream.cxx
index 0c0de36ff692..5f7b5b55304f 100644
--- a/vos/source/stream.cxx
+++ b/vos/source/stream.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: stream.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/vos/source/thread.cxx b/vos/source/thread.cxx
index 2b4a0f1c680d..8b2c8826b753 100644
--- a/vos/source/thread.cxx
+++ b/vos/source/thread.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: thread.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/vos/source/timer.cxx b/vos/source/timer.cxx
index 0a4964c74147..1c1e2385b60c 100644
--- a/vos/source/timer.cxx
+++ b/vos/source/timer.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: timer.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/vos/source/xception.cxx b/vos/source/xception.cxx
index e53d55a6bff2..a454460be69b 100644
--- a/vos/source/xception.cxx
+++ b/vos/source/xception.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: xception.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/vos/util/makefile.mk b/vos/util/makefile.mk
index 582f3719113f..46c9af4c93db 100644
--- a/vos/util/makefile.mk
+++ b/vos/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.9 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify
diff --git a/vos/version.mk b/vos/version.mk
index 4010163055ff..f5447ebeedba 100644
--- a/vos/version.mk
+++ b/vos/version.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: version.mk,v $
-#
-# $Revision: 1.4 $
-#
 # This file is part of OpenOffice.org.
 #
 # OpenOffice.org is free software: you can redistribute it and/or modify